Merge branch 'master' into static-folder

Author: mxstbr

.eslintrc.js

@@ -2,6 +2,6 @@ const clientESLintConfig = require('./config/eslint');
 
 module.exports = Object.assign({}, clientESLintConfig, {
   env: Object.assign({}, clientESLintConfig.env, {
-    node: true
+    node: true,
   })
 });

.gitignore

@@ -3,3 +3,4 @@ build
 .DS_Store
 *.tgz
 my-app*
+template/src/__tests__/__snapshots__/

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.2.1 (August 1, 2016)
+
+### Build Dependency (`react-scripts`)
+
+* Fixes an issue with `npm start` taking a very long time on OS X with Firewall enabled ([@gaearon](https://github.com/gaearon) in [#319](https://github.com/facebookincubator/create-react-app/pull/319))
+* Fixes an issue with Webpack eating a lot of CPU in some cases ([@dceddia](https://github.com/dceddia) in [#294](https://github.com/facebookincubator/create-react-app/pull/294))
+* We now warn if you import a file with mismatched casing because this breaks the watcher ([@alexzherdev](https://github.com/alexzherdev) in [#266](https://github.com/facebookincubator/create-react-app/pull/266))
+* CSS files specifying `?v=` after asset filenames, such as Font Awesome, now works correctly ([@alexzherdev](https://github.com/alexzherdev) in [#298](https://github.com/facebookincubator/create-react-app/pull/298))
+* Issues with `npm link`ing `react-scripts` have been fixed ([@dallonf](https://github.com/dallonf) in [#277](https://github.com/facebookincubator/create-react-app/pull/277))
+* We now use `/static` prefix for assets both in development and production ([@gaearon](https://github.com/gaearon) in [#278](https://github.com/facebookincubator/create-react-app/pull/278))
+
+### Migrating from 0.2.0 to 0.2.1
+
+Update `react-scripts` to point to `0.2.1` in your `package.json` and run `npm install`. You shouldn’t need to do anything else. If you see a warning about wrong file casing next time you `npm start`, fix your imports to use the correct filename casing.
+
+Newly created projects will use `0.2.1` automatically. You **don’t** need to update the global `create-react-app` CLI itself. It stays at `0.2.0` for now because it doesn’t have any changes.
+
 ## 0.2.0 (July 28, 2016)
 
 ### Build Dependency (`react-scripts`)

README.md

@@ -172,6 +172,8 @@ If you don’t agree with the choices made in this project, you might want to ex
 * [roc](https://github.com/rocjs/roc)
 * [aik](https://github.com/d4rkr00t/aik)
 * [react-app](https://github.com/kriasoft/react-app)
+* [dev-toolkit](https://github.com/stoikerty/dev-toolkit)
+* [mozilla-neo](https://github.com/mozilla/neo)
 
 You can also use module bundlers like [webpack](http://webpack.github.io) and [Browserify](http://browserify.org/) directly.<br>
 React documentation includes [a walkthrough](https://facebook.github.io/react/docs/package-management.html) on this topic.

bin/react-scripts.js

@@ -5,8 +5,9 @@ var args = process.argv.slice(3);
 
 switch (script) {
 case 'build':
-case 'start':
 case 'eject':
+case 'start':
+case 'test':
   var result = spawn.sync(
     'node',
     [require.resolve('../scripts/' + script)].concat(args),

config/babel.dev.js

@@ -8,22 +8,35 @@
  */
 
 module.exports = {
+  // Don't try to find .babelrc because we want to force this configuration.
   babelrc: false,
+  // This is a feature of `babel-loader` for webpack (not Babel itself).
+  // It enables caching results in OS temporary directory for faster rebuilds.
   cacheDirectory: true,
   presets: [
-    'babel-preset-es2015',
-    'babel-preset-es2016',
-    'babel-preset-react'
-  ].map(require.resolve),
+    // let, const, destructuring, classes, modules
+    require.resolve('babel-preset-es2015'),
+    // exponentiation
+    require.resolve('babel-preset-es2016'),
+    // JSX, Flow
+    require.resolve('babel-preset-react')
+  ],
   plugins: [
-    'babel-plugin-syntax-trailing-function-commas',
-    'babel-plugin-transform-class-properties',
-    'babel-plugin-transform-object-rest-spread'
-  ].map(require.resolve).concat([
+    // function x(a, b, c,) { }
+    require.resolve('babel-plugin-syntax-trailing-function-commas'),
+    // await fetch()
+    require.resolve('babel-plugin-syntax-async-functions'),
+    // class { handleClick = () => { } }
+    require.resolve('babel-plugin-transform-class-properties'),
+    // { ...todo, completed: true }
+    require.resolve('babel-plugin-transform-object-rest-spread'),
+    // function* () { yield 42; yield 43; }
+    require.resolve('babel-plugin-transform-regenerator'),
+    // Polyfills the runtime needed for async/await and generators
     [require.resolve('babel-plugin-transform-runtime'), {
       helpers: false,
       polyfill: false,
       regenerator: true
     }]
-  ])
+  ]
 };

config/babel.prod.js

@@ -8,22 +8,34 @@
  */
 
 module.exports = {
+  // Don't try to find .babelrc because we want to force this configuration.
   babelrc: false,
   presets: [
-    'babel-preset-es2015',
-    'babel-preset-es2016',
-    'babel-preset-react'
-  ].map(require.resolve),
+    // let, const, destructuring, classes, modules
+    require.resolve('babel-preset-es2015'),
+    // exponentiation
+    require.resolve('babel-preset-es2016'),
+    // JSX, Flow
+    require.resolve('babel-preset-react')
+  ],
   plugins: [
-    'babel-plugin-syntax-trailing-function-commas',
-    'babel-plugin-transform-class-properties',
-    'babel-plugin-transform-object-rest-spread',
-    'babel-plugin-transform-react-constant-elements',
-  ].map(require.resolve).concat([
+    // function x(a, b, c,) { }
+    require.resolve('babel-plugin-syntax-trailing-function-commas'),
+    // await fetch()
+    require.resolve('babel-plugin-syntax-async-functions'),
+    // class { handleClick = () => { } }
+    require.resolve('babel-plugin-transform-class-properties'),
+    // { ...todo, completed: true }
+    require.resolve('babel-plugin-transform-object-rest-spread'),
+    // function* () { yield 42; yield 43; }
+    require.resolve('babel-plugin-transform-regenerator'),
+    // Polyfills the runtime needed for async/await and generators
     [require.resolve('babel-plugin-transform-runtime'), {
       helpers: false,
       polyfill: false,
       regenerator: true
-    }]
-  ])
+    }],
+    // Optimization: hoist JSX that never changes out of render()
+    require.resolve('babel-plugin-transform-react-constant-elements')
+  ]
 };

config/env.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
+// injected into the application via DefinePlugin in Webpack configuration.
+
+var REACT_APP = /^REACT_APP_/i;
+var NODE_ENV = JSON.stringify(process.env.NODE_ENV || 'development');
+
+module.exports = Object
+  .keys(process.env)
+  .filter(key => REACT_APP.test(key))
+  .reduce((env, key) => {
+    env['process.env.' + key] = JSON.stringify(process.env[key]);
+    return env;
+  }, {
+    'process.env.NODE_ENV': NODE_ENV
+  });

config/eslint.js

@@ -28,6 +28,7 @@ module.exports = {
     browser: true,
     commonjs: true,
     es6: true,
+    jest: true,
     node: true
   },
 

config/jest/CSSStub.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
+ */
+
+module.exports = {};