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

Revert "Build: Migrate repo to Nx 20" #29820

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ code/bench-results/

/packs
code/.nx/cache
code/.nx/workspace-data
code/.vite-inspect
.nx/cache
Comment on lines 57 to 59
Copy link
Contributor

Choose a reason for hiding this comment

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

style: consider keeping .nx/workspace-data ignored to prevent committing temporary Nx workspace data

.nx/workspace-data
!**/fixtures/**/yarn.lock
code/core/report

Expand Down
1 change: 0 additions & 1 deletion code/.gitignore
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Removing this file will cause vite.config timestamp files to be tracked in git. Consider keeping the ignore rule by moving it to the root .gitignore instead.

This file was deleted.

2 changes: 0 additions & 2 deletions code/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@

/.nx/cache
core/report

/.nx/workspace-data
6 changes: 5 additions & 1 deletion code/frameworks/angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
"targets": {
"build": {},
"check": {
"command": "echo '\"nx check angular\" can only run with the parameter \"-c production\", we need to expand code/storybook/storybook/scripts/prepare/check.ts'",
"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"
},
"configurations": {
"production": {
"cwd": "{projectRoot}",
Expand Down
21 changes: 21 additions & 0 deletions code/migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"migrations": [
{
"cli": "nx",
"version": "17.3.0-beta.6",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "17.3.0-update-nx-wrapper"
},
{
"cli": "nx",
"version": "18.0.0-beta.2",
"description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
"x-repair-skip": true,
"package": "nx",
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
}
]
}
9 changes: 8 additions & 1 deletion code/nx.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"extends": "nx/presets/npm.json",
"cacheDirectory": "../.nx/cache",
Copy link
Contributor

Choose a reason for hiding this comment

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

style: cacheDirectory is deprecated in newer Nx versions and should be removed. It defaults to .nx/cache in the workspace root.

"nxCloudAccessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=",
"defaultBase": "next",
"parallel": 8,
"affected": {
"defaultBase": "next"
},
Comment on lines +8 to +10
Copy link
Contributor

Choose a reason for hiding this comment

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

style: affected.defaultBase is redundant with the top-level defaultBase setting on line 6

"cli": {
"packageManager": "yarn"
},
"plugins": [
{
"plugin": "@nx/vite/plugin",
Expand Down Expand Up @@ -131,7 +138,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),",
Copy link
Contributor

Choose a reason for hiding this comment

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

logic: invalid glob pattern - trailing comma inside the pattern will cause file matching issues

"!{projectRoot}/vitest.config.[jt]s",
"!{projectRoot}/README.md",
"!{projectRoot}/.eslintrc.{json,js}",
Expand Down
17 changes: 8 additions & 9 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": "20.1.4",
"@nx/vite": "20.1.4",
"@nx/workspace": "20.1.4",
"@nx/eslint": "18.0.6",
"@nx/vite": "18.0.6",
"@nx/workspace": "18.0.6",
"@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/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@typescript-eslint/experimental-utils": "^5.62.0",
"@typescript-eslint/parser": "^6.18.1",
"@vitejs/plugin-react": "^4.3.2",
"@vitejs/plugin-vue": "^4.4.0",
"@vitest/browser": "^2.1.3",
Expand All @@ -188,10 +188,9 @@
"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.57.1",
"eslint": "^8.56.0",
"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 @@ -202,7 +201,7 @@
"husky": "^4.3.7",
"lint-staged": "^13.2.2",
"mock-require": "^3.0.3",
"nx": "20.1.4",
"nx": "18.0.6",
"prettier": "^3.1.1",
"prettier-plugin-brace-style": "^0.6.2",
"prettier-plugin-css-order": "^2.1.2",
Expand All @@ -218,7 +217,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: 5 additions & 1 deletion code/renderers/vue3/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
"targets": {
"build": {},
"check": {
"command": "echo '\"nx check vue3\" can only run with the parameter \"-c production\", we need to expand code/storybook/storybook/scripts/prepare/check.ts'",
"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"
},
"configurations": {
"production": {
"cwd": "{projectRoot}",
Expand Down
Loading
Loading