Skip to content

Commit a10af3e

Browse files
Merge pull request #31 from CodingZeal/chores/cra-1.1.4
Update to v1.1.4
2 parents 39a3daa + ff0bebd commit a10af3e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1522
-856
lines changed

.travis.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
---
2-
# Use Ubuntu Precise instead of new default Trusty which cause build fail
3-
# with pre installed yarn v0.17.8
4-
# https://github.com/facebookincubator/create-react-app/issues/3054
5-
# TODO: remove after Trusty environment is updated with a lastet version of yarn
6-
dist: precise
2+
dist: trusty
73
language: node_js
84
node_js:
9-
- 6
105
- 8
6+
- 9
117
cache:
128
directories:
139
- node_modules
@@ -18,18 +14,15 @@ script:
1814
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
1915
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
2016
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
17+
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
2118
env:
22-
global:
23-
- USE_YARN=no
2419
matrix:
2520
- TEST_SUITE=simple
2621
- TEST_SUITE=installs
2722
- TEST_SUITE=kitchensink
2823
matrix:
2924
include:
3025
- node_js: 0.10
31-
env: TEST_SUITE=simple
32-
# There's a weird Yarn/Lerna bug related to prerelease versions.
33-
# TODO: reenable after we ship 1.0.
34-
# - node_js: 6
35-
# env: USE_YARN=yes TEST_SUITE=simple
26+
env: TEST_SUITE=old-node
27+
- node_js: 6
28+
env: TEST_SUITE=kitchensink

.yarnrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--install.no-lockfile true
2+
--install.check-files true
3+
--add.no-lockfile true

CHANGELOG.md

+309
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of Conduct
2+
3+
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.

CONTRIBUTING.md

+21-8
Original file line numberDiff line numberDiff line change
@@ -75,27 +75,40 @@ All functionality must be retained (and configuration given to the user) if they
7575

7676
1. Clone the repo with `git clone https://github.com/facebookincubator/create-react-app`
7777

78-
2. Run `npm install` in the root `create-react-app` folder.
78+
2. Run `yarn` in the root `create-react-app` folder.
7979

80-
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.
80+
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.
8181

8282
If you want to try out the end-to-end flow with the global CLI, you can do this too:
8383

8484
```
85-
npm run create-react-app my-app
85+
yarn create-react-app my-app
8686
cd my-app
8787
```
8888

89-
and then run `npm start` or `npm run build`.
90-
91-
*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.*
89+
and then run `yarn start` or `yarn build`.
9290

9391
## Contributing to E2E (end to end) tests
9492

9593
**TL;DR** use the command `yarn e2e:docker` to run unit and e2e tests.
9694

9795
More detailed information are in the dedicated [README](/packages/react-scripts/fixtures/kitchensink/README.md).
9896

97+
## Tips for contributors using Windows
98+
99+
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:
100+
101+
### Install Bash on Ubuntu on Windows
102+
103+
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/)
104+
105+
### Install Node.js and yarn
106+
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.
107+
108+
### Line endings
109+
110+
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.
111+
99112
## Cutting a Release
100113

101114
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,11 +117,11 @@ More detailed information are in the dedicated [README](/packages/react-scripts/
104117
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`.
105118
5. Create a change log entry for the release:
106119
* 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="..."`
107-
* 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`.
120+
* 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`.
108121
* 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.
109122
* 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.
110123
6. Make sure to include “Migrating from ...” instructions for the previous release. Often you can copy and paste them.
111-
7. **Do not run `npm publish`. Instead, run `npm run publish`.**
124+
7. Run `npm run publish`. (It has to be `npm run publish` exactly, not just `npm publish` or `yarn publish`.)
112125
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.
113126
9. After publishing, create a GitHub Release with the same text as the changelog entry. See previous Releases for inspiration.
114127

0 commit comments

Comments
 (0)