From fb848584107cfcd17010a61fd1976fb9bf7ecb6c Mon Sep 17 00:00:00 2001 From: aisensiy Date: Thu, 14 Sep 2017 13:53:52 +0800 Subject: [PATCH 01/10] update jest to 21.0.2 to support watchPathIgnorePatterns configuration --- packages/react-scripts/package.json | 4 ++-- packages/react-scripts/scripts/utils/createJestConfig.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index d49640bd3fb..6edd66ded88 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -24,7 +24,7 @@ "autoprefixer": "7.1.6", "babel-core": "6.26.0", "babel-eslint": "7.2.3", - "babel-jest": "20.0.3", + "babel-jest": "21.0.2", "babel-loader": "7.1.2", "babel-preset-react-app": "^3.1.0", "babel-runtime": "6.26.0", @@ -44,7 +44,7 @@ "file-loader": "1.1.5", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", - "jest": "20.0.4", + "jest": "21.0.2", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js index b4c2cfa5ea9..4c2e6f1d002 100644 --- a/packages/react-scripts/scripts/utils/createJestConfig.js +++ b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -62,6 +62,7 @@ module.exports = (resolve, rootDir, isEjecting) => { 'coverageReporters', 'coverageThreshold', 'snapshotSerializers', + 'watchPathIgnorePatterns', ]; if (overrides) { supportedKeys.forEach(key => { From 48523b53ad0fa4a497d74df76e774b574ff9209f Mon Sep 17 00:00:00 2001 From: aisensiy Date: Mon, 18 Sep 2017 11:25:27 +0800 Subject: [PATCH 02/10] update jest to 21.1.0 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 6edd66ded88..e5532eab11c 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -44,7 +44,7 @@ "file-loader": "1.1.5", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", - "jest": "21.0.2", + "jest": "21.1.0", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", From 1a75d450b36ddfa9ad8c8101b5aa97304a602495 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 9 Jan 2018 17:57:05 +0000 Subject: [PATCH 03/10] Try bumping Jest --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index e5532eab11c..4109679b08a 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -44,7 +44,7 @@ "file-loader": "1.1.5", "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", - "jest": "21.1.0", + "jest": "22.0.5", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.2.0", "postcss-loader": "2.0.8", From 980e1a047d19ff37ef194a63b208cbcc0fa2528a Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 10 Jan 2018 15:57:50 +0000 Subject: [PATCH 04/10] Bump babel-jest --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 4109679b08a..f5a3af2739d 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -24,7 +24,7 @@ "autoprefixer": "7.1.6", "babel-core": "6.26.0", "babel-eslint": "7.2.3", - "babel-jest": "21.0.2", + "babel-jest": "22.0.4", "babel-loader": "7.1.2", "babel-preset-react-app": "^3.1.0", "babel-runtime": "6.26.0", From 3cecb9d40f4ddd83fc15627991835f04b08f8136 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 10 Jan 2018 16:04:35 +0000 Subject: [PATCH 05/10] Try to debug weird CI failure --- tasks/e2e-kitchensink.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index 20c6dbb05e0..25ee1d5c083 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -129,6 +129,15 @@ REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \ NODE_ENV=test \ yarn test --no-cache --testPathPattern=src +echo "before weird stuff" + +PORT=3001 \ + REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \ + NODE_PATH=src \ + npm start + +echo "after weird stuff" + # Test "development" environment tmp_server_log=`mktemp` PORT=3001 \ From 9fc9ac6e17cd76c052929309d47739b3d379ab9f Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 10 Jan 2018 16:45:15 +0000 Subject: [PATCH 06/10] Remove debug code --- tasks/e2e-kitchensink.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index 25ee1d5c083..20c6dbb05e0 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -129,15 +129,6 @@ REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \ NODE_ENV=test \ yarn test --no-cache --testPathPattern=src -echo "before weird stuff" - -PORT=3001 \ - REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \ - NODE_PATH=src \ - npm start - -echo "after weird stuff" - # Test "development" environment tmp_server_log=`mktemp` PORT=3001 \ From 53f464c7342146e6512c7ae100d6889b610c8a6c Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 10 Jan 2018 17:55:22 +0000 Subject: [PATCH 07/10] Bump other Jest packages --- packages/react-dev-utils/package.json | 2 +- packages/react-error-overlay/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 54606f33fe8..6b4e716749c 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -56,7 +56,7 @@ "text-table": "0.2.0" }, "devDependencies": { - "jest": "20.0.4" + "jest": "22.0.5" }, "scripts": { "test": "jest" diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index d4e528ea6c6..987f6f5ad8c 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -48,7 +48,7 @@ "eslint-plugin-react": "7.1.0", "flow-bin": "^0.54.0", "html-entities": "1.2.1", - "jest": "20.0.4", + "jest": "22.0.5", "jest-fetch-mock": "1.2.1", "object-assign": "4.1.1", "promise": "8.0.1", From 8055d69d6af4389b395c7e672343bc487cbc2aaf Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 11 Jan 2018 02:11:56 -0500 Subject: [PATCH 08/10] ffs --- tasks/e2e-kitchensink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index 20c6dbb05e0..d12a3d645c0 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -155,7 +155,7 @@ E2E_FILE=./build/index.html \ # ****************************************************************************** # Eject... -echo yes | yarn eject +echo yes | npm run eject # Link to test module npm link "$temp_module_path/node_modules/test-integrity" From 62aec9ac1ae70a995a89548feb7ac7870e5324c0 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 11 Jan 2018 02:13:04 -0500 Subject: [PATCH 09/10] temp --- appveyor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5d957aa7eea..c5208c53b13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,10 +2,6 @@ image: Visual Studio 2017 environment: matrix: - - nodejs_version: 8 - test_suite: "simple" - - nodejs_version: 8 - test_suite: "installs" - nodejs_version: 8 test_suite: "kitchensink" - nodejs_version: 6 From 024ce8716f4e24d8eadfb492410436592153513b Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 11 Jan 2018 02:29:52 -0500 Subject: [PATCH 10/10] Revert "temp" This reverts commit 62aec9ac1ae70a995a89548feb7ac7870e5324c0. --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index c5208c53b13..5d957aa7eea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,10 @@ image: Visual Studio 2017 environment: matrix: + - nodejs_version: 8 + test_suite: "simple" + - nodejs_version: 8 + test_suite: "installs" - nodejs_version: 8 test_suite: "kitchensink" - nodejs_version: 6