-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: upgrade Nx to 13.10.6 & TS to 4.7.4 (#310)
- Loading branch information
1 parent
16250ce
commit ed7bf7f
Showing
17 changed files
with
1,329 additions
and
855 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/utils/check-dependencies.js b/src/utils/check-dependencies.js | ||
index a217906583ac82d9e7881af4f02fc44f8afc04dc..ff5d6ea946c4c5b745d367f7070f00cfa166dcaa 100644 | ||
--- a/src/utils/check-dependencies.js | ||
+++ b/src/utils/check-dependencies.js | ||
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit"); | ||
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils"); | ||
function checkDependencies(context, tsConfigPath) { | ||
const projectGraph = (0, devkit_1.readCachedProjectGraph)(); | ||
- const { target, dependencies, nonBuildableDependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, context.projectName, context.targetName, context.configurationName); | ||
+ const { target, dependencies, nonBuildableDependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true); | ||
const projectRoot = target.data.root; | ||
if (nonBuildableDependencies.length > 0) { | ||
throw new Error(`Buildable libraries can only depend on other buildable libraries. You must define the ${context.targetName} target for the following libraries: ${nonBuildableDependencies |
12 changes: 2 additions & 10 deletions
12
...n/patches/@nrwl-web-npm-13.4.5-d7e9ea40d2 → ...es/@nrwl-web-npm-13.10.6-0fda8b81ed.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,24 +33,24 @@ | |
"@docusaurus/module-type-aliases": "2.1.0", | ||
"@docusaurus/preset-classic": "2.1.0", | ||
"@emotion/css": "^11.9.0", | ||
"@nrwl/cli": "13.4.5", | ||
"@nrwl/eslint-plugin-nx": "13.4.5", | ||
"@nrwl/jest": "13.4.5", | ||
"@nrwl/js": "13.4.5", | ||
"@nrwl/linter": "13.4.5", | ||
"@nrwl/node": "13.4.5", | ||
"@nrwl/react": "13.4.5", | ||
"@nrwl/storybook": "13.4.5", | ||
"@nrwl/tao": "13.4.5", | ||
"@nrwl/web": "13.4.5", | ||
"@nrwl/workspace": "13.4.5", | ||
"@nrwl/cli": "13.10.6", | ||
"@nrwl/eslint-plugin-nx": "13.10.6", | ||
"@nrwl/jest": "13.10.6", | ||
"@nrwl/js": "13.10.6", | ||
"@nrwl/linter": "13.10.6", | ||
"@nrwl/node": "13.10.6", | ||
"@nrwl/react": "13.10.6", | ||
"@nrwl/storybook": "13.10.6", | ||
"@nrwl/web": "13.10.6", | ||
"@nrwl/workspace": "13.10.6", | ||
"@storybook/addon-essentials": "~6.4.5", | ||
"@storybook/builder-webpack5": "~6.4.5", | ||
"@storybook/core-server": "6.4.22", | ||
"@storybook/manager-webpack5": "~6.4.5", | ||
"@storybook/react": "~6.4.5", | ||
"@svgr/webpack": "^5.4.0", | ||
"@testing-library/jest-dom": "5.16.1", | ||
"@testing-library/react": "12.1.2", | ||
"@testing-library/react": "13.0.0", | ||
"@testing-library/react-hooks": "7.0.2", | ||
"@tsconfig/docusaurus": "^1.0.4", | ||
"@types/babel__helper-plugin-utils": "7.10.0", | ||
|
@@ -60,14 +60,14 @@ | |
"@types/js-beautify": "^1.13.3", | ||
"@types/mini-css-extract-plugin": "2.5.1", | ||
"@types/node": "14.14.33", | ||
"@types/react": "17.0.30", | ||
"@types/react-dom": "17.0.9", | ||
"@types/react": "18.0.0", | ||
"@types/react-dom": "18.0.0", | ||
"@types/stylis": "4.0.2", | ||
"@types/tmp": "0.2.3", | ||
"@types/webpack-env": "^1.17.0", | ||
"@types/yargs": "^17.0.10", | ||
"@typescript-eslint/eslint-plugin": "~5.3.0", | ||
"@typescript-eslint/parser": "~5.3.0", | ||
"@typescript-eslint/eslint-plugin": "5.18.0", | ||
"@typescript-eslint/parser": "5.18.0", | ||
"babel-jest": "27.2.3", | ||
"babel-loader": "8.1.0", | ||
"babel-plugin-annotate-pure-calls": "0.4.0", | ||
|
@@ -79,14 +79,14 @@ | |
"esbuild": "^0.14.43", | ||
"esbuild-plugin-alias": "^0.2.1", | ||
"esbuild-plugin-import-glob": "^0.1.1", | ||
"eslint": "8.2.0", | ||
"eslint": "8.12.0", | ||
"eslint-config-prettier": "8.1.0", | ||
"eslint-import-resolver-typescript": "2.5.0", | ||
"eslint-plugin-import": "2.25.2", | ||
"eslint-plugin-import": "2.26.0", | ||
"eslint-plugin-jest": "^27.0.1", | ||
"eslint-plugin-jsx-a11y": "6.5.1", | ||
"eslint-plugin-react": "7.27.0", | ||
"eslint-plugin-react-hooks": "4.3.0", | ||
"eslint-plugin-react": "7.29.4", | ||
"eslint-plugin-react-hooks": "4.4.0", | ||
"highlight.js": "11.4.0", | ||
"jest": "27.2.3", | ||
"jest-chrome": "^0.7.2", | ||
|
@@ -99,17 +99,19 @@ | |
"monosize-storage-upstash": "0.0.8", | ||
"nano-staged": "0.5.0", | ||
"next": "12.2.4", | ||
"prettier": "2.3.1", | ||
"nx": "13.10.6", | ||
"prettier": "2.8.2", | ||
"prism-react-renderer": "1.2.1", | ||
"react": "17.0.2", | ||
"react-dom": "17.0.2", | ||
"react": "18.0.0", | ||
"react-dom": "18.0.0", | ||
"react-is": "18.0.0", | ||
"react-test-renderer": "17.0.2", | ||
"simple-git-hooks": "2.7.0", | ||
"swc-node": "1.0.0", | ||
"syncpack": "6.2.0", | ||
"tmp": "0.2.1", | ||
"ts-jest": "27.0.5", | ||
"typescript": "~4.5.2", | ||
"typescript": "4.7.4", | ||
"url-loader": "^3.0.0", | ||
"yargs": "^17.5.1" | ||
}, | ||
|
@@ -135,8 +137,8 @@ | |
}, | ||
"resolutions": { | ||
"@docusaurus/[email protected]": "patch:@docusaurus/theme-common@npm:2.1.0#.yarn/patches/@docusaurus-theme-common-npm-2.1.0-d5ae2a9539.patch", | ||
"@nrwl/web": "patch:@nrwl/web@npm:13.4.5#.yarn/patches/@nrwl-web-npm-13.4.5-d7e9ea40d2", | ||
"@nrwl/workspace": "patch:@nrwl/workspace@npm:13.4.5#.yarn/patches/@nrwl-workspace-npm-13.4.5-233a3ec85c", | ||
"@nrwl/[email protected]": "patch:@nrwl/js@npm:13.10.6#.yarn/patches/@nrwl-js-npm-13.10.6-08130e9fbb.patch", | ||
"@nrwl/[email protected]": "patch:@nrwl/web@npm:13.10.6#.yarn/patches/@nrwl-web-npm-13.10.6-0fda8b81ed.patch", | ||
"[email protected]": "patch:beachball@npm:2.31.5#.yarn/patches/beachball-npm-2.31.5-0e84ec4233.patch", | ||
"[email protected]": "patch:source-map-js@npm:1.0.2#.yarn/patches/source-map-js-npm-1.0.2-ee4f9f9b30.patch" | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
{ | ||
"version": 2, | ||
"projects": { | ||
"@griffel/benchmark": "apps/benchmark", | ||
"@griffel/babel-preset": "packages/babel-preset", | ||
"@griffel/benchmark": "apps/benchmark", | ||
"@griffel/core": "packages/core", | ||
"@griffel/devtools": "packages/devtools", | ||
"@griffel/e2e-nextjs": "e2e/nextjs", | ||
"@griffel/e2e-utils": "e2e/utils", | ||
"@griffel/e2e-typescript": "e2e/typescript", | ||
"@griffel/e2e-utils": "e2e/utils", | ||
"@griffel/eslint-plugin": "packages/eslint-plugin", | ||
"@griffel/jest-serializer": "packages/jest-serializer", | ||
"@griffel/next-extraction-plugin": "packages/next-extraction-plugin", | ||
"@griffel/react": "packages/react", | ||
"@griffel/webpack-loader": "packages/webpack-loader", | ||
"@griffel/webpack-extraction-plugin": "packages/webpack-extraction-plugin", | ||
"@griffel/webpack-loader": "packages/webpack-loader", | ||
"@griffel/website": "apps/website" | ||
} | ||
} |
Oops, something went wrong.