Merge pull request #4750 from zpao/fbjs-0.2

Upgrade to fbjs, fbjs-scripts @ 0.2

gulpfile.js

@@ -14,8 +14,8 @@ var babel = require('gulp-babel');
 var flatten = require('gulp-flatten');
 var del = require('del');
 
-var babelPluginDEV = require('fbjs/scripts/babel/dev-expression');
-var babelPluginModules = require('fbjs/scripts/babel/rewrite-modules');
+var babelPluginDEV = require('fbjs-scripts/babel/dev-expression');
+var babelPluginModules = require('fbjs-scripts/babel/rewrite-modules');
 
 var paths = {
   react: {

package.json

@@ -15,7 +15,8 @@
     "eslint": "^1.1.0",
     "eslint-plugin-react": "^3.2.1",
     "eslint-plugin-react-internal": "file:eslint-rules",
-    "fbjs": "0.1.0-alpha.4",
+    "fbjs": "^0.2.0",
+    "fbjs-scripts": "^0.2.0",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
     "grunt-compare-size": "^0.4.0",
@@ -32,7 +33,6 @@
     "optimist": "^0.6.1",
     "platform": "^1.1.0",
     "run-sequence": "^1.1.0",
-    "semver": "^5.0.1",
     "through2": "^2.0.0",
     "tmp": "~0.0.18",
     "typescript": "~1.4.0",
@@ -50,7 +50,7 @@
     "build": "grunt build",
     "linc": "git diff --name-only --diff-filter=ACMRTUB `git merge-base HEAD master` | grep '\\.js$' | xargs eslint --",
     "lint": "grunt lint",
-    "postinstall": "node scripts/check-dev-engines.js",
+    "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
     "test": "NODE_ENV=test jest"
   },
   "jest": {

packages/react-dom/package.json

@@ -16,7 +16,6 @@
   },
   "homepage": "https://github.com/facebook/react/tree/master/npm-react-dom",
   "dependencies": {
-    "fbjs": "0.1.0-alpha.4",
     "react": "^0.14.0-beta3"
   }
 }

packages/react/package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "envify": "^3.0.0",
-    "fbjs": "0.1.0-alpha.4"
+    "fbjs": "^0.2.0"
   },
   "browserify": {
     "transform": [

scripts/check-dev-engines.js

@@ -1,41 +0,0 @@
-'use strict';
-
-var devEngines = require('../package').devEngines;
-
-var assert = require('assert');
-var exec = require('child_process').exec;
-var semver = require('semver');
-var f = require('util').format;
-
-if (devEngines.node !== undefined) {
-  // First check that devEngines are valid semver
-  assert(
-    semver.validRange(devEngines.node),
-    f('devEngines.node (%s) is not a valid semver range', devEngines.node)
-  );
-  // Then actually check that our version satisfies
-  var nodeVersion = process.versions.node;
-  assert(
-    semver.satisfies(nodeVersion, devEngines.node),
-    f('Current node version is not supported for development, expected "%s" to satisfy "%s".', nodeVersion, devEngines.node)
-  );
-}
-
-if (devEngines.npm !== undefined) {
-  // First check that devEngines are valid semver
-  assert(
-    semver.validRange(devEngines.npm),
-    f('devEngines.npm (%s) is not a valid semver range', devEngines.npm)
-  );
-
-  // Then actually check that our version satisfies
-  exec('npm --version', function(err, stdout, stderr) {
-    assert(err === null, f('Failed to get npm version... %s'), stderr);
-
-    var npmVersion = stdout.trim();
-    assert(
-      semver.satisfies(npmVersion, devEngines.npm),
-      f('Current npm version is not supported for development, expected "%s" to satisfy "%s".', npmVersion, devEngines.npm)
-    );
-  });
-}

scripts/jest/preprocessor.js

@@ -17,8 +17,8 @@ var ts = tsPreprocessor(defaultLibraries);
 // This assumes the module map has been built. This might not be safe.
 // We should consider consuming this from a built fbjs module from npm.
 var moduleMap = require('fbjs/module-map');
-var babelPluginDEV = require('fbjs/scripts/babel/dev-expression');
-var babelPluginModules = require('fbjs/scripts/babel/rewrite-modules');
+var babelPluginDEV = require('fbjs-scripts/babel/dev-expression');
+var babelPluginModules = require('fbjs-scripts/babel/rewrite-modules');
 
 module.exports = {
   process: function(src, filePath) {