From 0a2dba76823ea7f1a05f344f24e15ef2b02cc682 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Wed, 17 Apr 2019 18:01:17 -0700 Subject: [PATCH 1/3] Relax eslint version range --- packages/react-error-overlay/package.json | 2 +- packages/react-scripts/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index ca951fff90d..8a2da1387f4 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -44,7 +44,7 @@ "chalk": "^2.4.2", "chokidar": "^2.1.2", "cross-env": "5.2.0", - "eslint": "5.16.0", + "eslint": "^5.16.0", "eslint-config-react-app": "^3.0.8", "eslint-plugin-flowtype": "2.50.1", "eslint-plugin-import": "2.16.0", diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 8116b28a224..261728675d1 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -41,7 +41,7 @@ "css-loader": "2.1.1", "dotenv": "6.2.0", "dotenv-expand": "4.2.0", - "eslint": "5.16.0", + "eslint": "^5.16.0", "eslint-config-react-app": "^3.0.8", "eslint-loader": "2.1.2", "eslint-plugin-flowtype": "2.50.1", From d16a2256478d06ea5adb89522de514be3b5e36ca Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Wed, 17 Apr 2019 18:59:30 -0700 Subject: [PATCH 2/3] Use semver package to compare versions --- packages/create-react-app/package.json | 2 +- packages/react-scripts/package.json | 5 +++-- packages/react-scripts/scripts/utils/verifyPackageTree.js | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json index bf7ceb6ab2a..3bc7238aaf4 100644 --- a/packages/create-react-app/package.json +++ b/packages/create-react-app/package.json @@ -33,7 +33,7 @@ "fs-extra": "7.0.1", "hyperquest": "2.1.3", "inquirer": "6.2.2", - "semver": "5.6.0", + "semver": "6.0.0", "tar-pack": "3.4.1", "tmp": "0.0.33", "validate-npm-package-name": "3.0.0" diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 261728675d1..00e4ae8c46e 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -3,8 +3,8 @@ "version": "2.1.8", "description": "Configuration and scripts for Create React App.", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/react-scripts" }, "license": "MIT", @@ -70,6 +70,7 @@ "react-dev-utils": "^8.0.0", "resolve": "1.10.0", "sass-loader": "7.1.0", + "semver": "6.0.0", "style-loader": "0.23.1", "terser-webpack-plugin": "1.2.3", "url-loader": "1.1.2", diff --git a/packages/react-scripts/scripts/utils/verifyPackageTree.js b/packages/react-scripts/scripts/utils/verifyPackageTree.js index 075860eac5b..210043ff7c4 100644 --- a/packages/react-scripts/scripts/utils/verifyPackageTree.js +++ b/packages/react-scripts/scripts/utils/verifyPackageTree.js @@ -10,6 +10,7 @@ const chalk = require('react-dev-utils/chalk'); const fs = require('fs'); +const semver = require('semver'); const path = require('path'); // We assume that having wrong versions of these @@ -74,7 +75,7 @@ function verifyPackageTree() { fs.readFileSync(maybeDepPackageJson, 'utf8') ); const expectedVersion = expectedVersionsByDep[dep]; - if (depPackageJson.version !== expectedVersion) { + if (!semver.satisfies(depPackageJson.version, expectedVersion)) { console.error( chalk.red( `\nThere might be a problem with the project dependency tree.\n` + From f2c9dc46104b6f28857d1bf69ac8deb3db7363a5 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Wed, 17 Apr 2019 19:01:42 -0700 Subject: [PATCH 3/3] Cleanup package.json files whitespace --- packages/babel-plugin-named-asset-import/package.json | 4 ++-- packages/babel-preset-react-app/package.json | 4 ++-- packages/confusing-browser-globals/package.json | 4 ++-- packages/create-react-app/package.json | 4 ++-- packages/eslint-config-react-app/package.json | 4 ++-- packages/react-app-polyfill/package.json | 4 ++-- packages/react-dev-utils/package.json | 4 ++-- packages/react-error-overlay/package.json | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/babel-plugin-named-asset-import/package.json b/packages/babel-plugin-named-asset-import/package.json index 165b49565d2..73d06ee0ce8 100644 --- a/packages/babel-plugin-named-asset-import/package.json +++ b/packages/babel-plugin-named-asset-import/package.json @@ -3,8 +3,8 @@ "version": "0.3.1", "description": "Babel plugin for named asset imports in Create React App", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/babel-plugin-named-asset-import" }, "license": "MIT", diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json index af39b6d46c9..ef16d126e44 100644 --- a/packages/babel-preset-react-app/package.json +++ b/packages/babel-preset-react-app/package.json @@ -3,8 +3,8 @@ "version": "7.0.2", "description": "Babel preset used by Create React App", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/babel-preset-react-app" }, "license": "MIT", diff --git a/packages/confusing-browser-globals/package.json b/packages/confusing-browser-globals/package.json index 879c6f8d2d9..672a1699e2e 100644 --- a/packages/confusing-browser-globals/package.json +++ b/packages/confusing-browser-globals/package.json @@ -8,8 +8,8 @@ "test": "jest" }, "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/confusing-browser-globals" }, "keywords": [ diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json index 3bc7238aaf4..8d4ae65d9b1 100644 --- a/packages/create-react-app/package.json +++ b/packages/create-react-app/package.json @@ -6,8 +6,8 @@ ], "description": "Create React apps with no build configuration.", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/create-react-app" }, "license": "MIT", diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json index a47a07fd623..896cf4bc806 100644 --- a/packages/eslint-config-react-app/package.json +++ b/packages/eslint-config-react-app/package.json @@ -3,8 +3,8 @@ "version": "3.0.8", "description": "ESLint configuration used by Create React App", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/eslint-config-react-app" }, "license": "MIT", diff --git a/packages/react-app-polyfill/package.json b/packages/react-app-polyfill/package.json index af264067f86..71e67d38be7 100644 --- a/packages/react-app-polyfill/package.json +++ b/packages/react-app-polyfill/package.json @@ -3,8 +3,8 @@ "version": "0.2.2", "description": "Polyfills for various browsers including commonly used language features", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/react-app-polyfill" }, "license": "MIT", diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 4c79e4299c4..adafd95c042 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -3,8 +3,8 @@ "version": "8.0.0", "description": "Webpack utilities used by Create React App", "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/react-dev-utils" }, "license": "MIT", diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index 8a2da1387f4..27f78244a0f 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -11,8 +11,8 @@ "build:prod": "cross-env NODE_ENV=production node build.js" }, "repository": { - "type" : "git", - "url" : "https://github.com/facebook/create-react-app.git", + "type": "git", + "url": "https://github.com/facebook/create-react-app.git", "directory": "packages/react-error-overlay" }, "license": "MIT",