merged master and upgraded deps

Author: Keyan Zhang

.eslintrc

@@ -0,0 +1,13 @@
+module.exports = {
+  parser: 'babel-eslint',
+
+  extends: './node_modules/fbjs-scripts/eslint/.eslintrc.js',
+
+  plugins: [
+    'react',
+  ],
+
+  ecmaFeatures: {
+    modules: false
+  },
+};

.eslintrc.js

@@ -9,6 +9,7 @@ APIs.
   * `npm install -g jscodeshift`
   * `git clone https://github.com/reactjs/react-codemod.git` or download a zip file
     from `https://github.com/reactjs/react-codemod/archive/master.zip`
+  * Run `npm install` in the react-codemod directory
   * `jscodeshift -t <codemod-script> <path>`
   * Use the `-d` option for a dry-run and use `-p` to print the output
     for comparison

README.md

@@ -9,25 +9,26 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "jscodeshift": "^0.3.20",
-    "babel-eslint": "^5.0.0",
+    "jscodeshift": "^0.3.24",
+    "babel-eslint": "^6.0.5",
     "babel-plugin-transform-object-rest-spread": "^6.6.5",
     "babel-preset-es2015": "^6.6.0",
-    "babel-jest": "^9.0.2",
-    "eslint": "^1.7.3",
-    "fbjs-scripts": "^0.5.0",
-    "jest-cli": "^0.9.1"
+    "babel-jest": "^13.0.0",
+    "eslint": "^2.13.1",
+    "fbjs-scripts": "^0.7.1",
+    "jest-cli": "^13.0.0"
   },
   "jest": {
     "automock": false,
     "globals": {
       "baseDir": "../"
     },
+    "testEnvironment": "node",
     "testPathDirs": [
-      "transforms/__tests__"
+      "transforms"
     ]
   },
   "devDependencies": {
-    "eslint-plugin-react": "^5.1.1"
+    "eslint-plugin-react": "^5.2.2"
   }
 }

package.json

@@ -2,3 +2,4 @@
 rules:
   no-undef: 0
   no-unused-vars: 0
+  no-redeclare: 0

transforms/__testfixtures__/.eslintrc

@@ -61,6 +61,7 @@ var MyComponent3 = React.createClass({
         />
       );
     }
+    return null;
   },
 
   autobindMe: function() {},

transforms/__testfixtures__/class.input.js

@@ -61,6 +61,7 @@ class MyComponent3 extends React.Component {
         />
       );
     }
+    return null;
   };
 
   autobindMe = () => {};

transforms/__testfixtures__/class.output.js

@@ -21,4 +21,14 @@ class Impure extends React.Component {
   }
 }
 
+class ImpureWithRef extends React.Component {
+  render() {
+    return (
+      <div>
+        <span ref="spanasaurus" />
+      </div>
+    );
+  }
+}
+
 var A = props => <div className={props.foo} />;

transforms/__testfixtures__/pure-component.input.js

@@ -19,4 +19,14 @@ class Impure extends React.Component {
   }
 }
 
+class ImpureWithRef extends React.Component {
+  render() {
+    return (
+      <div>
+        <span ref="spanasaurus" />
+      </div>
+    );
+  }
+}
+
 var A = props => <div className={props.foo} />;

transforms/__testfixtures__/pure-component.output.js

@@ -72,6 +72,7 @@ module.exports = function(file, api, options) {
             value
           );
         }
+        return null;
       });
 
       return attributes;

transforms/create-element-to-jsx.js

@@ -36,6 +36,16 @@ module.exports = function(file, api, options) {
       .filter(p => !isRenderMethod(p.value))
       .size() === 0;
 
+  const hasRefs = path =>
+    j(path)
+      .find(j.JSXAttribute, {
+        name: {
+          type: 'JSXIdentifier',
+          name: 'ref',
+        },
+      })
+      .size() > 0;
+
   const THIS_PROPS = {
     object: {
       type: 'ThisExpression',
@@ -82,7 +92,7 @@ module.exports = function(file, api, options) {
 
   const pureClasses = ReactUtils.findReactES6ClassDeclaration(f)
     .filter(path => {
-      const isPure = onlyHasRenderMethod(path);
+      const isPure = onlyHasRenderMethod(path) && !hasRefs(path);
       if (!isPure && !silenceWarnings) {
         reportSkipped(path);
       }
@@ -109,4 +119,3 @@ module.exports = function(file, api, options) {
 
   return f.toSource(printOptions);
 };
-

transforms/pure-component.js

@@ -122,10 +122,10 @@ const defaultMethodsOrder = [
   'componentWillUpdate',
   'componentDidUpdate',
   'componentWillUnmount',
-  '/^on.+$/',
-  '/^(get|set)(?!(InitialState$|DefaultProps$|ChildContext$)).+$/',
+  /^on.+$/,
+  /^(get|set)(?!(InitialState$|DefaultProps$|ChildContext$)).+$/,
   'everything-else',
-  '/^render.+$/',
+  /^render.+$/,
   'render',
 ];
 

transforms/sort-comp.js

@@ -189,6 +189,7 @@ module.exports = function(j) {
         return spec;
       }
     }
+    return null;
   };
 
   const getClassExtendReactSpec = classPath => classPath.value.body;