[major] move to react 16 exclusively (#635)

packages/electrode-archetype-opt-react/README.md

@@ -14,7 +14,9 @@ module.exports = {
 
 If nothing is set, then default is to use `react`.
 
-The other lib that's planned for support is [inferno](https://github.com/infernojs/inferno).
+The other lib that is supported:
+
+-   [inferno](https://github.com/infernojs/inferno).
 
 Note that since many other modules could depend on the original React lib so even if an app choose to use inferno, the `react` modules could still be installed.
 
@@ -29,7 +31,7 @@ In `package.json`:
 ```js
 {
   "optionalDependencies": {
-    "electrode-archetype-opt-react": "^0.1.0"
+    "electrode-archetype-opt-react": "^1.0.0"
   }
 }
 ```

packages/electrode-archetype-opt-react/optional-check.js

@@ -13,26 +13,29 @@ function findAppDir() {
 }
 
 const appDir = findAppDir();
+const myPkg = require("./package.json");
 
 if (cwd === appDir) {
   try {
-    const myPkg = require("./package.json");
     const appPkg = require(Path.join(appDir, "package.json"));
     if (myPkg.name === appPkg.name) {
       process.exit(0);
     }
-  } catch (e) {
-  }
+  } catch (e) {}
 }
 
+const name = myPkg.name;
+const myTag = "react";
+
 try {
   const config = require(Path.join(appDir, "archetype/config"));
   const lib = config && config.options && config.options.reactLib;
-  if (lib && lib !== "react") {
-    console.log(`electrode-archetype-opt-react: archetype config set reactLib to ${lib} - skipping install`);
+  if (lib && lib !== myTag) {
+    console.log(
+      `${name}: archetype config set reactLib to ${lib} - skipping install because it's not ${myTag}`
+    );
     process.exit(1);
   }
-} catch (e) {
-}
+} catch (e) {}
 
 process.exit(0);

packages/electrode-archetype-opt-react/package.json

@@ -16,7 +16,7 @@
     "preinstall": "node optional-check.js"
   },
   "dependencies": {
-    "react": "^16.0.0 || ^15.0.0 || ^0.14.0",
-    "react-dom": "^16.0.0 || ^15.0.0 || ^0.14.0"
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0"
   }
 }

packages/electrode-archetype-react-app-dev/config/mocha/setup.js

@@ -4,6 +4,10 @@ const chai = require("chai");
 const sinonChai = require("sinon-chai");
 const chaiShallowly = require("chai-shallowly");
 const chaiAsPromised = require("chai-as-promised");
+const Enzyme = require("enzyme");
+const Adapter = require("enzyme-adapter-react-16");
+
+Enzyme.configure({ adapter: new Adapter() });
 
 chai.use(chaiAsPromised);
 chai.use(sinonChai);

packages/electrode-archetype-react-app-dev/package.json

@@ -40,7 +40,7 @@
     "babel-preset-react": "^6.3.13",
     "chai": "^4.0.0",
     "chai-as-promised": "^7.1.1",
-    "chai-shallowly": "^0.9.10",
+    "chai-shallowly": "^1.0.0",
     "clean-css": "^3.4.21",
     "convert-source-map": "^1.5.0",
     "css-loader": "^0.26.1",
@@ -49,6 +49,7 @@
     "electrode-cdn-file-loader": "^1.0.0",
     "electrode-electrify": "^1.0.0",
     "electrode-webpack-reporter": "^0.3.13",
+    "enzyme-adapter-react-16": "^1.1.0",
     "eslint": "^4.8.0",
     "eslint-config-walmart": "^1.1.0",
     "eslint-plugin-filenames": "^1.1.0",
@@ -93,10 +94,9 @@
     "postcss-loader": "^0.11.1",
     "prop-types": "^15.5.6",
     "raw-loader": "^0.5.1",
-    "react-addons-test-utils": "^15.3.0",
     "react-hot-loader": "^1.2.8",
     "react-intl": "^2.1.0",
-    "react-test-renderer": "^15.5.4",
+    "react-test-renderer": "^16.1.1",
     "require-at": "^1.0.0",
     "rimraf": "^2.4.0",
     "sinon": "^4.0.0",
@@ -128,7 +128,7 @@
     "prettier": "^1.4.4"
   },
   "engines": {
-    "node": ">= 4 <= 8",
+    "node": ">= 6 <= 8",
     "npm": ">= 3 <= 5"
   }
 }

packages/electrode-archetype-react-app/arch-clap.js

@@ -301,7 +301,7 @@ function makeTasks() {
       desc: AppMode.isSrc
         ? `Build your app's ${AppMode.src.dir} directory into ${AppMode.lib.dir} for production`
         : "Build your app's client bundle",
-      task: ["build-dist", ".build-lib", "ss-prod-react", ".check.top.level.babelrc"]
+      task: ["build-dist", ".build-lib", ".check.top.level.babelrc"]
     },
 
     //
@@ -695,7 +695,7 @@ Individual .babelrc files were generated for you in src/client and src/server
     "generate-service-worker": {
       desc:
         "Generate Service Worker using the options provided in the app/config/sw-precache-config.json " +
-          "file for prod/dev/hot mode",
+        "file for prod/dev/hot mode",
       task: () => generateServiceWorker()
     },
     "optimize-stats": {

packages/electrode-archetype-react-app/package.json

@@ -31,7 +31,7 @@
     "winston": "^2.3.1"
   },
   "engines": {
-    "node": ">= 4 <= 8",
+    "node": ">= 6 <= 8",
     "npm": ">= 3 <= 5"
   },
   "nyc": {

packages/electrode-archetype-react-app/support/index.js

@@ -2,9 +2,7 @@
 
 const optionalRequire = require("optional-require")(require);
 const optimizeModulesForProduction = require("./optimize-modules-for-production");
-const babelRegister = optionalRequire("babel-register");
 const isomorphicExtendRequire = require("isomorphic-loader/lib/extend-require");
-const babelPolyfill = require("babel-polyfill");
 const archetype = require("../config/archetype");
 const AppMode = archetype.AppMode;
 const Path = require("path");
@@ -20,7 +18,6 @@ const support = {
     require("css-modules-require-hook")(options);
   },
   require: require("../require"),
-  babelRegister,
   isomorphicExtendRequire: () => {
     return isomorphicExtendRequire({
       processAssets: assets => {
@@ -39,7 +36,6 @@ const support = {
       }
     });
   },
-  babelPolyfill,
   optimizeModulesForProduction
 };
 
@@ -79,7 +75,8 @@ support.load = function(options, callback) {
   }
 
   if (br) {
-    if (!support.babelRegister) {
+    const babelRegister = optionalRequire("babel-register");
+    if (!babelRegister) {
       console.log(
         "To use babel-register mode, you need to install the babel-register and support modules."
       );
@@ -94,13 +91,15 @@ support.load = function(options, callback) {
     );
 
     logger.info(
-      `Loading babel-register for runtime transpilation files (extensions: ${regOptions.extensions}).`
+      `Loading babel-register for runtime transpilation files (extensions: ${
+        regOptions.extensions
+      }).`
     );
     logger.info(`The transpilation only occurs the first time you load a file.`);
-    support.babelRegister(regOptions);
+    babelRegister(regOptions);
   }
 
-  if (options.optimizeModulesForProduction !== false) {
+  if (options.optimizeModulesForProduction === true) {
     const opts = options.optimizeModulesForProduction;
 
     support.optimizeModulesForProduction(typeof opts === "object" && opts);