From b7f46c3ba7e99edc6755d7c20859430ee9150b45 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhus Date: Wed, 22 Jan 2020 20:38:47 +0100 Subject: [PATCH 1/6] Upgrade to Jest 25 --- package.json | 2 +- packages/babel-plugin-named-asset-import/package.json | 2 +- packages/confusing-browser-globals/package.json | 2 +- packages/react-dev-utils/package.json | 2 +- packages/react-error-overlay/package.json | 4 ++-- packages/react-scripts/fixtures/kitchensink/template.json | 2 +- packages/react-scripts/package.json | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index a9f6b18192f..07a50b43968 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "get-port": "^4.2.0", "globby": "^9.1.0", "husky": "^1.3.1", - "jest": "24.9.0", + "jest": "25.1.0", "lerna": "3.19.0", "lerna-changelog": "~0.8.2", "lint-staged": "^8.0.4", diff --git a/packages/babel-plugin-named-asset-import/package.json b/packages/babel-plugin-named-asset-import/package.json index 63c88d736c6..ce5d9e3d337 100644 --- a/packages/babel-plugin-named-asset-import/package.json +++ b/packages/babel-plugin-named-asset-import/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "babel-plugin-tester": "^8.0.1", - "jest": "24.9.0" + "jest": "25.1.0" }, "scripts": { "test": "jest" diff --git a/packages/confusing-browser-globals/package.json b/packages/confusing-browser-globals/package.json index b133e7ff9f6..34d66609fa3 100644 --- a/packages/confusing-browser-globals/package.json +++ b/packages/confusing-browser-globals/package.json @@ -20,6 +20,6 @@ "index.js" ], "devDependencies": { - "jest": "24.9.0" + "jest": "25.1.0" } } diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 6884beeb905..b576d79c38a 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -77,7 +77,7 @@ }, "devDependencies": { "cross-env": "^6.0.3", - "jest": "24.9.0" + "jest": "25.1.0" }, "scripts": { "test": "cross-env FORCE_COLOR=true jest" diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index 34bb8434bc9..7d022787f70 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -38,7 +38,7 @@ "@babel/core": "7.7.5", "anser": "1.4.9", "babel-eslint": "10.0.3", - "babel-jest": "^24.9.0", + "babel-jest": "25.1.0", "babel-loader": "8.0.6", "babel-preset-react-app": "^9.1.0", "chalk": "3.0.0", @@ -52,7 +52,7 @@ "eslint-plugin-react": "7.17.0", "flow-bin": "^0.116.0", "html-entities": "1.2.1", - "jest": "24.9.0", + "jest": "25.1.0", "jest-fetch-mock": "2.1.2", "object-assign": "4.1.1", "promise": "8.0.3", diff --git a/packages/react-scripts/fixtures/kitchensink/template.json b/packages/react-scripts/fixtures/kitchensink/template.json index 954cb3b2d73..2c36ebf7d00 100644 --- a/packages/react-scripts/fixtures/kitchensink/template.json +++ b/packages/react-scripts/fixtures/kitchensink/template.json @@ -2,7 +2,7 @@ "package": { "dependencies": { "bootstrap": "4.3.1", - "jest": "24.9.0", + "jest": "25.1.0", "node-sass": "4.12.0", "normalize.css": "7.0.0", "prop-types": "15.7.2", diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index fd47d222ca2..dde3c624a3f 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -33,7 +33,7 @@ "@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/parser": "^2.10.0", "babel-eslint": "10.0.3", - "babel-jest": "^24.9.0", + "babel-jest": "25.1.0", "babel-loader": "8.0.6", "babel-plugin-named-asset-import": "^0.3.5", "babel-preset-react-app": "^9.1.0", @@ -54,9 +54,9 @@ "fs-extra": "^8.1.0", "html-webpack-plugin": "4.0.0-beta.11", "identity-obj-proxy": "3.0.0", - "jest": "24.9.0", + "jest": "25.1.0", "jest-environment-jsdom-fourteen": "1.0.1", - "jest-resolve": "24.9.0", + "jest-resolve": "25.1.0", "jest-watch-typeahead": "0.4.2", "mini-css-extract-plugin": "0.8.0", "optimize-css-assets-webpack-plugin": "5.0.3", From 328f1c4f8f39b0e00fdff16a1c906700e4c0f18b Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 5 Apr 2020 22:00:25 -0700 Subject: [PATCH 2/6] Bump jest packages to latest --- package.json | 2 +- packages/babel-plugin-named-asset-import/package.json | 2 +- packages/confusing-browser-globals/package.json | 2 +- packages/cra-template-typescript/template.json | 2 +- packages/react-dev-utils/package.json | 2 +- packages/react-error-overlay/package.json | 2 +- packages/react-scripts/fixtures/kitchensink/template.json | 2 +- packages/react-scripts/package.json | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index fc01a0affeb..ff3c94f17c3 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "get-port": "^4.2.0", "globby": "^9.1.0", "husky": "^1.3.1", - "jest": "25.1.0", + "jest": "25.2.7", "lerna": "3.19.0", "lerna-changelog": "~0.8.2", "lint-staged": "^8.0.4", diff --git a/packages/babel-plugin-named-asset-import/package.json b/packages/babel-plugin-named-asset-import/package.json index a267ee41b12..60f3282ee6d 100644 --- a/packages/babel-plugin-named-asset-import/package.json +++ b/packages/babel-plugin-named-asset-import/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "babel-plugin-tester": "^8.0.1", - "jest": "25.1.0" + "jest": "25.2.7" }, "scripts": { "test": "jest" diff --git a/packages/confusing-browser-globals/package.json b/packages/confusing-browser-globals/package.json index 34d66609fa3..50cb1836785 100644 --- a/packages/confusing-browser-globals/package.json +++ b/packages/confusing-browser-globals/package.json @@ -20,6 +20,6 @@ "index.js" ], "devDependencies": { - "jest": "25.1.0" + "jest": "25.2.7" } } diff --git a/packages/cra-template-typescript/template.json b/packages/cra-template-typescript/template.json index c50d194cb06..2c789a3f302 100644 --- a/packages/cra-template-typescript/template.json +++ b/packages/cra-template-typescript/template.json @@ -7,7 +7,7 @@ "@types/node": "^12.0.0", "@types/react": "^16.9.0", "@types/react-dom": "^16.9.0", - "@types/jest": "^24.0.0", + "@types/jest": "^25.0.0", "typescript": "^3.8.0" } } diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 48f20090253..720859da466 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -79,7 +79,7 @@ }, "devDependencies": { "cross-env": "^6.0.3", - "jest": "25.1.0" + "jest": "25.2.7" }, "scripts": { "test": "cross-env FORCE_COLOR=true jest" diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index fb651bc7043..98e72430ae1 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -52,7 +52,7 @@ "eslint-plugin-react": "7.19.0", "flow-bin": "^0.116.0", "html-entities": "1.2.1", - "jest": "25.1.0", + "jest": "25.2.7", "jest-fetch-mock": "2.1.2", "object-assign": "4.1.1", "promise": "8.0.3", diff --git a/packages/react-scripts/fixtures/kitchensink/template.json b/packages/react-scripts/fixtures/kitchensink/template.json index 2c36ebf7d00..2e06e0a75bf 100644 --- a/packages/react-scripts/fixtures/kitchensink/template.json +++ b/packages/react-scripts/fixtures/kitchensink/template.json @@ -2,7 +2,7 @@ "package": { "dependencies": { "bootstrap": "4.3.1", - "jest": "25.1.0", + "jest": "25.2.7", "node-sass": "4.12.0", "normalize.css": "7.0.0", "prop-types": "15.7.2", diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 3b730a69a55..78122110420 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -55,10 +55,10 @@ "fs-extra": "^8.1.0", "html-webpack-plugin": "4.0.0-beta.11", "identity-obj-proxy": "3.0.0", - "jest": "25.1.0", + "jest": "25.2.7", "jest-environment-jsdom-fourteen": "1.0.1", - "jest-resolve": "25.1.0", - "jest-watch-typeahead": "0.4.2", + "jest-resolve": "25.2.6", + "jest-watch-typeahead": "0.5.0", "mini-css-extract-plugin": "0.9.0", "optimize-css-assets-webpack-plugin": "5.0.3", "pnp-webpack-plugin": "1.6.4", From d276168845e5d3a960c249972dbdf8cc3479767d Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 5 Apr 2020 22:21:14 -0700 Subject: [PATCH 3/6] Add todo to jest testEnvironment --- packages/react-scripts/scripts/utils/createJestConfig.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js index a521686f13f..a3679d6b92b 100644 --- a/packages/react-scripts/scripts/utils/createJestConfig.js +++ b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -38,6 +38,8 @@ module.exports = (resolve, rootDir, isEjecting) => { '/src/**/__tests__/**/*.{js,jsx,ts,tsx}', '/src/**/*.{spec,test}.{js,jsx,ts,tsx}', ], + // TODO: This doesn't actually do anything currently as the test script explicitly specifies the env. + // See https://github.com/facebook/create-react-app/issues/7491 testEnvironment: 'jest-environment-jsdom-fourteen', transform: { '^.+\\.(js|jsx|mjs|cjs|ts|tsx)$': isEjecting From df02e249cb87ed9e9fdf3f9667e5cb8c2c7330a6 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 3 May 2020 16:38:10 -0700 Subject: [PATCH 4/6] Bump jest to latest --- package.json | 2 +- packages/babel-plugin-named-asset-import/package.json | 2 +- packages/confusing-browser-globals/package.json | 2 +- packages/react-dev-utils/package.json | 2 +- packages/react-error-overlay/package.json | 2 +- packages/react-scripts/package.json | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 00633ee868e..cef165341b1 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "get-port": "^4.2.0", "globby": "^9.1.0", "husky": "^1.3.1", - "jest": "25.2.7", + "jest": "25.5.4", "lerna": "3.20.2", "lerna-changelog": "~0.8.2", "lint-staged": "^8.0.4", diff --git a/packages/babel-plugin-named-asset-import/package.json b/packages/babel-plugin-named-asset-import/package.json index 60f3282ee6d..7d799a96fde 100644 --- a/packages/babel-plugin-named-asset-import/package.json +++ b/packages/babel-plugin-named-asset-import/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "babel-plugin-tester": "^8.0.1", - "jest": "25.2.7" + "jest": "25.5.4" }, "scripts": { "test": "jest" diff --git a/packages/confusing-browser-globals/package.json b/packages/confusing-browser-globals/package.json index 50cb1836785..b1057191259 100644 --- a/packages/confusing-browser-globals/package.json +++ b/packages/confusing-browser-globals/package.json @@ -20,6 +20,6 @@ "index.js" ], "devDependencies": { - "jest": "25.2.7" + "jest": "25.5.4" } } diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 7effa59c9f9..9af96ca4471 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -79,7 +79,7 @@ }, "devDependencies": { "cross-env": "^6.0.3", - "jest": "25.2.7" + "jest": "25.5.4" }, "scripts": { "test": "cross-env FORCE_COLOR=true jest" diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index 08135c15012..62e435c547e 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -52,7 +52,7 @@ "eslint-plugin-react": "7.19.0", "flow-bin": "^0.116.0", "html-entities": "1.3.1", - "jest": "25.2.7", + "jest": "25.5.4", "jest-fetch-mock": "2.1.2", "object-assign": "4.1.1", "promise": "8.1.0", diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index e7af23236b6..6b349060418 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -55,9 +55,9 @@ "fs-extra": "^8.1.0", "html-webpack-plugin": "4.3.0", "identity-obj-proxy": "3.0.0", - "jest": "25.2.7", + "jest": "25.5.4", "jest-environment-jsdom-fourteen": "1.0.1", - "jest-resolve": "25.2.6", + "jest-resolve": "25.5.1", "jest-watch-typeahead": "0.5.0", "mini-css-extract-plugin": "0.9.0", "optimize-css-assets-webpack-plugin": "5.0.3", From 7c700b2aea95b7103930fa7f8557d8c93f560ce7 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 3 May 2020 16:39:36 -0700 Subject: [PATCH 5/6] Fix missed version bump --- packages/react-scripts/fixtures/kitchensink/template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/fixtures/kitchensink/template.json b/packages/react-scripts/fixtures/kitchensink/template.json index 2e06e0a75bf..ca3e4aece9c 100644 --- a/packages/react-scripts/fixtures/kitchensink/template.json +++ b/packages/react-scripts/fixtures/kitchensink/template.json @@ -2,7 +2,7 @@ "package": { "dependencies": { "bootstrap": "4.3.1", - "jest": "25.2.7", + "jest": "25.5.4", "node-sass": "4.12.0", "normalize.css": "7.0.0", "prop-types": "15.7.2", From 0d313badbb7b80cd12eb7929cf225a224fbe17b4 Mon Sep 17 00:00:00 2001 From: Ian Schmitz Date: Sun, 3 May 2020 17:02:17 -0700 Subject: [PATCH 6/6] Remove jsdom-fourteen --- packages/react-scripts/package.json | 1 - packages/react-scripts/scripts/utils/createJestConfig.js | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 6b349060418..01afbb1faaa 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -56,7 +56,6 @@ "html-webpack-plugin": "4.3.0", "identity-obj-proxy": "3.0.0", "jest": "25.5.4", - "jest-environment-jsdom-fourteen": "1.0.1", "jest-resolve": "25.5.1", "jest-watch-typeahead": "0.5.0", "mini-css-extract-plugin": "0.9.0", diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js index a3679d6b92b..fc4269918fb 100644 --- a/packages/react-scripts/scripts/utils/createJestConfig.js +++ b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -38,9 +38,7 @@ module.exports = (resolve, rootDir, isEjecting) => { '/src/**/__tests__/**/*.{js,jsx,ts,tsx}', '/src/**/*.{spec,test}.{js,jsx,ts,tsx}', ], - // TODO: This doesn't actually do anything currently as the test script explicitly specifies the env. - // See https://github.com/facebook/create-react-app/issues/7491 - testEnvironment: 'jest-environment-jsdom-fourteen', + testEnvironment: 'jsdom', transform: { '^.+\\.(js|jsx|mjs|cjs|ts|tsx)$': isEjecting ? '/node_modules/babel-jest'