Merge facebook v0.9.5

.eslintignore

@@ -0,0 +1,5 @@
+node_modules/
+build
+my-app*
+packages/react-scripts/template
+packages/react-scripts/fixtures

.eslintrc

@@ -1,3 +1,16 @@
 {
-  "extends": "react-app"
+  "extends": "eslint:recommended",
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "node": true,
+    "es6": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 6
+  },
+  "rules": {
+    "no-console": "off",
+    "strict": ["error", "global"]
+  }
 }

.gitignore

@@ -1,9 +1,15 @@
+.idea/
+.vscode/
 node_modules/
 build
 .DS_Store
 *.tgz
 my-app*
 template/src/__tests__/__snapshots__/
 lerna-debug.log
-npm-debug.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 /.changelog
+.awcache
+

.travis.yml

@@ -1,15 +1,29 @@
 ---
 language: node_js
 node_js:
-  - 0.10
-  - 4
   - 6
+  - 7
 cache:
   directories:
   - node_modules
   - packages/create-react-app/node_modules
   - packages/react-scripts/node_modules
-script: tasks/e2e.sh
+install: true
+script:
+ - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
+ - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
+ - 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
 env:
-  - USE_YARN=no
-  - USE_YARN=yes
+  global:
+    - USE_YARN=no
+  matrix:
+    - TEST_SUITE=simple
+    - TEST_SUITE=installs
+# temporarily disabled kitchensink test; until https://github.com/NLeSC/create-react-app/issues/54 is resolved
+#   - TEST_SUITE=kitchensink
+matrix:
+  include:
+    - node_js: 0.10
+      env: TEST_SUITE=simple
+    - node_js: 6
+      env: USE_YARN=yes TEST_SUITE=simple

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Following these guidelines helps to communicate that you respect the time of the
 
 As much as possible, we try to avoid adding configuration and flags. The purpose of this tool is to provide the best experience for people getting started with React, and this will always be our first priority. This means that sometimes we [sacrifice additional functionality](https://gettingreal.37signals.com/ch05_Half_Not_Half_Assed.php) (such as server rendering) because it is too hard to solve it in a way that wouldn’t require any configuration.
 
-We prefer **convention, heuristics, or interactivity** over configuration.  
+We prefer **convention, heuristics, or interactivity** over configuration.<br>
 Here’s a few examples of them in action.
 
 ### Convention
@@ -68,6 +68,7 @@ and then run `npm start` or `npm run build`.
   * You'll need an [access token for the GitHub API](https://help.github.com/articles/creating-an-access-token-for-command-line-use/). Save it to this environment variable: `export GITHUB_AUTH="..."`
   * Run `npm run changelog`. The command will find all the labeled pull requests merged since the last release and group them by the label and affected packages, and create a change log entry with all the changes and links to PRs and their authors. Copy and paste it to `CHANGELOG.md`.
   * Add a four-space indented paragraph after each non-trivial list item, explaining what changed and why. For each breaking change also write who it affects and instructions for migrating existing code.
+  * Maybe add some newlines here and there. Preview the result on GitHub to get a feel for it. Changelog generator output is a bit too terse for my taste, so try to make it visually pleasing and well grouped.
 6. Make sure to include “Migrating from ...” instructions for the previous release. Often you can copy and paste them.
 7. After merging the changelog update, create a GitHub Release with the same text. See previous Releases for inspiration.
 8. **Do not run `npm publish`. Instead, run `npm run publish`.**

README.md

@@ -7,6 +7,9 @@ Create React apps with no build configuration.
 * [Getting Started](#getting-started) – How to create a new app.
 * [User Guide](https://github.com/NLeSC/create-react-app/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with Create React App.
 
+Create React App works on macOS, Windows, and Linux.<br>
+If something doesn’t work please [file an issue](https://github.com/facebookincubator/create-react-app/issues/new).
+
 ## tl;dr
 
 ```sh
@@ -15,7 +18,6 @@ npm install -g create-react-app
 create-react-app my-app --scripts-version @nlesc/react-scripts
 cd my-app/
 npm start
-
 ```
 
 Then open [http://localhost:3000/](http://localhost:3000/) to see your app.<br>
@@ -73,7 +75,7 @@ my-app/
 No configuration or complicated folder structures, just the files you need to build your app.<br>
 Once the installation is done, you can run some commands inside the project folder:
 
-### `npm start`
+### `npm start` or `yarn start`
 
 Runs the app in development mode.<br>
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
@@ -83,14 +85,14 @@ You will see the build errors and lint warnings in the console.
 
 <img src='https://camo.githubusercontent.com/41678b3254cf583d3186c365528553c7ada53c6e/687474703a2f2f692e696d6775722e636f6d2f466e4c566677362e706e67' width='600' alt='Build errors'>
 
-### `npm test`
+### `npm test` or `yarn test`
 
-Runs the test watcher in an interactive mode.  
+Runs the test watcher in an interactive mode.<br>
 By default, runs tests related to files changes 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)
 
-### `npm run build`
+### `npm run build` or `yarn build`
 
 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.
@@ -105,26 +107,33 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
 - [Updating to New Releases](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#updating-to-new-releases)
 - [Folder Structure](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#folder-structure)
 - [Available Scripts](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#available-scripts)
+- [Supported Language Features and Polyfills](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#supported-language-features-and-polyfills)
+- [Syntax Highlighting in the Editor](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#syntax-highlighting-in-the-editor)
 - [Displaying Lint Output in the Editor](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#displaying-lint-output-in-the-editor)
+- [Debugging in the Editor](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#debugging-in-the-editor)
+- [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)
 - [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)
 - [Adding Images and Fonts](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-images-and-fonts)
 - [Using the `public` Folder](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#using-the-public-folder)
 - [Using Global Variables](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#using-global-variables)
 - [Adding Bootstrap](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-bootstrap)
 - [Adding Flow](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-flow)
 - [Adding Custom Environment Variables](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-custom-environment-variables)
 - [Can I Use Decorators?](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#can-i-use-decorators)
-- [Integrating with a Node Backend](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#integrating-with-a-node-backend)
+- [Integrating with an API Backend](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#integrating-with-an-api-backend)
 - [Proxying API Requests in Development](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#proxying-api-requests-in-development)
 - [Using HTTPS in Development](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#using-https-in-development)
 - [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)
 - [Troubleshooting](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting)
 
 A copy of the user guide will be created as `README.md` in your project folder.
@@ -145,7 +154,7 @@ Please refer to the [User Guide](https://github.com/facebookincubator/create-rea
 
 **If you’re getting started** with React, use `create-react-app` to automate the build of your app. There is no configuration file, and `react-scripts` is the only extra build dependency in your `package.json`. Your environment will have everything you need to build a modern React app:
 
-* React, JSX, and ES6 support.
+* React, JSX, ES6, TypeScript and Flow syntax support.
 * Language extras beyond ES6 like the object spread operator.
 * A dev server that lints for common errors.
 * Import CSS and image files directly from JavaScript.
@@ -173,7 +182,7 @@ Some features are currently **not supported**:
 * Server rendering.
 * Some experimental syntax extensions (e.g. decorators).
 * CSS Modules.
-* LESS or Sass.
+* Importing LESS or Sass directly ([but you still can use them](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-css-preprocessor-sass-less-etc)).
 * Hot reloading of components.
 
 Some of them might get added in the future if they are stable, are useful to majority of React apps, don’t conflict with existing tools, and don’t introduce additional configuration.
@@ -188,6 +197,8 @@ Currently it is a thin layer on top of many amazing community projects, such as:
 * [Autoprefixer](https://github.com/postcss/autoprefixer)
 * [ESLint](http://eslint.org/)
 * [Jest](http://facebook.github.io/jest)
+* [TypeScript](https://www.typescriptlang.org/)
+* [TSLint](https://palantir.github.io/tslint/)
 * and others.
 
 All of them are transitive dependencies of the provided npm package.
@@ -206,11 +217,11 @@ We are grateful to the authors of existing related projects for their ideas and
 
 ## Alternatives
 
-If you don’t agree with the choices made in this project, you might want to explore alternatives with different tradeoffs.  
+If you don’t agree with the choices made in this project, you might want to explore alternatives with different tradeoffs.<br>
 Some of the more popular and actively maintained ones are:
 
 * [insin/nwb](https://github.com/insin/nwb)
-* [mozilla/neo](https://github.com/mozilla/neo)
+* [mozilla-neutrino/neutrino-dev](https://github.com/mozilla-neutrino/neutrino-dev)
 * [NYTimes/kyt](https://github.com/NYTimes/kyt)
 * [zeit/next.js](https://github.com/zeit/next.js)
 * [gatsbyjs/gatsby](https://github.com/gatsbyjs/gatsby)

appveyor.cleanup-cache.txt

@@ -0,0 +1,5 @@
+Edit this file to trigger a cache rebuild.
+http://help.appveyor.com/discussions/questions/1310-delete-cache
+
+----
+Just testing if this works.

appveyor.yml

@@ -0,0 +1,46 @@
+environment:
+  matrix:
+    - nodejs_version: 7
+      test_suite: "simple"
+    - nodejs_version: 7
+      test_suite: "installs"
+    - nodejs_version: 7
+      test_suite: "kitchensink"
+    - nodejs_version: 6
+      test_suite: "simple"
+    - nodejs_version: 6
+      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
+  - packages\react-scripts\node_modules -> appveyor.cleanup-cache.txt
+
+clone_depth: 50
+
+matrix:
+  fast_finish: true
+
+platform:
+  - x64
+
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+
+build: off
+
+skip_commits:
+  files:
+    - '**/*.md'
+
+test_script:
+  - node --version
+  - npm --version
+  - sh tasks/e2e-%test_suite%.sh

lerna.json

@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-beta.30",
+  "lerna": "2.0.0-beta.38",
   "version": "independent",
   "changelog": {
     "repo": "NLeSC/create-react-app",
@@ -12,5 +12,8 @@
       "tag: internal": ":house: Internal"
     },
     "cacheDir": ".changelog"
-  }
+  },
+  "packages": [
+    "packages/*"
+  ]
 }

package.json

@@ -4,21 +4,16 @@
     "build": "node packages/react-scripts/scripts/build.js",
     "changelog": "lerna-changelog",
     "create-react-app": "tasks/cra.sh",
-    "e2e": "tasks/e2e.sh",
+    "e2e": "tasks/e2e-simple.sh",
     "postinstall": "lerna bootstrap",
     "publish": "tasks/release.sh",
     "start": "node packages/react-scripts/scripts/start.js",
     "test": "node packages/react-scripts/scripts/test.js --env=jsdom"
   },
   "devDependencies": {
-    "babel-eslint": "6.1.2",
-    "eslint": "3.5.0",
-    "eslint-config-react-app": "0.2.1",
-    "eslint-plugin-flowtype": "2.18.1",
-    "eslint-plugin-import": "1.12.0",
-    "eslint-plugin-jsx-a11y": "2.2.2",
-    "eslint-plugin-react": "6.3.0",
-    "lerna": "2.0.0-beta.30",
+    "babel-core": "6.22.1",
+    "eslint": "3.16.1",
+    "lerna": "2.0.0-beta.38",
     "lerna-changelog": "^0.2.3"
   }
 }

packages/babel-preset-react-app/README.md

@@ -1,6 +1,6 @@
 # babel-preset-react-app
 
-This package includes the Babel preset used by [Create React App](https://github.com/facebookincubator/create-react-app).  
+This package includes the Babel preset used by [Create React App](https://github.com/facebookincubator/create-react-app).<br>
 Please refer to its documentation:
 
 * [Getting Started](https://github.com/facebookincubator/create-react-app/blob/master/README.md#getting-started) – How to create a new app.

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

@@ -64,13 +64,6 @@ if (env === 'development' || env === 'test') {
 }
 
 if (env === 'test') {
-  plugins.push.apply(plugins, [
-    // We always include this plugin regardless of environment
-    // because of a Babel bug that breaks object rest/spread without it:
-    // https://github.com/babel/babel/issues/4851
-    require.resolve('babel-plugin-transform-es2015-parameters')
-  ]);
-
   module.exports = {
     presets: [
       // ES features necessary for user's Node version
@@ -88,7 +81,17 @@ if (env === 'test') {
   module.exports = {
     presets: [
       // Latest stable ECMAScript features
-      require.resolve('babel-preset-latest'),
+      [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
+      }],
       // JSX, Flow
       require.resolve('babel-preset-react')
     ],

packages/babel-preset-react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-react-app",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "Babel preset used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -11,18 +11,16 @@
     "index.js"
   ],
   "dependencies": {
-    "babel-plugin-transform-class-properties": "6.16.0",
-    "babel-plugin-transform-es2015-parameters": "6.18.0",
-    "babel-plugin-transform-object-rest-spread": "6.19.0",
-    "babel-plugin-transform-react-constant-elements": "6.9.1",
-    "babel-plugin-transform-react-jsx": "6.8.0",
-    "babel-plugin-transform-react-jsx-self": "6.11.0",
-    "babel-plugin-transform-react-jsx-source": "6.9.0",
-    "babel-plugin-transform-regenerator": "6.16.1",
-    "babel-plugin-transform-runtime": "6.15.0",
-    "babel-preset-env": "0.0.8",
-    "babel-preset-latest": "6.16.0",
-    "babel-preset-react": "6.16.0",
-    "babel-runtime": "6.11.6"
+    "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-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"
   }
 }

packages/create-react-app/README.md

@@ -1,6 +1,6 @@
 # create-react-app
 
-This package includes the global command for [Create React App](https://github.com/facebookincubator/create-react-app).  
+This package includes the global command for [Create React App](https://github.com/facebookincubator/create-react-app).<br>
 Please refer to its documentation:
 
 * [Getting Started](https://github.com/facebookincubator/create-react-app/blob/master/README.md#getting-started) – How to create a new app.