From 142718524e1c55ea3c240f7340b21c3952ab6e57 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Sun, 14 Jan 2018 12:15:34 +0000 Subject: [PATCH 1/3] Bump dependencies --- packages/babel-preset-react-app/package.json | 24 +++++++-------- packages/create-react-app/package.json | 6 ++-- packages/react-dev-utils/package.json | 10 +++--- packages/react-error-overlay/package.json | 10 +++--- packages/react-scripts/package.json | 32 ++++++++++---------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json index 344f37b938d..c39dc805147 100644 --- a/packages/babel-preset-react-app/package.json +++ b/packages/babel-preset-react-app/package.json @@ -12,18 +12,18 @@ "dependencies.js" ], "dependencies": { - "@babel/core": "7.0.0-beta.36", - "@babel/plugin-proposal-class-properties": "7.0.0-beta.36", - "@babel/plugin-syntax-dynamic-import": "^7.0.0-beta.36", - "@babel/plugin-transform-classes": "7.0.0-beta.36", - "@babel/plugin-transform-react-constant-elements": "7.0.0-beta.36", - "@babel/plugin-transform-react-display-name": "7.0.0-beta.36", - "@babel/plugin-transform-react-jsx": "7.0.0-beta.36", - "@babel/plugin-transform-regenerator": "7.0.0-beta.36", - "@babel/plugin-transform-runtime": "7.0.0-beta.36", - "@babel/preset-env": "7.0.0-beta.36", - "@babel/preset-flow": "7.0.0-beta.36", - "@babel/preset-react": "7.0.0-beta.36", + "@babel/core": "7.0.0-beta.37", + "@babel/plugin-proposal-class-properties": "7.0.0-beta.37", + "@babel/plugin-syntax-dynamic-import": "^7.0.0-beta.37", + "@babel/plugin-transform-classes": "7.0.0-beta.37", + "@babel/plugin-transform-react-constant-elements": "7.0.0-beta.37", + "@babel/plugin-transform-react-display-name": "7.0.0-beta.37", + "@babel/plugin-transform-react-jsx": "7.0.0-beta.37", + "@babel/plugin-transform-regenerator": "7.0.0-beta.37", + "@babel/plugin-transform-runtime": "7.0.0-beta.37", + "@babel/preset-env": "7.0.0-beta.37", + "@babel/preset-flow": "7.0.0-beta.37", + "@babel/preset-react": "7.0.0-beta.37", "babel-plugin-macros": "2.0.0", "babel-plugin-transform-dynamic-import": "2.0.0" } diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json index 1b3b60aac80..0e7a086dfec 100644 --- a/packages/create-react-app/package.json +++ b/packages/create-react-app/package.json @@ -21,15 +21,15 @@ "create-react-app": "./index.js" }, "dependencies": { - "chalk": "^1.1.1", + "chalk": "^2.3.0", "commander": "^2.9.0", "cross-spawn": "^4.0.0", "envinfo": "^3.8.0", - "fs-extra": "^1.0.0", + "fs-extra": "^5.0.0", "hyperquest": "^2.1.2", "semver": "^5.0.3", "tar-pack": "^3.4.0", - "tmp": "0.0.31", + "tmp": "0.0.33", "validate-npm-package-name": "^3.0.0" } } diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 6344c01185d..2377e239b18 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -37,22 +37,22 @@ ], "dependencies": { "address": "1.0.3", - "@babel/code-frame": "7.0.0-beta.36", - "chalk": "1.1.3", + "@babel/code-frame": "7.0.0-beta.37", + "chalk": "2.3.0", "cross-spawn": "5.1.0", "detect-port-alt": "1.1.3", "escape-string-regexp": "1.0.5", "filesize": "3.5.11", "global-modules": "1.0.0", - "gzip-size": "3.0.0", - "inquirer": "3.3.0", + "gzip-size": "4.1.0", + "inquirer": "5.0.0", "is-root": "1.0.0", "opn": "5.2.0", "react-error-overlay": "^3.0.0", "recursive-readdir": "2.2.1", "shell-quote": "1.6.1", "sockjs-client": "1.1.4", - "strip-ansi": "3.0.1", + "strip-ansi": "4.0.0", "text-table": "0.2.0" }, "devDependencies": { diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index 37feaa199d2..04e4cf4a778 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -42,12 +42,12 @@ "chalk": "^2.1.0", "chokidar": "^1.7.0", "cross-env": "5.0.5", - "eslint": "4.4.1", + "eslint": "4.15.0", "eslint-config-react-app": "^2.0.1", - "eslint-plugin-flowtype": "2.35.0", - "eslint-plugin-import": "2.7.0", - "eslint-plugin-jsx-a11y": "6.0.2", - "eslint-plugin-react": "7.1.0", + "eslint-plugin-flowtype": "2.41.0", + "eslint-plugin-import": "2.8.0", + "eslint-plugin-jsx-a11y": "6.0.3", + "eslint-plugin-react": "7.5.1", "flow-bin": "^0.63.1", "html-entities": "1.2.1", "jest": "22.0.6", diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index aa7c62bc8fb..9768254891f 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -21,44 +21,44 @@ "react-scripts": "./bin/react-scripts.js" }, "dependencies": { - "@babel/core": "7.0.0-beta.36", - "@babel/runtime": "7.0.0-beta.36", - "autoprefixer": "7.1.6", + "@babel/core": "7.0.0-beta.37", + "@babel/runtime": "7.0.0-beta.37", + "autoprefixer": "7.2.5", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "8.0.2", + "babel-eslint": "8.2.1", "babel-jest": "22.0.6", "babel-loader": "8.0.0-beta.0", "babel-preset-react-app": "^3.1.0", "case-sensitive-paths-webpack-plugin": "2.1.1", - "chalk": "1.1.3", - "css-loader": "0.28.7", + "chalk": "2.3.0", + "css-loader": "0.28.8", "dotenv": "4.0.0", "dotenv-expand": "4.0.1", "eslint": "4.15.0", "eslint-config-react-app": "^2.0.1", "eslint-loader": "1.9.0", - "eslint-plugin-flowtype": "2.39.1", + "eslint-plugin-flowtype": "2.41.0", "eslint-plugin-import": "2.8.0", - "eslint-plugin-jsx-a11y": "6.0.2", - "eslint-plugin-react": "7.4.0", + "eslint-plugin-jsx-a11y": "6.0.3", + "eslint-plugin-react": "7.5.1", "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.5", - "fs-extra": "3.0.1", - "html-webpack-plugin": "2.29.0", + "file-loader": "1.1.6", + "fs-extra": "5.0.0", + "html-webpack-plugin": "2.30.1", "jest": "22.0.6", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", - "postcss-loader": "2.0.8", + "postcss-loader": "2.0.10", "promise": "8.0.1", "raf": "3.4.0", "react-dev-utils": "^4.2.1", - "style-loader": "0.19.0", + "style-loader": "0.19.1", "sw-precache-webpack-plugin": "0.11.4", "thread-loader": "1.1.2", "uglifyjs-webpack-plugin": "1.1.6", "url-loader": "0.6.2", - "webpack": "3.8.1", - "webpack-dev-server": "2.9.4", + "webpack": "3.10.0", + "webpack-dev-server": "2.11.0", "webpack-manifest-plugin": "1.3.2", "whatwg-fetch": "2.0.3" }, From 0be0684812500c6d6e768829b0a0a348f3be4e45 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Sun, 14 Jan 2018 12:30:24 +0000 Subject: [PATCH 2/3] Use a more sensible way to compile error overlay --- .../webpack.config.iframe.js | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/react-error-overlay/webpack.config.iframe.js b/packages/react-error-overlay/webpack.config.iframe.js index e6a7f69de30..a3cc7c44861 100644 --- a/packages/react-error-overlay/webpack.config.iframe.js +++ b/packages/react-error-overlay/webpack.config.iframe.js @@ -18,17 +18,28 @@ module.exports = { module: { rules: [ { - test: /\.js$/, - include: [ - path.resolve(__dirname, './src'), - /[\/\\]node_modules[\/\\](ansi-styles|chalk)[\/\\]/, - ], - use: { - loader: 'babel-loader', - options: { - presets: ['react-app'], + oneOf: [ + // Source + { + test: /\.js$/, + include: [path.resolve(__dirname, './src')], + use: { + loader: 'babel-loader', + }, + }, + // Dependencies + { + test: /\.js$/, + use: { + loader: 'babel-loader', + options: { + babelrc: false, + compact: false, + presets: ['babel-preset-react-app/dependencies'], + }, + }, }, - }, + ], }, ], }, From b9d9f6a9fc7a2b4a18ff52623870aa2e47ccfa92 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Sun, 14 Jan 2018 12:33:33 +0000 Subject: [PATCH 3/3] Keep old chalk for global CLI --- packages/create-react-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json index 0e7a086dfec..1e2b57d1447 100644 --- a/packages/create-react-app/package.json +++ b/packages/create-react-app/package.json @@ -21,7 +21,7 @@ "create-react-app": "./index.js" }, "dependencies": { - "chalk": "^2.3.0", + "chalk": "^1.1.3", "commander": "^2.9.0", "cross-spawn": "^4.0.0", "envinfo": "^3.8.0",