Skip to content

Commit 80f2116

Browse files
karlhorkykarlhorky
committed
Merge branch 'master' of github.com:facebookincubator/create-react-app into add-stylelint
* 'master' of github.com:facebookincubator/create-react-app: Fix a bad condition Only show first error (facebook#2125) Make error box messages friendlier (facebook#2123) Bump React in development (facebook#2122) disable ignoring unused vars prefixed with _ (facebook#1763) Adds tests for the overlay (facebook#2118) Omit ESLint warnings when there are ESLint errors (facebook#2120) Default to 0.0.0.0 (facebook#2117) Add `react-error-overlay` package (facebook#2111) Do not parse `.eslintignore` (facebook#2115) Prettify errors and warnings for Webpack 2 (facebook#2113) Bump minimal Node version to 6 (facebook#1897) Minor tweaks for crash overlay (facebook#2101) Revert "Forbid using window properties as global variables" (facebook#2099) Ignore the yarn cache directory (facebook#2063) Forbid using window properties as global variables (facebook#1840) Fixed documentation link for storybook in README.md (facebook#2081) Temporarily pin Yarn to fix CI Fix instructions for serving with now (facebook#2052)
2 parents 8d8b494 + 2b59654 commit 80f2116

Some content is hidden

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

85 files changed

+86594
-1255
lines changed

‎.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
language: node_js
33
node_js:
4-
- 4
54
- 6
65
- 7
76
cache:

‎README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ Install it once globally:
4040
npm install -g create-react-app
4141
```
4242

43-
**You’ll need to have Node >= 4 on your machine**.
44-
45-
**We strongly recommend to use Node >= 6 and npm >= 3 for faster installation speed and better disk usage.** You can use [nvm](https://github.com/creationix/nvm#usage) to easily switch Node versions between different projects.
43+
**You’ll need to have Node >= 6 on your machine**. You can use [nvm](https://github.com/creationix/nvm#usage) to easily switch Node versions between different projects.
4644

4745
**This tool doesn’t assume a Node backend**. The Node installation is only required for Create React App itself.
4846

‎appveyor.yml

-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ environment:
1414
test_suite: "installs"
1515
- nodejs_version: 6
1616
test_suite: "kitchensink"
17-
- nodejs_version: 4
18-
test_suite: "simple"
19-
- nodejs_version: 4
20-
test_suite: "installs"
21-
- nodejs_version: 4
22-
test_suite: "kitchensink"
2317

2418
cache:
2519
- node_modules -> appveyor.cleanup-cache.txt

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"changelog": "lerna-changelog",
66
"create-react-app": "tasks/cra.sh",
77
"e2e": "tasks/e2e-simple.sh",
8-
"postinstall": "lerna bootstrap",
8+
"postinstall": "lerna bootstrap && cd packages/react-error-overlay/ && npm run build:prod",
99
"publish": "tasks/release.sh",
1010
"start": "node packages/react-scripts/scripts/start.js",
1111
"test": "node packages/react-scripts/scripts/test.js --env=jsdom",

‎packages/create-react-app/createReactApp.js

+12-13
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// tell people to update their global version of create-react-app.
2929
//
3030
// Also be careful with new language features.
31-
// This file must work on Node 4+.
31+
// This file must work on Node 6+.
3232
//
3333
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3434
// /!\ DO NOT MODIFY THIS FILE /!\
@@ -398,24 +398,23 @@ function getPackageName(installPackage) {
398398
}
399399

400400
function checkNpmVersion() {
401-
let isNpm2 = false;
401+
let hasMinNpm = false;
402402
try {
403403
const npmVersion = execSync('npm --version').toString();
404-
isNpm2 = semver.lt(npmVersion, '3.0.0');
404+
hasMinNpm = semver.gte(npmVersion, '3.0.0');
405405
} catch (err) {
406406
return;
407407
}
408-
if (!isNpm2) {
409-
return;
408+
409+
if (!hasMinNpm) {
410+
console.error(
411+
chalk.red(
412+
'Create React App requires npm 3 or higher. \n' +
413+
'Please update your version of npm.'
414+
)
415+
);
416+
process.exit(1);
410417
}
411-
console.log(chalk.yellow('It looks like you are using npm 2.'));
412-
console.log(
413-
chalk.yellow(
414-
'We suggest using npm 3 or Yarn for faster install times ' +
415-
'and less disk space usage.'
416-
)
417-
);
418-
console.log();
419418
}
420419

421420
function checkNodeVersion(packageName) {

‎packages/create-react-app/index.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,16 @@
4141
var chalk = require('chalk');
4242

4343
var currentNodeVersion = process.versions.node;
44-
if (currentNodeVersion.split('.')[0] < 4) {
44+
var semver = currentNodeVersion.split('.');
45+
var major = semver[0];
46+
47+
if (major < 6) {
4548
console.error(
4649
chalk.red(
4750
'You are running Node ' +
4851
currentNodeVersion +
4952
'.\n' +
50-
'Create React App requires Node 4 or higher. \n' +
53+
'Create React App requires Node 6 or higher. \n' +
5154
'Please update your version of Node.'
5255
)
5356
);

‎packages/create-react-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"repository": "facebookincubator/create-react-app",
99
"license": "BSD-3-Clause",
1010
"engines": {
11-
"node": ">=4"
11+
"node": ">=6"
1212
},
1313
"bugs": {
1414
"url": "https://github.com/facebookincubator/create-react-app/issues"

‎packages/eslint-config-react-app/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ module.exports = {
135135
'no-unused-vars': [
136136
'warn',
137137
{
138-
vars: 'local',
139-
varsIgnorePattern: '^_',
140138
args: 'none',
141139
ignoreRestSiblings: true,
142140
},

0 commit comments

Comments
 (0)