Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Migrate repo to Nx 20 #29807

Merged
merged 15 commits into from
Dec 4, 2024
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ code/bench-results/

/packs
code/.nx/cache
code/.nx/workspace-data
code/.vite-inspect
.nx/cache
.nx/workspace-data
!**/fixtures/**/yarn.lock
code/core/report

Expand Down
1 change: 1 addition & 0 deletions code/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vite.config.*.timestamp*
2 changes: 2 additions & 0 deletions code/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

/.nx/cache
core/report

/.nx/workspace-data
6 changes: 1 addition & 5 deletions code/frameworks/angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
"targets": {
"build": {},
"check": {
"executor": "nx:run-commands",
"options": {
"command": "echo '\"nx check angular\" can only run with the parameter \"-c production\"'",
"description": "We need to expand code/storybook/storybook/scripts/prepare/check.ts"
},
"command": "echo '\"nx check angular\" can only run with the parameter \"-c production\", we need to expand code/storybook/storybook/scripts/prepare/check.ts'",
"configurations": {
"production": {
"cwd": "{projectRoot}",
Expand Down
21 changes: 0 additions & 21 deletions code/migrations.json

This file was deleted.

9 changes: 1 addition & 8 deletions code/nx.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"extends": "nx/presets/npm.json",
"cacheDirectory": "../.nx/cache",
"nxCloudAccessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=",
"defaultBase": "next",
"parallel": 8,
"affected": {
"defaultBase": "next"
},
"cli": {
"packageManager": "yarn"
},
"plugins": [
{
"plugin": "@nx/vite/plugin",
Expand Down Expand Up @@ -138,7 +131,7 @@
"sharedGlobals": ["{workspaceRoot}/tsconfig.json"],
"production": [
"default",
"!{projectRoot}/src/**/**/*.{test,spec,stories}.?(c|m)[jt]s?(x)?(.snap),",
"!{projectRoot}/src/**/**/*.{test,spec,stories}.?(c|m)[jt]s?(x)?(.snap)",
"!{projectRoot}/vitest.config.[jt]s",
"!{projectRoot}/README.md",
"!{projectRoot}/.eslintrc.{json,js}",
Expand Down
17 changes: 9 additions & 8 deletions code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
"dependencies": {
"@chromatic-com/storybook": "^3.2.0",
"@happy-dom/global-registrator": "^14.12.0",
"@nx/eslint": "18.0.6",
"@nx/vite": "18.0.6",
"@nx/workspace": "18.0.6",
"@nx/eslint": "20.1.4",
"@nx/vite": "20.1.4",
"@nx/workspace": "20.1.4",
"@playwright/test": "1.48.1",
"@storybook/addon-a11y": "workspace:*",
"@storybook/addon-actions": "workspace:*",
Expand Down Expand Up @@ -174,8 +174,8 @@
"@types/react-dom": "^18.0.11",
"@types/semver": "^7.3.4",
"@types/serve-static": "^1.13.8",
"@typescript-eslint/experimental-utils": "^5.62.0",
"@typescript-eslint/parser": "^6.18.1",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@vitejs/plugin-react": "^4.3.2",
"@vitejs/plugin-vue": "^4.4.0",
"@vitest/browser": "^2.1.3",
Expand All @@ -188,9 +188,10 @@
"esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
"esbuild-loader": "^4.2.0",
"esbuild-plugin-alias": "^0.2.1",
"eslint": "^8.56.0",
"eslint": "8.57.1",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-depend": "^0.11.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-local-rules": "portal:../scripts/eslint-plugin-local-rules",
"eslint-plugin-playwright": "^1.6.2",
"eslint-plugin-storybook": "^0.8.0",
Expand All @@ -201,7 +202,7 @@
"husky": "^4.3.7",
"lint-staged": "^13.2.2",
"mock-require": "^3.0.3",
"nx": "18.0.6",
"nx": "20.1.4",
"prettier": "^3.1.1",
"prettier-plugin-brace-style": "^0.6.2",
"prettier-plugin-css-order": "^2.1.2",
Expand All @@ -217,7 +218,7 @@
"storybook": "workspace:^",
"svelte": "^5.0.0-next.268",
"ts-dedent": "^2.0.0",
"typescript": "^5.4.3",
"typescript": "5.4.3",
"util": "^0.12.4",
"vite": "^4.0.0",
"vite-plugin-inspect": "^0.8.5",
Expand Down
6 changes: 1 addition & 5 deletions code/renderers/vue3/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
"targets": {
"build": {},
"check": {
"executor": "nx:run-commands",
"options": {
"command": "echo '\"nx check vue3\" can only run with the parameter \"-c production\"'",
"description": "We need to expand code/storybook/storybook/scripts/prepare/check.ts"
},
"command": "echo '\"nx check vue3\" can only run with the parameter \"-c production\", we need to expand code/storybook/storybook/scripts/prepare/check.ts'",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: The command field should be under an 'options' object according to Nx executor schema

"configurations": {
"production": {
"cwd": "{projectRoot}",
Expand Down
Loading
Loading