diff --git a/package-lock.json b/package-lock.json
index ea5b4f049f7139e8859088b5d8c15b7e1b89988b..84136cc13457a82fba82bb719c0696bf143fff11 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",
@@ -29870,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": {
@@ -29889,7 +29896,7 @@
}
},
"packages/react-dev-utils": {
- "version": "12.0.0",
+ "version": "12.0.1",
"license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.16.0",
@@ -29911,7 +29918,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 +29941,7 @@
}
},
"packages/react-error-overlay": {
- "version": "6.0.10",
+ "version": "6.0.11",
"license": "MIT",
"devDependencies": {
"@babel/code-frame": "^7.16.0",
@@ -29946,17 +29953,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 +29979,7 @@
}
},
"packages/react-scripts": {
- "version": "5.0.0",
+ "version": "5.0.1",
"license": "MIT",
"dependencies": {
"@babel/core": "^7.16.0",
@@ -30002,7 +29998,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 +30015,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 +36463,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 +47298,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 +47334,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 +47490,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 +47509,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 bf5c87feff31e123d8af186373e00ca6abbde8c8..5eec70b3607319f8f5d954a75642d4deffe63d24 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",
diff --git a/packages/cra-template-typescript/template.json b/packages/cra-template-typescript/template.json
index db2d47610471ff95a7250530e07308dc15e47ba6..f59d5dfb2ba51689acfb64d7bdf0b9a40559bb80 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"
},
diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index a658e95648de37287c91961581b27beed1718c65..2cef1444dac34e6287a601dd383cdf5154a6202d 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",
diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js
index e465d8e7a00ec889e9c4c29ba7812019f8319a41..22e059facdc18dcb1b3005c49637b558cb83f173 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',
diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js
index ff1c58110259c4a8a8756e9278083fba289b6ac1..a8ef2d15af6c9eef0cc4c55f2436dd5230631e81 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,
};