From fe9bb02f0eeec6ea00c78b3d62c2c8e7698a3877 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 8 Sep 2019 17:19:45 -0700 Subject: [PATCH 1/4] First crack at fixing build --- package.json | 2 +- packages/babel-preset-react-app/package.json | 14 +++++++------- packages/react-error-overlay/flow/env.js | 2 +- packages/react-error-overlay/package.json | 4 ++-- packages/react-error-overlay/src/index.js | 1 - .../src/listenToRuntimeErrors.js | 1 - packages/react-scripts/package.json | 10 +++++----- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 0a3be799398..c9d37461356 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "compile:lockfile": "node tasks/compile-lockfile.js" }, "devDependencies": { - "eslint": "6.1.0", + "eslint": "^6.1.0", "execa": "1.0.0", "fs-extra": "^7.0.1", "get-port": "^4.2.0", diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json index e9f6d29dcbf..09b2e6aabf7 100644 --- a/packages/babel-preset-react-app/package.json +++ b/packages/babel-preset-react-app/package.json @@ -21,19 +21,19 @@ "test.js" ], "dependencies": { - "@babel/core": "7.5.5", + "@babel/core": "7.6.0", "@babel/plugin-proposal-class-properties": "7.5.5", - "@babel/plugin-proposal-decorators": "7.4.4", + "@babel/plugin-proposal-decorators": "7.6.0", "@babel/plugin-proposal-object-rest-spread": "7.5.5", "@babel/plugin-syntax-dynamic-import": "7.2.0", - "@babel/plugin-transform-destructuring": "7.5.0", + "@babel/plugin-transform-destructuring": "7.6.0", "@babel/plugin-transform-flow-strip-types": "7.4.4", "@babel/plugin-transform-react-display-name": "7.2.0", - "@babel/plugin-transform-runtime": "7.5.5", - "@babel/preset-env": "7.5.5", + "@babel/plugin-transform-runtime": "7.6.0", + "@babel/preset-env": "7.6.0", "@babel/preset-react": "7.0.0", - "@babel/preset-typescript": "7.3.3", - "@babel/runtime": "7.5.5", + "@babel/preset-typescript": "7.6.0", + "@babel/runtime": "7.6.0", "babel-plugin-dynamic-import-node": "2.3.0", "babel-plugin-macros": "2.6.1", "babel-plugin-transform-react-remove-prop-types": "0.4.24" diff --git a/packages/react-error-overlay/flow/env.js b/packages/react-error-overlay/flow/env.js index 12b151f5e4b..d4d10e2806a 100644 --- a/packages/react-error-overlay/flow/env.js +++ b/packages/react-error-overlay/flow/env.js @@ -2,7 +2,7 @@ declare module 'anser' { declare module.exports: any; } -declare module 'babel-code-frame' { +declare module '@babel/code-frame' { declare module.exports: any; } diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index aa28f9dba96..92bf4d59337 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -35,9 +35,9 @@ ], "devDependencies": { "@babel/code-frame": "7.5.5", - "@babel/core": "7.5.5", + "@babel/core": "7.6.0", "anser": "1.4.8", - "babel-eslint": "10.0.2", + "babel-eslint": "10.0.3", "babel-jest": "^24.8.0", "babel-loader": "8.0.6", "babel-preset-react-app": "^9.0.1", diff --git a/packages/react-error-overlay/src/index.js b/packages/react-error-overlay/src/index.js index e8fbbb0dfad..55e59aeaf5d 100644 --- a/packages/react-error-overlay/src/index.js +++ b/packages/react-error-overlay/src/index.js @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* @flow */ import { listenToRuntimeErrors, crashWithFrames, diff --git a/packages/react-error-overlay/src/listenToRuntimeErrors.js b/packages/react-error-overlay/src/listenToRuntimeErrors.js index 670dbb0f8e4..049a79e384a 100644 --- a/packages/react-error-overlay/src/listenToRuntimeErrors.js +++ b/packages/react-error-overlay/src/listenToRuntimeErrors.js @@ -5,7 +5,6 @@ * LICENSE file in the root directory of this source tree. */ -/* @flow */ import { register as registerError, unregister as unregisterError, diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 6d86a6d8daa..fa908175915 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -28,11 +28,11 @@ }, "types": "./lib/react-app.d.ts", "dependencies": { - "@babel/core": "7.5.5", + "@babel/core": "7.6.0", "@svgr/webpack": "4.3.2", "@typescript-eslint/eslint-plugin": "1.13.0", "@typescript-eslint/parser": "1.13.0", - "babel-eslint": "10.0.2", + "babel-eslint": "10.0.3", "babel-jest": "^24.8.0", "babel-loader": "8.0.6", "babel-plugin-named-asset-import": "^0.3.3", @@ -55,10 +55,10 @@ "html-webpack-plugin": "4.0.0-beta.5", "identity-obj-proxy": "3.0.0", "is-wsl": "^1.1.0", - "jest": "24.8.0", + "jest": "24.9.0", "jest-environment-jsdom-fourteen": "0.1.0", - "jest-resolve": "24.8.0", - "jest-watch-typeahead": "0.3.1", + "jest-resolve": "24.9.0", + "jest-watch-typeahead": "0.4.0", "mini-css-extract-plugin": "0.5.0", "optimize-css-assets-webpack-plugin": "5.0.3", "pnp-webpack-plugin": "1.5.0", From 3a4bd5f330d6bf3b74f6ac740763f0cae38677df Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 8 Sep 2019 17:20:20 -0700 Subject: [PATCH 2/4] Cleanup simple test suite --- tasks/e2e-simple.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index ff6d2954b5f..4c59b191cdf 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -94,14 +94,11 @@ startLocalRegistry "$root_path"/tasks/verdaccio.yaml ./node_modules/.bin/eslint --max-warnings 0 packages/eslint-config-react-app/ ./node_modules/.bin/eslint --max-warnings 0 packages/react-dev-utils/ ./node_modules/.bin/eslint --max-warnings 0 packages/react-scripts/ +./node_modules/.bin/eslint --max-warnings 0 packages/react-error-overlay/src/ cd packages/react-error-overlay/ -./node_modules/.bin/eslint --max-warnings 0 src/ yarn test -if [ $APPVEYOR != 'True' ]; then - # Flow started hanging on AppVeyor after we moved to Yarn Workspaces :-( - yarn flow -fi +yarn flow cd ../.. cd packages/react-dev-utils/ From 108f96027278e64d9f8ceca04ca72008f415b119 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 8 Sep 2019 17:23:46 -0700 Subject: [PATCH 3/4] Revert jest upgrade --- packages/react-scripts/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index fa908175915..b4740dc31bb 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -55,10 +55,10 @@ "html-webpack-plugin": "4.0.0-beta.5", "identity-obj-proxy": "3.0.0", "is-wsl": "^1.1.0", - "jest": "24.9.0", + "jest": "24.8.0", "jest-environment-jsdom-fourteen": "0.1.0", - "jest-resolve": "24.9.0", - "jest-watch-typeahead": "0.4.0", + "jest-resolve": "24.8.0", + "jest-watch-typeahead": "0.3.1", "mini-css-extract-plugin": "0.5.0", "optimize-css-assets-webpack-plugin": "5.0.3", "pnp-webpack-plugin": "1.5.0", From 7d7e37e53f3fdccb108ac6e3373f71da3545074d Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 8 Sep 2019 17:59:27 -0700 Subject: [PATCH 4/4] Try disabling flow on windows build agents --- tasks/e2e-simple.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index 4c59b191cdf..de126e14633 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -98,7 +98,10 @@ startLocalRegistry "$root_path"/tasks/verdaccio.yaml cd packages/react-error-overlay/ yarn test -yarn flow +if [ $AGENT_OS != 'Windows_NT' ]; then + # Flow started hanging on Windows build agents + yarn flow +fi cd ../.. cd packages/react-dev-utils/