Skip to content

Commit

Permalink
Merge branch 'facebook-master'
Browse files Browse the repository at this point in the history
* facebook-master: (578 commits)
  Add PR welcoming badge  (facebook#5759)
  Suggest Encore when not building a SPA with Symfony (facebook#5730)
  Merge webpack configuration (facebook#5722)
  Tweak bot settings
  Update stale.yml
  Fix typo (facebook#5727)
  Version bump postcss-preset-env to latest (facebook#5721)
  Updated the link to firebase hosting (facebook#5710)
  Fixed link to manifest.json file (facebook#5704)
  Fix broken documentation link (facebook#5670)
  Fix tsconfig.json lib suggested value (facebook#5701)
  Add permissive TS lib defaults (facebook#5694)
  Lock issues more aggressively
  Make stale bot configuration more aggressive
  ignore intellij module files when generating an app (facebook#4605)
  update envinfo to 5.11.1 (facebook#5685)
  Add bot config (facebook#4483)
  Publish
  Update cached lock file
  Add changelog for 2.1.1
  ...
  • Loading branch information
Sonic Xiang committed Nov 12, 2018
2 parents fb7c242 + 03d42d4 commit a2f2270
Show file tree
Hide file tree
Showing 315 changed files with 29,118 additions and 6,477 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build
my-app*
packages/react-scripts/template
packages/react-scripts/fixtures
fixtures/
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"es6": true
},
"parserOptions": {
"ecmaVersion": 6
"ecmaVersion": 2018
},
"rules": {
"no-console": "off",
Expand Down
64 changes: 36 additions & 28 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,47 +24,56 @@
You can find webpack docs at https://webpack.js.org/.
-->


### Can you also reproduce the problem with npm 4.x?
### Did you try recovering your dependencies?

<!--
Many errors, especially related to "missing modules", are due to npm bugs.
Which version of npm are you running? You can find out by checking:
npm -v
Your module tree might be corrupted, and that might be causing the issues.
Let's try to recover it. First, delete these files and folders in your project:
If it is 5.x, please be aware that it has more than 50 known bugs, and
is not guaranteed to work with Create React App.
* node_modules
* package-lock.json
* yarn.lock
If it's not starting with 4, try to install npm 4.x:
Then you need to decide which package manager you prefer to use.
We support both npm (https://npmjs.com) and yarn (http://yarnpkg.com/).
However, **they can't be used together in one project** so you need to pick one.
If you decided to use npm, run this in your project directory:
npm install -g npm@4
cd your_project_directory
rm -rf node_modules
npm cache clear
npm install -g npm@latest
npm install
Then try to reproduce the issue again.
Can you still reproduce it?
This should fix your project.
If you decided to use yarn, update it first (https://yarnpkg.com/en/docs/install).
Then run in your project directory:
yarn
Note: Please try this even if you are using Yarn so that we know whether it's a Yarn-only bug.
This should fix your project.
Importantly, **if you decided to use yarn, you should never run `npm install` in the project**.
For example, yarn users should run `yarn add <library>` instead of `npm install <library>`.
Otherwise your project will break again.
Have you done all these steps and still see the issue?
Please paste the output of `npm --version` and/or `yarn --version` to confirm.
-->

(Write your answer here.)


### Which terms did you search for in User Guide?

<!--
There are a few common documented problems, such as watcher not detecting changes, or build failing.
They are described in the Troubleshooting section of the User Guide:
https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
Please scan these few sections for common problems.
Additionally, you can search the User Guide itself for something you're having issues with:
https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md
https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md
If you didn't find the solution, please share which words you searched for.
This helps us improve documentation for future readers who might encounter the same problem.
Expand All @@ -76,19 +85,18 @@
### Environment

<!--
Please fill in all the relevant fields by running these commands in terminal.
-->
To help identify if a problem is specific to a platform, browser, or module version, information about your environment is required.
This enables the maintainers quickly reproduce the issue and give feedback.
1. `node -v`:
2. `npm -v`:
3. `yarn --version` (if you use Yarn):
4. `npm ls react-scripts` (if you haven’t ejected):
Run the following command in your React app's folder in terminal.
Note: The result is copied to your clipboard directly.
Then, specify:
`npx create-react-app --info`
1. Operating system:
2. Browser and version (if relevant):
Paste the output of the command in the section below.
-->

(paste the output of the command here)

### Steps to Reproduce

Expand Down
8 changes: 8 additions & 0 deletions .github/lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Configuration for lock-threads - https://github.com/dessant/lock-threads

# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 5

# Do not comment when locking
setLockReason: false
lockComment: false
49 changes: 49 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 30

# Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 5

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- "issue: proposal"
- "issue: announcement"

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: true

# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true

# Label to use when marking as stale
staleLabel: stale

# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

issues:
# Comment to post when marking Issues as stale.
markComment: >
This issue has been automatically marked as stale because it has not had any
recent activity. It will be closed in 5 days if no further activity occurs.
# Comment to post when closing a stale Issue.
closeComment: >
This issue has been automatically closed because it has not had any recent
activity. If you have a question or comment, please open a new issue.
pulls:
# Comment to post when marking Pull Request as stale.
markComment: >
This pull request has been automatically marked as stale because it has not
had any recent activity. It will be closed in 5 days if no further activity
occurs.
# Comment to post when closing a stale Pull Request.
closeComment: >
This pull request has been automatically closed because it has not had any
recent activity. If you have a question or comment, please open a new
issue. Thank you for your contribution!
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
/.changelog
.npm/
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"trailingComma": "es5",
"singleQuote": true,
"semi": true
}
29 changes: 18 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,33 @@ dist: trusty
language: node_js
node_js:
- 8
- 9
- 10
cache:
yarn: true
directories:
- node_modules
- packages/create-react-app/node_modules
- packages/react-scripts/node_modules
- .npm
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
- export PATH="$HOME/.yarn/bin:$PATH"
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'
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
- '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'
- 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
- 'if [ $TEST_SUITE = "behavior" ]; then tasks/e2e-behavior.sh; fi'
env:
matrix:
- TEST_SUITE=simple
- TEST_SUITE=installs
- TEST_SUITE=kitchensink
- TEST_SUITE=kitchensink-eject
- TEST_SUITE=behavior
matrix:
include:
- node_js: 0.10
env: TEST_SUITE=old-node
- os: osx
node_js: 8
env: TEST_SUITE=behavior
- node_js: 6
env: TEST_SUITE=kitchensink
env: TEST_SUITE=old-node
3 changes: 0 additions & 3 deletions .yarnrc

This file was deleted.

Loading

0 comments on commit a2f2270

Please sign in to comment.