Merge branch 'master' of https://github.com/wmonk/create-react-app-typescript

Conflicts:
	README.md
	packages/react-scripts/package.json
	packages/react-scripts/scripts/init.js
	packages/react-scripts/scripts/utils/createJestConfig.js
	packages/react-scripts/template/README.md
	packages/react-scripts/template/src/App.css
	packages/react-scripts/template/src/App.test.tsx
	packages/react-scripts/template/src/App.tsx
	packages/react-scripts/template/src/index.tsx
	packages/react-scripts/template/tslint.json

Author: gottfired

.yarnrc

@@ -0,0 +1,3 @@
+--install.no-lockfile true
+--install.check-files true
+--add.no-lockfile true

CHANGELOG.md

@@ -0,0 +1,3 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/pages/876921332402685/open-source-code-of-conduct) so that you can understand what actions will and will not be tolerated.

CODE_OF_CONDUCT.md

@@ -75,27 +75,40 @@ All functionality must be retained (and configuration given to the user) if they
 
 1. Clone the repo with `git clone https://github.com/facebookincubator/create-react-app`
 
-2. Run `npm install` in the root `create-react-app` folder.
+2. Run `yarn` in the root `create-react-app` folder.
 
-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.
+Once it is done, you can modify any file locally and run `yarn start`, `yarn test` or `yarn 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:
 
 ```
-npm run create-react-app my-app
+yarn create-react-app my-app
 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.*
+and then run `yarn start` or `yarn build`.
 
 ## Contributing to E2E (end to end) tests
 
 **TL;DR** use the command `yarn e2e:docker` to run unit and e2e tests.
 
 More detailed information are in the dedicated [README](/packages/react-scripts/fixtures/kitchensink/README.md).
 
+## Tips for contributors using Windows
+
+The scripts in tasks folder and other scripts in `package.json` will not work in Windows out of the box. However, using [Bash on  windows](https://msdn.microsoft.com/en-us/commandline/wsl/about) makes it easier to use those scripts without any workarounds. The steps to do so are detailed below: 
+
+### Install Bash on Ubuntu on Windows
+
+A good step by step guide can be found [here](https://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/)
+
+### Install Node.js and yarn
+Even if you have node and yarn installed on your windows, it would not be accessible from the bash shell. You would have to install it again. Installing via [`nvm`](https://github.com/creationix/nvm#install-script) is recommended.
+
+### Line endings
+
+By default git would use `CRLF` line endings which would cause the scripts to fail. You can change it for this repo only by setting `autocrlf` to false by running `git config core.autocrlf false`. You can also enable it for all your repos by using the `--global` flag if you wish to do so.
+
 ## 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.
@@ -104,13 +117,13 @@ More detailed information are in the dedicated [README](/packages/react-scripts/
 4. Note that files in `packages/create-react-app` should be modified with extreme caution. Since it’s a global CLI, any version of `create-react-app` (global CLI) including very old ones should work with the latest version of `react-scripts`.
 5. Create a change log entry for the release:
   * 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`.
+  * Run `yarn 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`.**
-9. Wait for a long time, and it will get published. Don’t worry that it’s stuck. In the end the publish script will prompt for versions before publishing the packages.
+7. Run `npm run publish`. (It has to be `npm run publish` exactly, not just `npm publish` or `yarn publish`.)
+8. Wait for a long time, and it will get published. Don’t worry that it’s stuck. In the end the publish script will prompt for versions before publishing the packages.
+9. After publishing, create a GitHub Release with the same text as the changelog entry. See previous Releases for inspiration.
 
 Make sure to test the released version! If you want to be extra careful, you can publish a prerelease by running `npm run publish -- --tag next` instead of `npm run publish`.
 

CONTRIBUTING.md

@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For create-react-app software
+Copyright (c) 2013-present, Facebook, Inc.
 
-Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -14,6 +14,9 @@ See [Forking react-scripts](https://github.com/facebookincubator/create-react-ap
 
 Create React apps (with Typescript) with no build configuration.
 
+ * [Getting Started](#tldr) – How to create a new app.
+ * [User Guide](https://github.com/wmonk/create-react-app-typescript/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with react scripts ts.
+
 _Do you know react and want to try out typescript? Or do you know typescript and want to try out react?_ Get all the benefits from `create-react-app` but you use typescript! 🚀
 
 ## tl;dr
@@ -163,15 +166,23 @@ All of them are transitive dependencies of the provided npm package.
 ## Contributing
 
 ## Features
+## Migration
 
-### Code highlighting on error
-When you run `npm run build` the terminal will output the error, including the highlighted sourcecode (like babel)!
+In general, most upgrades won't require any migration steps to work, but if you experience problems after an upgrade, please file an issue, and we'll add it to the list of migration steps below.
 
-![CodeHighlight](https://cloud.githubusercontent.com/assets/175278/22310149/1ee66ccc-e346-11e6-83ff-e3a053701fb4.gif)
+### From `<2.13.0` to `>=2.13.0`
 
-## Migration
+Since `2.13.0`, `typescript` is listed as a peer dependency of `react-scripts-ts`. For projects generated with at least this version, the init script takes care of properly installing it as dev dependency to the generated projects. Older projects require manual installation, in case you have not already done that.
 
-In general, most upgrades won't require any migration steps to work, but if you experience problems after an upgrade, please file an issue, and we'll add it to the list of migration steps below.
+Using `npm`:
+```
+npm i -D typescript
+```
+
+Using `yarn`:
+```
+yarn add -D typescript
+```
 
 ### From `<2.5.0` to `>=2.5.0`
 
@@ -191,6 +202,43 @@ To fix this, create a new file *in the root of the project* called `tsconfig.tes
 
 ## Changelog
 
+### 2.15.0
+* Replace TSLint rules with presets - @nielsdB97
+* Update file-loader exclusion rules - @winstonewert
+* Fix Uglifyjs settings - @meandmax
+* Merge react-script 1.1.x - @wmonk
+
+### 2.14.0
+* README fixes - @kaminskypavel
+* README fixes - @adambowles
+* Remove unused JS files - @DorianGrey
+* README fixes - @stephtr
+* Added the abillity to import js and jsx files with ts-loader - @GeeWee
+* Uglifyjs update for es6 support - @thetric
+
+### 2.13.0
+* Remove tslint-loader from prod builds - @DorianGrey
+* Include typescript as devDependency in boilerplate - @ianschmitz
+* Document custom module formats - @joshtynjala
+* Fix tsconfig.json - @diabelb
+
+### 2.12.0
+* Update typescript to 2.6.2
+
+### 2.11.0
+* Upgrade to [`react-scripts@1.0.17`](https://github.com/facebookincubator/create-react-app/releases/tag/v1.0.17)
+
+### 2.10.0
+* README updates - StefanSchoof
+* README updates - DorianGrey
+* Add support for fork-ts-checker-webpack-plugin - johnnyreilly
+
+### 2.9.0 - UNPUBLISHED
+This included changes that were not published by the facebook upstream, so was unpublished.
+
+### 2.8.0
+* Update typescript to 2.5.3 - @nicolaserny
+
 ### 2.7.0
 * Merge react-scripts@1.0.13 - @JohnNilsson
 * Fix git tempalte - @hktonylee

PATENTS

@@ -3,3 +3,4 @@ http://help.appveyor.com/discussions/questions/1310-delete-cache
 
 ----
 Just testing if this works.
+lalala.

README.md

@@ -2,11 +2,11 @@ image: Visual Studio 2017
 
 environment:
   matrix:
-    - nodejs_version: 7
+    - nodejs_version: 8
       test_suite: "simple"
-    - nodejs_version: 7
+    - nodejs_version: 8
       test_suite: "installs"
-    - nodejs_version: 7
+    - nodejs_version: 8
       test_suite: "kitchensink"
     - nodejs_version: 6
       test_suite: "simple"
@@ -28,8 +28,6 @@ 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
@@ -41,4 +39,4 @@ skip_commits:
 test_script:
   - node --version
   - npm --version
-  - sh tasks/e2e-%test_suite%.sh
+  - bash tasks/e2e-%test_suite%.sh

appveyor.cleanup-cache.txt

@@ -1,5 +1,7 @@
 {
-  "lerna": "2.0.0",
+  "lerna": "2.6.0",
+  "npmClient": "yarn",
+  "useWorkspaces": true,
   "version": "independent",
   "changelog": {
     "repo": "facebookincubator/create-react-app",
@@ -12,8 +14,5 @@
       "tag: internal": ":house: Internal"
     },
     "cacheDir": ".changelog"
-  },
-  "packages": [
-    "packages/*"
-  ]
+  }
 }

appveyor.yml

@@ -10,7 +10,7 @@
     "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'",
+    "format": "prettier --trailing-comma es5 --single-quote --write \"packages/*/*.js\" \"packages/*/!(node_modules)/**/*.js\"",
     "precommit": "lint-staged"
   },
   "devDependencies": {

lerna.json

@@ -16,6 +16,12 @@ If you want to use this Babel preset in a project not built with Create React Ap
 
 First, [install Babel](https://babeljs.io/docs/setup/).
 
+Then install babel-preset-react-app.
+
+```sh
+npm install babel-preset-react-app --save-dev
+```
+
 Then create a file named `.babelrc` with following contents in the root folder of your project:
 
   ```js

package.json

@@ -1,14 +1,16 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
 const plugins = [
+  // Necessary to include regardless of the environment because
+  // in practice some other transforms (such as object-rest-spread)
+  // don't work without it: https://github.com/babel/babel/issues/7215
+  require.resolve('babel-plugin-transform-es2015-destructuring'),
   // class { handleClick = () => { } }
   require.resolve('babel-plugin-transform-class-properties'),
   // The following two plugins use Object.assign directly, instead of Babel's

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

@@ -1,27 +1,28 @@
 {
   "name": "babel-preset-react-app",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "Babel preset used by Create React App",
   "repository": "facebookincubator/create-react-app",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/facebookincubator/create-react-app/issues"
   },
   "files": [
     "index.js"
   ],
   "dependencies": {
-    "babel-plugin-dynamic-import-node": "1.0.2",
+    "babel-plugin-dynamic-import-node": "1.1.0",
     "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-es2015-destructuring": "6.23.0",
+    "babel-plugin-transform-object-rest-spread": "6.26.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.24.1",
+    "babel-plugin-transform-regenerator": "6.26.0",
     "babel-plugin-transform-runtime": "6.23.0",
-    "babel-preset-env": "1.5.2",
+    "babel-preset-env": "1.6.1",
     "babel-preset-react": "6.24.1"
   },
   "peerDependencies": {