From 45d3c45bb10c537882ca2d6fff39acded557c1ad Mon Sep 17 00:00:00 2001 From: merceyz Date: Tue, 14 Dec 2021 18:15:46 +0100 Subject: [PATCH 1/5] fix(template-typescript): add missing dependency `@types/testing-library__jest-dom` --- packages/cra-template-typescript/template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cra-template-typescript/template.json b/packages/cra-template-typescript/template.json index db2d4761047..f59d5dfb2ba 100644 --- a/packages/cra-template-typescript/template.json +++ b/packages/cra-template-typescript/template.json @@ -8,6 +8,7 @@ "@types/node": "^16.7.13", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", + "@types/testing-library__jest-dom": "^5.14.2", "typescript": "^4.4.2", "web-vitals": "^2.1.0" }, From 9f3028e697eb2f3970a531cd8edf399b563979a8 Mon Sep 17 00:00:00 2001 From: merceyz Date: Tue, 14 Dec 2021 18:16:29 +0100 Subject: [PATCH 2/5] fix(babel-preset): add missing dependency `@babel/plugin-proposal-private-property-in-object` --- package-lock.json | 52 ++++++-------------- packages/babel-preset-react-app/package.json | 1 + 2 files changed, 16 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea5b4f049f7..6dfa2abdd0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29774,6 +29774,7 @@ "@babel/plugin-proposal-numeric-separator": "^7.16.0", "@babel/plugin-proposal-optional-chaining": "^7.16.0", "@babel/plugin-proposal-private-methods": "^7.16.0", + "@babel/plugin-proposal-private-property-in-object": "^7.16.0", "@babel/plugin-transform-flow-strip-types": "^7.16.0", "@babel/plugin-transform-react-display-name": "^7.16.0", "@babel/plugin-transform-runtime": "^7.16.4", @@ -29793,21 +29794,21 @@ } }, "packages/cra-template": { - "version": "1.1.3", + "version": "1.2.0", "license": "MIT", "engines": { "node": ">=14" } }, "packages/cra-template-typescript": { - "version": "1.1.3", + "version": "1.2.0", "license": "MIT", "engines": { "node": ">=14" } }, "packages/create-react-app": { - "version": "5.0.0", + "version": "5.0.1", "license": "MIT", "dependencies": { "chalk": "^4.1.2", @@ -29848,7 +29849,7 @@ } }, "packages/eslint-config-react-app": { - "version": "7.0.0", + "version": "7.0.1", "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", @@ -29889,7 +29890,7 @@ } }, "packages/react-dev-utils": { - "version": "12.0.0", + "version": "12.0.1", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.16.0", @@ -29911,7 +29912,7 @@ "open": "^8.4.0", "pkg-up": "^3.1.0", "prompts": "^2.4.2", - "react-error-overlay": "^6.0.10", + "react-error-overlay": "^6.0.11", "recursive-readdir": "^2.2.2", "shell-quote": "^1.7.3", "strip-ansi": "^6.0.1", @@ -29934,7 +29935,7 @@ } }, "packages/react-error-overlay": { - "version": "6.0.10", + "version": "6.0.11", "license": "MIT", "devDependencies": { "@babel/code-frame": "^7.16.0", @@ -29946,17 +29947,6 @@ "chalk": "^4.1.2", "chokidar": "^3.5.2", "cross-env": "^7.0.3", - "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", -<<<<<<< HEAD -======= -======= -<<<<<<< HEAD ->>>>>>> f21e2137 (Publish) -======= ->>>>>>> 9f8d75e5 (chore(lint): lint all files) ->>>>>>> fb003998 (chore(lint): lint all files) ->>>>>>> f301bfe4 (chore(lint): lint all files) "flow-bin": "^0.116.0", "html-entities": "^2.3.2", "jest": "^27.4.3", @@ -29983,7 +29973,7 @@ } }, "packages/react-scripts": { - "version": "5.0.0", + "version": "5.0.1", "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", @@ -30002,7 +29992,7 @@ "dotenv": "^10.0.0", "dotenv-expand": "^5.1.0", "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", + "eslint-config-react-app": "^7.0.1", "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", @@ -30019,7 +30009,7 @@ "postcss-preset-env": "^7.0.1", "prompts": "^2.4.2", "react-app-polyfill": "^3.0.0", - "react-dev-utils": "^12.0.0", + "react-dev-utils": "^12.0.1", "react-refresh": "^0.11.0", "resolve": "^1.20.0", "resolve-url-loader": "^4.0.0", @@ -36467,6 +36457,7 @@ "@babel/plugin-proposal-numeric-separator": "^7.16.0", "@babel/plugin-proposal-optional-chaining": "^7.16.0", "@babel/plugin-proposal-private-methods": "^7.16.0", + "@babel/plugin-proposal-private-property-in-object": "^7.16.0", "@babel/plugin-transform-flow-strip-types": "^7.16.0", "@babel/plugin-transform-react-display-name": "^7.16.0", "@babel/plugin-transform-runtime": "^7.16.4", @@ -47301,7 +47292,7 @@ "open": "^8.4.0", "pkg-up": "^3.1.0", "prompts": "^2.4.2", - "react-error-overlay": "^6.0.10", + "react-error-overlay": "^6.0.11", "recursive-readdir": "^2.2.2", "shell-quote": "^1.7.3", "strip-ansi": "^6.0.1", @@ -47337,19 +47328,6 @@ "chalk": "^4.1.2", "chokidar": "^3.5.2", "cross-env": "^7.0.3", -<<<<<<< HEAD - "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD - "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", -======= ->>>>>>> 9f8d75e5 (chore(lint): lint all files) ->>>>>>> fb003998 (chore(lint): lint all files) ->>>>>>> f301bfe4 (chore(lint): lint all files) "flow-bin": "^0.116.0", "html-entities": "^2.3.2", "jest": "^27.4.3", @@ -47506,7 +47484,7 @@ "dotenv": "^10.0.0", "dotenv-expand": "^5.1.0", "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", + "eslint-config-react-app": "^7.0.1", "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", @@ -47525,7 +47503,7 @@ "prompts": "^2.4.2", "react": "^18.0.0", "react-app-polyfill": "^3.0.0", - "react-dev-utils": "^12.0.0", + "react-dev-utils": "^12.0.1", "react-dom": "^18.0.0", "react-refresh": "^0.11.0", "resolve": "^1.20.0", diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json index bf5c87feff3..5eec70b3607 100644 --- a/packages/babel-preset-react-app/package.json +++ b/packages/babel-preset-react-app/package.json @@ -28,6 +28,7 @@ "@babel/plugin-proposal-numeric-separator": "^7.16.0", "@babel/plugin-proposal-optional-chaining": "^7.16.0", "@babel/plugin-proposal-private-methods": "^7.16.0", + "@babel/plugin-proposal-private-property-in-object": "^7.16.0", "@babel/plugin-transform-flow-strip-types": "^7.16.0", "@babel/plugin-transform-react-display-name": "^7.16.0", "@babel/plugin-transform-runtime": "^7.16.4", From 5c9a90dea5369aba5b20d60733430614e5e0e94c Mon Sep 17 00:00:00 2001 From: merceyz Date: Mon, 24 Jan 2022 14:11:08 +0100 Subject: [PATCH 3/5] fix(react-scripts): `require.resolve` postcss plugins --- packages/react-scripts/config/webpack.config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js index e465d8e7a00..22e059facdc 100644 --- a/packages/react-scripts/config/webpack.config.js +++ b/packages/react-scripts/config/webpack.config.js @@ -143,9 +143,9 @@ module.exports = function (webpackEnv) { config: false, plugins: !useTailwind ? [ - 'postcss-flexbugs-fixes', + require.resolve('postcss-flexbugs-fixes'), [ - 'postcss-preset-env', + require.resolve('postcss-preset-env'), { autoprefixer: { flexbox: 'no-2009', @@ -156,13 +156,13 @@ module.exports = function (webpackEnv) { // Adds PostCSS Normalize as the reset css with default options, // so that it honors browserslist config in package.json // which in turn let's users customize the target behavior as per their needs. - 'postcss-normalize', + require.resolve('postcss-normalize'), ] : [ - 'tailwindcss', - 'postcss-flexbugs-fixes', + require.resolve('tailwindcss'), + require.resolve('postcss-flexbugs-fixes'), [ - 'postcss-preset-env', + require.resolve('postcss-preset-env'), { autoprefixer: { flexbox: 'no-2009', From cbddd5bfd7b9532a319148d1d1a63e52ab137d68 Mon Sep 17 00:00:00 2001 From: merceyz Date: Mon, 24 Jan 2022 15:38:01 +0100 Subject: [PATCH 4/5] fix(eslint-config): add optional peer dependency `typescript` --- package-lock.json | 8 +++++++- packages/eslint-config-react-app/package.json | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6dfa2abdd0b..84136cc1345 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29871,7 +29871,13 @@ "node": ">=14.0.0" }, "peerDependencies": { - "eslint": "^8.0.0" + "eslint": "^8.0.0", + "typescript": "^3.2.1 || ^4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "packages/react-app-polyfill": { diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json index a658e95648d..2cef1444dac 100644 --- a/packages/eslint-config-react-app/package.json +++ b/packages/eslint-config-react-app/package.json @@ -17,7 +17,13 @@ "jest.js" ], "peerDependencies": { - "eslint": "^8.0.0" + "eslint": "^8.0.0", + "typescript": "^3.2.1 || ^4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } }, "dependencies": { "@babel/core": "^7.16.0", From 074bf9c069453a81ed20d43d7779914826722527 Mon Sep 17 00:00:00 2001 From: merceyz Date: Mon, 24 Jan 2022 16:11:51 +0100 Subject: [PATCH 5/5] fix(react-scripts): `require.resolve` jest watch plugins --- packages/react-scripts/scripts/utils/createJestConfig.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js index ff1c5811025..a8ef2d15af6 100644 --- a/packages/react-scripts/scripts/utils/createJestConfig.js +++ b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -62,8 +62,8 @@ module.exports = (resolve, rootDir, isEjecting) => { ext => !ext.includes('mjs') ), watchPlugins: [ - 'jest-watch-typeahead/filename', - 'jest-watch-typeahead/testname', + require.resolve('jest-watch-typeahead/filename'), + require.resolve('jest-watch-typeahead/testname'), ], resetMocks: true, };