2.0.0

.eslintrc

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

.travis.yml

@@ -1,7 +1,6 @@
 ---
 language: node_js
 node_js:
-  - 4
   - 6
   - 7
 cache:
@@ -20,9 +19,12 @@ env:
   matrix:
     - TEST_SUITE=simple
     - TEST_SUITE=installs
+    - TEST_SUITE=kitchensink
 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

CONTRIBUTING.md

@@ -41,6 +41,36 @@ Please **ask first** if somebody else is already working on this or the core dev
 
 Please also provide a **test plan**, i.e. specify how you verified that your addition works.
 
+## Folder Structure of Create React App
+`create-react-app` is a monorepo, meaning it is divided into independent sub-packages.<br>
+These packages can be found in the [`packages/`](https://github.com/facebookincubator/create-react-app/tree/master/packages) directory.
+
+### Overview of directory structure
+```
+packages/
+  babel-preset-react-app/
+  create-react-app/
+  eslint-config-react-app/
+  react-dev-utils/
+  react-scripts/
+```
+### Package Descriptions
+#### [babel-preset-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/babel-preset-react-app)
+This package is a babel preset intended to be used with `react-scripts`.<br>
+It targets platforms that React is designed to support (IE 9+) and enables experimental features used heavily at Facebook.<br>
+This package is enabled by default for all `create-react-app` scaffolded applications.
+#### [create-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/create-react-app)
+The global CLI command code can be found in this directory, and shouldn't often be changed. It should run on Node 0.10+.
+#### [eslint-config-react-app](https://github.com/facebookincubator/create-react-app/tree/master/packages/eslint-config-react-app)
+This package contains a conservative set of rules focused on making errors apparent and enforces no style rules.<br>
+This package is enabled by default for all `create-react-app` scaffolded applications.
+#### [react-dev-utils](https://github.com/facebookincubator/create-react-app/tree/master/packages/react-dev-utils)
+This package contains utilities used for `react-scripts` and sister packages.<br>
+Its main purpose is to conceal code which the user shouldn't be burdened with upon ejecting.
+#### [react-scripts](https://github.com/facebookincubator/create-react-app/tree/master/packages/react-scripts)
+This package is the heart of the project, which contains the scripts for setting up the development server, building production builds, configuring all software used, etc.<br>
+All functionality must be retained (and configuration given to the user) if they choose to eject.
+
 ## Setting Up a Local Copy
 
 1. Clone the repo with `git clone https://github.com/facebookincubator/create-react-app`
@@ -58,6 +88,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.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+<!--
+Thank you for sending the PR!
+If you changed any code, there are just two more things to do:
+
+* Provide us with clear instructions on how you verified your changes work. Bonus points for screenshots!
+
+Happy contributing!
+-->

README.md

@@ -23,6 +23,9 @@ When you run `npm run build` the terminal will output the error, including the h
 
 ## Changelog
 
+### 2.0.0
+* Upgrade to [`react-scripts@1.x.x`](https://github.com/facebookincubator/create-react-app/blob/0d1521aabf5a0201ea1bcccc33e286afe048f820/CHANGELOG.md)
+
 ### 1.4.0
 * Upgrade to typescript@2.3.2 - thanks to @patrick91
 * Add tests around react-scripts-ts - thanks to @migerh

appveyor.yml

@@ -1,3 +1,5 @@
+image: Visual Studio 2017
+
 environment:
   matrix:
     - nodejs_version: 7
@@ -12,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
@@ -32,6 +28,8 @@ platform:
   - x64
 
 install:
+  # TODO: Remove after https://github.com/appveyor/ci/issues/1426 is fixed
+  - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
   - ps: Install-Product node $env:nodejs_version $env:platform
 
 build: off

package.json

@@ -5,14 +5,29 @@
     "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"
+    "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",
+    "@types/jest": "^19.2.3",
+    "@types/node": "^7.0.21",
+    "@types/react": "^15.0.24",
+    "@types/react-dom": "^15.5.0",
+    "eslint": "3.19.0",
+    "husky": "^0.13.2",
     "lerna": "2.0.0-beta.38",
-    "lerna-changelog": "^0.2.3"
+    "lerna-changelog": "^0.2.3",
+    "lint-staged": "^3.3.1",
+    "prettier": "^0.21.0"
+  },
+  "lint-staged": {
+    "*.js": [
+      "prettier --trailing-comma es5 --single-quote --write",
+      "git add"
+    ]
   }
 }

packages/babel-preset-react-app/index.js

@@ -8,29 +8,34 @@
  */
 'use strict';
 
-var path = require('path');
-
 const plugins = [
   // class { handleClick = () => { } }
   require.resolve('babel-plugin-transform-class-properties'),
   // The following two plugins use Object.assign directly, instead of Babel's
   // extends helper. Note that this assumes `Object.assign` is available.
   // { ...todo, completed: true }
-  [require.resolve('babel-plugin-transform-object-rest-spread'), {
-    useBuiltIns: true
-  }],
+  [
+    require.resolve('babel-plugin-transform-object-rest-spread'),
+    {
+      useBuiltIns: true,
+    },
+  ],
   // Transforms JSX
-  [require.resolve('babel-plugin-transform-react-jsx'), {
-    useBuiltIns: true
-  }],
+  [
+    require.resolve('babel-plugin-transform-react-jsx'),
+    {
+      useBuiltIns: true,
+    },
+  ],
   // Polyfills the runtime needed for async/await and generators
-  [require.resolve('babel-plugin-transform-runtime'), {
-    helpers: false,
-    polyfill: false,
-    regenerator: true,
-    // Resolve the Babel runtime relative to the config.
-    moduleName: path.dirname(require.resolve('babel-runtime/package'))
-  }]
+  [
+    require.resolve('babel-plugin-transform-runtime'),
+    {
+      helpers: false,
+      polyfill: false,
+      regenerator: true,
+    },
+  ],
 ];
 
 // This is similar to how `env` works in Babel:
@@ -42,9 +47,11 @@ const plugins = [
 var env = process.env.BABEL_ENV || process.env.NODE_ENV;
 if (env !== 'development' && env !== 'test' && env !== 'production') {
   throw new Error(
-    'Using `babel-preset-react-app` requires that you specify `NODE_ENV` or '+
-    '`BABEL_ENV` environment variables. Valid values are "development", ' +
-    '"test", and "production". Instead, received: ' + JSON.stringify(env) + '.'
+    'Using `babel-preset-react-app` requires that you specify `NODE_ENV` or ' +
+      '`BABEL_ENV` environment variables. Valid values are "development", ' +
+      '"test", and "production". Instead, received: ' +
+      JSON.stringify(env) +
+      '.'
   );
 }
 
@@ -59,49 +66,65 @@ if (env === 'development' || env === 'test') {
     // Adds component stack to warning messages
     require.resolve('babel-plugin-transform-react-jsx-source'),
     // Adds __self attribute to JSX which React will use for some warnings
-    require.resolve('babel-plugin-transform-react-jsx-self')
+    require.resolve('babel-plugin-transform-react-jsx-self'),
   ]);
 }
 
 if (env === 'test') {
   module.exports = {
     presets: [
       // ES features necessary for user's Node version
-      [require('babel-preset-env').default, {
-        targets: {
-          node: 'current',
+      [
+        require('babel-preset-env').default,
+        {
+          targets: {
+            node: 'current',
+          },
         },
-      }],
+      ],
       // JSX, Flow
-      require.resolve('babel-preset-react')
+      require.resolve('babel-preset-react'),
     ],
-    plugins: plugins
+    plugins: plugins.concat([
+      // Compiles import() to a deferred require()
+      require.resolve('babel-plugin-dynamic-import-node'),
+    ]),
   };
 } else {
   module.exports = {
     presets: [
       // Latest stable ECMAScript features
-      [require.resolve('babel-preset-env'), {
-        targets: {
-          // React parses on ie 9, so we should too
-          ie: 9,
-          // We currently minify with uglify
-          // Remove after https://github.com/mishoo/UglifyJS2/issues/448
-          uglify: true
+      [
+        require.resolve('babel-preset-env'),
+        {
+          targets: {
+            // React parses on ie 9, so we should too
+            ie: 9,
+            // We currently minify with uglify
+            // Remove after https://github.com/mishoo/UglifyJS2/issues/448
+            uglify: true,
+          },
+          // Disable polyfill transforms
+          useBuiltIns: false,
+          // Do not transform modules to CJS
+          modules: false,
         },
-        // Disable polyfill transforms
-        useBuiltIns: false
-      }],
+      ],
       // JSX, Flow
-      require.resolve('babel-preset-react')
+      require.resolve('babel-preset-react'),
     ],
     plugins: plugins.concat([
       // function* () { yield 42; yield 43; }
-      [require.resolve('babel-plugin-transform-regenerator'), {
-        // Async functions are converted to generators by babel-preset-latest
-        async: false
-      }],
-    ])
+      [
+        require.resolve('babel-plugin-transform-regenerator'),
+        {
+          // Async functions are converted to generators by babel-preset-env
+          async: false,
+        },
+      ],
+      // Adds syntax support for import()
+      require.resolve('babel-plugin-syntax-dynamic-import'),
+    ]),
   };
 
   if (env === 'production') {

packages/babel-preset-react-app/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,16 +11,20 @@
     "index.js"
   ],
   "dependencies": {
-    "babel-plugin-transform-class-properties": "6.22.0",
-    "babel-plugin-transform-object-rest-spread": "6.22.0",
-    "babel-plugin-transform-react-constant-elements": "6.22.0",
-    "babel-plugin-transform-react-jsx": "6.22.0",
+    "babel-plugin-dynamic-import-node": "1.0.2",
+    "babel-plugin-syntax-dynamic-import": "6.18.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.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-runtime": "6.22.0",
-    "babel-preset-env": "1.2.1",
-    "babel-preset-react": "6.22.0",
-    "babel-runtime": "6.22.0"
+    "babel-plugin-transform-regenerator": "6.24.1",
+    "babel-plugin-transform-runtime": "6.23.0",
+    "babel-preset-env": "1.4.0",
+    "babel-preset-react": "6.24.1"
+  },
+  "peerDependencies": {
+    "babel-runtime": "^6.23.0"
   }
 }