`package.json` updates #1159

coopersamuel · 2018-10-19T02:32:11Z

This PR updates most of the packages in package.json. I'll leave webpack for a separate PR because I anticipate breaking changes moving to v4.

More comments are in the code

This change is

…ror, added a few rules in eslintrc

coopersamuel · 2018-10-19T02:35:00Z

.eslintrc

@@ -15,6 +15,9 @@ env:

 rules:
  no-console: 0
+  function-paren-newline: 0
+  object-curly-newline: 0
+


After updating eslint these two rules produced over 120 errors. I disabled them in the .eslintrc file

coopersamuel · 2018-10-19T02:37:41Z

node_package/src/buildConsoleReplay.js

@@ -5,6 +5,7 @@ import scriptSanitizedVal from './scriptSanitizedVal';

 export function consoleReplay() {
  // console.history is a global polyfill used in server rendering.
+  // $FlowFixMe


As per this flow article, flow is now throwing errors for unknown property access in conditionals. I flagged this with $FlowFixMe for the time being to suppress the error. @justin808 what are your thoughts on fixing this?

coopersamuel · 2018-10-19T02:38:03Z

node_package/src/clientStartup.js

@@ -204,7 +204,7 @@ function renderInit() {
 }

 export function clientStartup(context) {
-  const document = context.document;
+  const { document } = context;


Reformatted to satiate eslint

coopersamuel · 2018-10-19T02:38:30Z

node_package/src/serverRenderReactComponent.js

@@ -42,7 +42,7 @@ See https://github.com/shakacode/react_on_rails#renderer-functions`);

      if (reactElementOrRouterResult.redirectLocation) {
        if (trace) {
-          const redirectLocation = reactElementOrRouterResult.redirectLocation;
+          const { redirectLocation } = reactElementOrRouterResult;


More destructuring to make eslint happy

coopersamuel · 2018-10-19T02:39:30Z

node_package/tests/ReactOnRails.test.js

@@ -21,7 +21,7 @@ test('ReactOnRails render returns a virtual DOM element for component', (assert)
  ReactOnRails.register({ R1 });

  // eslint-disable-next-line no-underscore-dangle
-  const actual = ReactOnRails.render('R1', {}, 'root')._reactInternalInstance._currentElement.type;
+  const actual = ReactOnRails.render('R1', {}, 'root')._reactInternalFiber.type;


When updating to React v16 there was a breaking change that caused the below test to fail

test('ReactOnRails render returns a virtual DOM element for component', (assert) => { assert.plan(1); const R1 = createReactClass({ render() { return ( <div> WORLD </div> ); }, }); ReactOnRails.register({ R1 }); // eslint-disable-next-line no-underscore-dangle const actual = ReactOnRails.render('R1', {}, 'root')._reactInternalInstance._currentElement.type; assert.deepEqual(actual, R1, 'ReactOnRails render should return a virtual DOM element for component'); });

The error occurred because _reactInternalInstance was deprecated in React 16. The object returned from ReactDOM.render() for v15.6 looked like this (simplified):

{ _reactInternalInstance: { _currentElement: { type: // Stuff here } } }

After upgrading to React v16, the object looked like this (again, simplified):

{ _reactInternalFiber: { type: // Stuff here }, _reactInternalInstance: { // EMPTY! } }

A one line update to the test above resulted in all tests passing
const actual = ReactOnRails.render('R1', {}, 'root')._reactInternalFiber.type;

coopersamuel · 2018-10-19T02:41:12Z

node_package/tests/buildConsoleReplay.test.js

+      arguments: [
+        'some message </script><script>alert(\'WTF\')</script>',
+        { a: 'Wow</script><script>alert(\'WTF\')</script>', b: 2 },
+      ],


Reformatted for eslint

coveralls · 2018-10-19T02:43:58Z

Coverage remained the same at ?% when pulling 38d9c1c on coopersamuel-package-updates into 18e7840 on master.

justin808

Some changes still needed.

Reviewed 12 of 12 files at r1.
Reviewable status: all files reviewed, 7 unresolved discussions (waiting on @justin808 and @coopersamuel)

.eslintrc, line 20 at r1 (raw file):

function-paren-newline

This will probably change once we put prettier in the project.
We use: https://github.com/shakacode/style-guide-javascript/tree/master/packages/eslint-config-shakacode

node_package/src/buildConsoleReplay.js, line 8 at r1 (raw file):

Previously, coopersamuel (Samuel Cooper) wrote…

As per this flow article, flow is now throwing errors for unknown property access in conditionals. I flagged this with $FlowFixMe for the time being to suppress the error. @justin808 what are your thoughts on fixing this?

yeah, let's ignore for now.

spec/dummy/spec/system/integration_spec.rb, line 189 at r1 (raw file):

  scenario "deferring the initial render should prevent a client/server checksum mismatch error" do
    root = page.find(:xpath, "//div[@data-reactroot]")
    expect(root["data-react-checksum"].present?).to be(false)

This really doesn't show the test did anything.

We'll fix this.

coopersamuel · 2018-10-19T14:15:37Z

@justin808 regarding your comments, what steps do you think need to be taken to pass this PR?

Regarding the eslint rules, if we remove those rules we'd have a bunch of errors (> 120) - my position is that we leave the rules for now and add prettier in the project in a separate PR
Regarding the test, I agree that test doesn't really do much, personally I think the test is now obsolete because of React's behavior removing the data-react-checksum attribute. Should we scrap the test entirely?

Let me know your thoughts on these and we'll get this pushed through

* fixed tests * updated packages in spec/dummy * add prettier

Can't use match? on Ruby 2.2. Uncomment when Ruby 2.4 is used for all test platforms

justin808

Need to add an entry to the CHANGELOG.md for adding hydrate

   * @param props Props to pass to your component
   * @param domNodeId
   * @param hydrate Pass truthy to update server rendered html. Default is falsy
   * @returns {virtualDomElement} Reference to your component's backing instance
   */

Reviewed 74 of 74 files at r2.
Reviewable status: all files reviewed, 9 unresolved discussions (waiting on @coopersamuel)

package-scripts.yml, line 44 at r2 (raw file):

        description: Check if any JSON files would change by running prettier-eslint.
        script: prettier "**/*.json" "../spec/**/*.json" --list-different
  renderer:

remove this

node_package/src/ReactOnRails.js, line 156 at r2 (raw file):

   * @param props Props to pass to your component
   * @param domNodeId
   * @param hydrate Pass truthy to update server rendered html. Default is falsy

add to CHANGELOG.md and doc

coopersamuel added 8 commits October 18, 2018 11:14

updgraded react and react DOM, fixed breaking test

bccfb25

updated all minor and patch release packages

ba6913a

updated eslint and flow, fixed a few eslint errors, ignored a flow er…

8bd366e

…ror, added a few rules in eslintrc

updated redux, no broken tests

770c8c7

updated tap-spec and release-it

6cd51f6

updated dummy apps gemfile, specified version for miniracer

4a41f11

fixed test

d6424ae

fixed long line in test

87322c0

coopersamuel requested a review from justin808 October 19, 2018 02:32

coopersamuel commented Oct 19, 2018

View reviewed changes

justin808 requested changes Oct 19, 2018

View reviewed changes

justin808 added 2 commits October 21, 2018 12:18

poltergeist removal

11c9014

Updates to spec/dummy for new packages

1fec85a

* fixed tests * updated packages in spec/dummy * add prettier

justin808 force-pushed the coopersamuel-package-updates branch from 26442b9 to 1fec85a Compare October 22, 2018 08:10

justin808 added 2 commits October 22, 2018 08:36

add prettier files

3cadf36

Change String.match? to =~

38d9c1c

Can't use match? on Ruby 2.2. Uncomment when Ruby 2.4 is used for all test platforms

justin808 requested changes Oct 23, 2018

View reviewed changes

justin808 merged commit a44cfb2 into master Oct 24, 2018

justin808 deleted the coopersamuel-package-updates branch October 24, 2018 20:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`package.json` updates #1159

`package.json` updates #1159

coopersamuel commented Oct 19, 2018 •

edited by justin808

Loading

coopersamuel Oct 19, 2018

coopersamuel Oct 19, 2018

coopersamuel Oct 19, 2018

coopersamuel Oct 19, 2018

coopersamuel Oct 19, 2018 •

edited

Loading

coopersamuel Oct 19, 2018

coveralls commented Oct 19, 2018 •

edited

Loading

justin808 left a comment

coopersamuel commented Oct 19, 2018

justin808 left a comment

package.json updates #1159

package.json updates #1159

Conversation

coopersamuel commented Oct 19, 2018 • edited by justin808 Loading

coopersamuel Oct 19, 2018

Choose a reason for hiding this comment

coopersamuel Oct 19, 2018

Choose a reason for hiding this comment

coopersamuel Oct 19, 2018

Choose a reason for hiding this comment

coopersamuel Oct 19, 2018

Choose a reason for hiding this comment

coopersamuel Oct 19, 2018 • edited Loading

Choose a reason for hiding this comment

coopersamuel Oct 19, 2018

Choose a reason for hiding this comment

coveralls commented Oct 19, 2018 • edited Loading

justin808 left a comment

Choose a reason for hiding this comment

coopersamuel commented Oct 19, 2018

justin808 left a comment

Choose a reason for hiding this comment

`package.json` updates #1159

`package.json` updates #1159

coopersamuel commented Oct 19, 2018 •

edited by justin808

Loading

coopersamuel Oct 19, 2018 •

edited

Loading

coveralls commented Oct 19, 2018 •

edited

Loading