Merge pull request #1 from jwbennet/cra-sb

Cra sb

Author: jwbennet

Diff for: .eslintrc

@@ -11,6 +11,7 @@
   },
   "rules": {
     "no-console": "off",
-    "strict": ["error", "global"]
+    "strict": ["error", "global"],
+    "curly": "warn"
   }
 }

Diff for: .travis.yml

@@ -1,7 +1,6 @@
 ---
 language: node_js
 node_js:
-  - 4
   - 6
   - 7
 cache:
@@ -25,5 +24,7 @@ matrix:
   include:
     - node_js: 0.10
       env: TEST_SUITE=simple
-    - node_js: 6
-      env: USE_YARN=yes TEST_SUITE=simple
+# There's a weird Yarn/Lerna bug related to prerelease versions.
+# TODO: reenable after we ship 1.0.
+#    - node_js: 6
+#      env: USE_YARN=yes TEST_SUITE=simple

Diff for: CHANGELOG-0.x.md

@@ -77,6 +77,8 @@ All functionality must be retained (and configuration given to the user) if they
 
 2. Run `npm install` in the root `create-react-app` folder.
 
+3. *(Only for macOS Sierra)*: Until [0.10.0](https://github.com/facebookincubator/create-react-app/milestone/23) is released, you may need to install [Watchman](https://facebook.github.io/watchman/docs/install.html) (e.g. `brew install watchman`).
+
 Once it is done, you can modify any file locally and run `npm start`, `npm test` or `npm run build` just like in a generated project.
 
 If you want to try out the end-to-end flow with the global CLI, you can do this too:
@@ -88,6 +90,8 @@ cd my-app
 
 and then run `npm start` or `npm run build`.
 
+*Note: if you are using yarn, we suggest that you use `yarn install --no-lockfile` instead of the bare `yarn` or `yarn install` because we [intentionally](https://github.com/facebookincubator/create-react-app/pull/2014#issuecomment-300811661) do not ignore or add yarn.lock to our repo.*
+
 ## Cutting a Release
 
 1. Tag all merged pull requests that go into the release with the relevant milestone. Each merged PR should also be labeled with one of the [labels](https://github.com/facebookincubator/create-react-app/labels) named `tag: ...` to indicate what kind of change it is.

Diff for: CHANGELOG.md

@@ -40,9 +40,7 @@ Install it once globally:
 npm install -g create-react-app
 ```
 
-**You’ll need to have Node >= 4 on your machine**.
-
-**We strongly recommend to use Node >= 6 and npm >= 3 for faster installation speed and better disk usage.** You can use [nvm](https://github.com/creationix/nvm#usage) to easily switch Node versions between different projects.
+**You’ll need to have Node >= 6 on your machine**. You can use [nvm](https://github.com/creationix/nvm#usage) to easily switch Node versions between different projects.
 
 **This tool doesn’t assume a Node backend**. The Node installation is only required for Create React App itself.
 
@@ -67,13 +65,15 @@ my-app/
   public/
     favicon.ico
     index.html
+    manifest.json
   src/
     App.css
     App.js
     App.test.js
     index.css
     index.js
     logo.svg
+    registerServiceWorker.js
 ```
 
 No configuration or complicated folder structures, just the files you need to build your app.<br>
@@ -92,7 +92,7 @@ You will see the build errors and lint warnings in the console.
 ### `npm test` or `yarn test`
 
 Runs the test watcher in an interactive mode.<br>
-By default, runs tests related to files changes since the last commit.
+By default, runs tests related to files changed since the last commit.
 
 [Read more about testing.](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#running-tests)
 
@@ -102,7 +102,9 @@ Builds the app for production to the `build` folder.<br>
 It correctly bundles React in production mode and optimizes the build for the best performance.
 
 The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
+By default, it also [includes a service worker](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) so that your app loads from local cache on future visits.
+
+Your app is ready to be deployed.
 
 ## User Guide
 
@@ -118,6 +120,7 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
 - [Changing the Page `<title>`](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#changing-the-page-title)
 - [Installing a Dependency](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#installing-a-dependency)
 - [Importing a Component](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#importing-a-component)
+- [Code Splitting](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting)
 - [Adding a Stylesheet](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-stylesheet)
 - [Post-Processing CSS](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#post-processing-css)
 - [Adding a CSS Preprocessor (Sass, Less etc.)](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-css-preprocessor-sass-less-etc)
@@ -134,7 +137,6 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
 - [Generating Dynamic `<meta>` Tags on the Server](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#generating-dynamic-meta-tags-on-the-server)
 - [Pre-Rendering into Static HTML Files](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#pre-rendering-into-static-html-files)
 - [Running Tests](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#running-tests)
-- [Developing Components in Isolation](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#developing-components-in-isolation)
 - [Making a Progressive Web App](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app)
 - [Deployment](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#deployment)
 - [Advanced Configuration](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#advanced-configuration)
@@ -164,6 +166,7 @@ Please refer to the [User Guide](https://github.com/facebookincubator/create-rea
 * Import CSS and image files directly from JavaScript.
 * Autoprefixed CSS, so you don’t need `-webkit` or other prefixes.
 * A `build` script to bundle JS, CSS, and images for production, with sourcemaps.
+* An offline-first [service worker](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers) and a [web app manifest](https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/), meeting all the [Progressive Web App](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) criteria.
 
 **The feature set is intentionally limited**. It doesn’t support advanced features such as server rendering or CSS modules. The tool is also **non-configurable** because it is hard to provide a cohesive experience and easy updates across a set of tools when the user can tweak anything.
 
@@ -243,7 +246,6 @@ Notable alternatives also include:
 * [aik](https://github.com/d4rkr00t/aik)
 * [react-app](https://github.com/kriasoft/react-app)
 * [dev-toolkit](https://github.com/stoikerty/dev-toolkit)
-* [tarec](https://github.com/geowarin/tarec)
 * [sku](https://github.com/seek-oss/sku)
 
 You can also use module bundlers like [webpack](http://webpack.github.io) and [Browserify](http://browserify.org/) directly.<br>

Diff for: CONTRIBUTING.md

@@ -14,12 +14,6 @@ environment:
       test_suite: "installs"
     - nodejs_version: 6
       test_suite: "kitchensink"
-    - nodejs_version: 4
-      test_suite: "simple"
-    - nodejs_version: 4
-      test_suite: "installs"
-    - nodejs_version: 4
-      test_suite: "kitchensink"
 
 cache:
   - node_modules -> appveyor.cleanup-cache.txt

Diff for: README.md

@@ -5,15 +5,15 @@
     "changelog": "lerna-changelog",
     "create-react-app": "tasks/cra.sh",
     "e2e": "tasks/e2e-simple.sh",
-    "postinstall": "lerna bootstrap",
+    "postinstall": "lerna bootstrap && cd packages/react-error-overlay/ && npm run build:prod",
     "publish": "tasks/release.sh",
     "start": "node packages/react-scripts/scripts/start.js",
     "test": "node packages/react-scripts/scripts/test.js --env=jsdom",
     "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
     "precommit": "lint-staged"
   },
   "devDependencies": {
-    "eslint": "3.16.1",
+    "eslint": "3.19.0",
     "husky": "^0.13.2",
     "lerna": "2.0.0-beta.38",
     "lerna-changelog": "^0.2.3",

Diff for: appveyor.yml

@@ -8,8 +8,6 @@
  */
 'use strict';
 
-var path = require('path');
-
 const plugins = [
   // class { handleClick = () => { } }
   require.resolve('babel-plugin-transform-class-properties'),
@@ -36,8 +34,6 @@ const plugins = [
       helpers: false,
       polyfill: false,
       regenerator: true,
-      // Resolve the Babel runtime relative to the config.
-      moduleName: path.dirname(require.resolve('babel-runtime/package')),
     },
   ],
 ];

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-react-app",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "description": "Babel preset used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -11,18 +11,20 @@
     "index.js"
   ],
   "dependencies": {
-    "babel-plugin-dynamic-import-node": "1.0.0",
+    "babel-plugin-dynamic-import-node": "1.0.2",
     "babel-plugin-syntax-dynamic-import": "6.18.0",
-    "babel-plugin-transform-class-properties": "6.23.0",
+    "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-object-rest-spread": "6.23.0",
     "babel-plugin-transform-react-constant-elements": "6.23.0",
-    "babel-plugin-transform-react-jsx": "6.23.0",
+    "babel-plugin-transform-react-jsx": "6.24.1",
     "babel-plugin-transform-react-jsx-self": "6.22.0",
     "babel-plugin-transform-react-jsx-source": "6.22.0",
-    "babel-plugin-transform-regenerator": "6.22.0",
+    "babel-plugin-transform-regenerator": "6.24.1",
     "babel-plugin-transform-runtime": "6.23.0",
-    "babel-preset-env": "1.2.1",
-    "babel-preset-react": "6.23.0",
-    "babel-runtime": "6.23.0"
+    "babel-preset-env": "1.4.0",
+    "babel-preset-react": "6.24.1"
+  },
+  "peerDependencies": {
+    "babel-runtime": "^6.23.0"
   }
 }

Diff for: packages/babel-preset-react-app/index.js

@@ -28,7 +28,7 @@
 // tell people to update their global version of create-react-app.
 //
 // Also be careful with new language features.
-// This file must work on Node 4+.
+// This file must work on Node 6+.
 //
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //   /!\ DO NOT MODIFY THIS FILE /!\
@@ -160,7 +160,34 @@ function createApp(name, verbose, version, template) {
   const originalDirectory = process.cwd();
   process.chdir(root);
 
-  run(root, appName, version, verbose, originalDirectory, template);
+  if (!semver.satisfies(process.version, '>=6.0.0')) {
+    console.log(
+      chalk.yellow(
+        `You are using Node ${process.version} so the project will be boostrapped with an old unsupported version of tools.\n\n` +
+          `Please update to Node 6 or higher for a better, fully supported experience.\n`
+      )
+    );
+    // Fall back to latest supported react-scripts on Node 4
+    version = '[email protected]';
+  }
+
+  const useYarn = shouldUseYarn();
+  if (!useYarn) {
+    const npmInfo = checkNpmVersion();
+    if (!npmInfo.hasMinNpm) {
+      if (npmInfo.npmVersion) {
+        console.log(
+          chalk.yellow(
+            `You are using npm ${npmInfo.npmVersion} so the project will be boostrapped with an old unsupported version of tools.\n\n` +
+              `Please update to npm 3 or higher for a better, fully supported experience.\n`
+          )
+        );
+      }
+      // Fall back to latest supported react-scripts for npm 3
+      version = '[email protected]';
+    }
+  }
+  run(root, appName, version, verbose, originalDirectory, template, useYarn);
 }
 
 function shouldUseYarn() {
@@ -190,7 +217,6 @@ function install(useYarn, dependencies, verbose, isOnline) {
         console.log();
       }
     } else {
-      checkNpmVersion();
       command = 'npm';
       args = ['install', '--save', '--save-exact'].concat(dependencies);
     }
@@ -212,13 +238,19 @@ function install(useYarn, dependencies, verbose, isOnline) {
   });
 }
 
-function run(root, appName, version, verbose, originalDirectory, template) {
+function run(
+  root,
+  appName,
+  version,
+  verbose,
+  originalDirectory,
+  template,
+  useYarn
+) {
   const packageToInstall = getInstallPackage(version);
   const allDependencies = ['react', 'react-dom', packageToInstall];
 
   console.log('Installing packages. This might take a couple minutes.');
-
-  const useYarn = shouldUseYarn();
   getPackageName(packageToInstall)
     .then(packageName => checkIfOnline(useYarn).then(isOnline => ({
       isOnline: isOnline,
@@ -253,6 +285,15 @@ function run(root, appName, version, verbose, originalDirectory, template) {
       );
       const init = require(scriptsPath);
       init(root, appName, verbose, originalDirectory, template);
+
+      if (version === '[email protected]') {
+        console.log(
+          chalk.yellow(
+            `\nNote: the project was boostrapped with an old unsupported version of tools.\n` +
+              `Please update to Node >=6 and npm >=3 to get supported tools in new projects.\n`
+          )
+        );
+      }
     })
     .catch(reason => {
       console.log();
@@ -302,7 +343,7 @@ function run(root, appName, version, verbose, originalDirectory, template) {
 }
 
 function getInstallPackage(version) {
-  let packageToInstall = 'react-scripts';
+  let packageToInstall = '@jwbennet/spring-boot-react-scripts';
   const validSemver = semver.valid(version);
   if (validSemver) {
     packageToInstall += `@${validSemver}`;
@@ -398,24 +439,18 @@ function getPackageName(installPackage) {
 }
 
 function checkNpmVersion() {
-  let isNpm2 = false;
+  let hasMinNpm = false;
+  let npmVersion = null;
   try {
-    const npmVersion = execSync('npm --version').toString();
-    isNpm2 = semver.lt(npmVersion, '3.0.0');
+    npmVersion = execSync('npm --version').toString().trim();
+    hasMinNpm = semver.gte(npmVersion, '3.0.0');
   } catch (err) {
-    return;
+    // ignore
   }
-  if (!isNpm2) {
-    return;
-  }
-  console.log(chalk.yellow('It looks like you are using npm 2.'));
-  console.log(
-    chalk.yellow(
-      'We suggest using npm 3 or Yarn for faster install times ' +
-        'and less disk space usage.'
-    )
-  );
-  console.log();
+  return {
+    hasMinNpm: hasMinNpm,
+    npmVersion: npmVersion,
+  };
 }
 
 function checkNodeVersion(packageName) {
@@ -457,7 +492,7 @@ function checkAppName(appName) {
 
   // TODO: there should be a single place that holds the dependencies
   const dependencies = ['react', 'react-dom'];
-  const devDependencies = ['react-scripts'];
+  const devDependencies = ['@jwbennet/spring-boot-react-scripts'];
   const allDependencies = dependencies.concat(devDependencies).sort();
   if (allDependencies.indexOf(appName) >= 0) {
     console.error(
@@ -530,12 +565,19 @@ function isSafeToCreateProjectIn(root) {
     '.idea',
     'README.md',
     'LICENSE',
-    'web.iml',
     '.hg',
     '.hgignore',
     '.hgcheck',
+    '.mvn',
+    'mvnw',
+    'mvnw.cmd',
+    'pom.xml',
+    'src',
   ];
-  return fs.readdirSync(root).every(file => validFiles.indexOf(file) >= 0);
+  return fs
+    .readdirSync(root)
+    .filter(file => !file.endsWith('.iml'))
+    .every(file => validFiles.indexOf(file) >= 0);
 }
 
 function checkIfOnline(useYarn) {

Diff for: packages/babel-preset-react-app/package.json

@@ -41,7 +41,10 @@
 var chalk = require('chalk');
 
 var currentNodeVersion = process.versions.node;
-if (currentNodeVersion.split('.')[0] < 4) {
+var semver = currentNodeVersion.split('.');
+var major = semver[0];
+
+if (major < 4) {
   console.error(
     chalk.red(
       'You are running Node ' +