Skip to content

Commit fb6d10f

Browse files
committed
chore: updated to latest nx
1 parent ad8afc4 commit fb6d10f

File tree

14 files changed

+1213
-1107
lines changed

14 files changed

+1213
-1107
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ Thumbs.db
7272
**/cypress/videos
7373

7474
# Verdaccio
75-
tmp
75+
tmp
76+
.nx/cache

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ node_modules
88
coverage
99
discussion
1010
pnpm-lock.yaml
11+
12+
/.nx/cache

apps/website-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"lint": {
21-
"executor": "@nx/linter:eslint",
21+
"executor": "@nx/eslint:lint",
2222
"outputs": ["{options.outputFile}"],
2323
"options": {
2424
"lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"]

migrations.json

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,55 @@
22
"migrations": [
33
{
44
"cli": "nx",
5-
"version": "16.8.0-beta.3",
6-
"description": "Escape $ in env variables",
7-
"implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
5+
"version": "17.0.0-beta.1",
6+
"description": "Updates the default cache directory to .nx/cache",
7+
"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
88
"package": "nx",
9-
"name": "16.8.0-escape-dollar-sign-env"
9+
"name": "17.0.0-move-cache-directory"
1010
},
1111
{
1212
"cli": "nx",
13-
"version": "16.8.2-beta.0",
14-
"description": "Remove invalid options (strict, noInterop) for ES6 type modules.",
15-
"factory": "./src/migrations/update-16-8-2/update-swcrc",
16-
"package": "@nx/js",
17-
"name": "16-8-2-update-swcrc"
13+
"version": "17.0.0-beta.3",
14+
"description": "Use minimal config for tasksRunnerOptions",
15+
"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
16+
"package": "nx",
17+
"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
18+
},
19+
{
20+
"version": "17.0.0-rc.1",
21+
"description": "Migration for v17.0.0-rc.1",
22+
"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
23+
"package": "nx",
24+
"name": "rm-default-collection-npm-scope"
1825
},
1926
{
20-
"version": "16.8.0",
21-
"description": "update-16-8-0-add-ignored-files",
22-
"implementation": "./src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files",
23-
"package": "@nx/linter",
24-
"name": "update-16-8-0-add-ignored-files"
27+
"version": "17.1.0-beta.2",
28+
"description": "Move target defaults",
29+
"implementation": "./src/migrations/update-17-1-0/move-target-defaults",
30+
"package": "@nx/vite",
31+
"name": "move-target-defaults"
2532
},
2633
{
2734
"cli": "nx",
28-
"version": "16.8.0-beta.4",
29-
"description": "Update to Cypress v13. Most noteable change is video recording is off by default. This migration will only update if the workspace is already on Cypress v12. https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-130",
30-
"implementation": "./src/migrations/update-16-8-0/cypress-13",
31-
"package": "@nx/cypress",
32-
"name": "update-16-8-0-cypress-13"
35+
"version": "17.0.2",
36+
"description": "Remove deprecated build options",
37+
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
38+
"package": "@nx/js",
39+
"name": "update-17-0-0-remove-deprecated-build-options"
40+
},
41+
{
42+
"version": "17.0.0-beta.7",
43+
"description": "update-17-0-0-rename-to-eslint",
44+
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
45+
"package": "@nx/eslint",
46+
"name": "update-17-0-0-rename-to-eslint"
47+
},
48+
{
49+
"version": "17.1.0-beta.1",
50+
"description": "Updates for @typescript-utils/utils v6.9.1+",
51+
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
52+
"package": "@nx/eslint",
53+
"name": "update-typescript-eslint"
3354
}
3455
]
3556
}

nx.json

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
{
2-
"tasksRunnerOptions": {
3-
"default": {
4-
"runner": "nx-cloud",
5-
"options": {
6-
"cacheableOperations": [
7-
"build",
8-
"lint",
9-
"test",
10-
"e2e",
11-
"build-storybook",
12-
"component-test"
13-
],
14-
"accessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU="
15-
}
16-
}
17-
},
182
"$schema": "./node_modules/nx/schemas/nx-schema.json",
19-
"npmScope": "qwik-ui",
203
"affected": {
214
"defaultBase": "main"
225
},
@@ -26,10 +9,25 @@
269
},
2710
"targetDefaults": {
2811
"lint": {
29-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
12+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
13+
"cache": true
14+
},
15+
"build": {
16+
"cache": true
17+
},
18+
"e2e": {
19+
"cache": true
3020
},
31-
"test": {
32-
"inputs": ["default", "^default"]
21+
"build-storybook": {
22+
"cache": true
23+
},
24+
"component-test": {
25+
"cache": true
26+
},
27+
"@nx/vite:test": {
28+
"inputs": ["default", "^default"],
29+
"cache": true
3330
}
34-
}
31+
},
32+
"nxCloudAccessToken": "MzViMzc1MGQtMDQyNi00N2E3LTliMmYtYWI4ZGIxYWJjYzE3fHJlYWQtd3JpdGU="
3533
}

package.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,31 @@
4141
"@frsource/cypress-plugin-visual-regression-diff": "^3.3.10",
4242
"@jscutlery/semver": "^3.1.0",
4343
"@k11r/nx-cloudflare-wrangler": "2.7.1",
44-
"@nx/cypress": "16.9.1",
45-
"@nx/eslint-plugin": "16.9.1",
46-
"@nx/js": "16.9.1",
47-
"@nx/linter": "16.9.1",
48-
"@nx/storybook": "16.9.1",
49-
"@nx/vite": "16.9.1",
50-
"@nx/workspace": "16.9.1",
51-
"@storybook/addon-a11y": "^7.4.0",
44+
"@nx/cypress": "17.1.3",
45+
"@nx/eslint-plugin": "17.1.3",
46+
"@nx/js": "17.1.3",
47+
"@nx/storybook": "17.1.3",
48+
"@nx/vite": "17.1.3",
49+
"@nx/workspace": "17.1.3",
50+
"@storybook/addon-a11y": "7.6.0",
5251
"@storybook/addon-coverage": "^0.0.9",
53-
"@storybook/addon-essentials": "^7.4.0",
54-
"@storybook/addon-interactions": "^7.4.0",
55-
"@storybook/addon-links": "^7.4.0",
52+
"@storybook/addon-essentials": "7.6.0",
53+
"@storybook/addon-interactions": "7.6.0",
54+
"@storybook/addon-links": "7.6.0",
5655
"@storybook/blocks": "^7.4.0",
5756
"@storybook/builder-vite": "^7.4.0",
5857
"@storybook/html": "^7.4.0",
5958
"@storybook/html-vite": "^7.4.0",
60-
"@storybook/jest": "^0.2.2",
61-
"@storybook/test-runner": "^0.13.0",
62-
"@storybook/testing-library": "^0.2.0",
59+
"@storybook/jest": "0.2.3",
60+
"@storybook/test-runner": "0.13.0",
61+
"@storybook/testing-library": "0.2.2",
6362
"@testing-library/cypress": "9.0.0",
6463
"@types/body-scroll-lock": "3.1.1",
6564
"@types/eslint": "^8.44.2",
6665
"@types/estree-jsx": "^1.0.3",
6766
"@types/node": "^20.5.7",
68-
"@typescript-eslint/eslint-plugin": "^5",
69-
"@typescript-eslint/parser": "^6.7.0",
67+
"@typescript-eslint/eslint-plugin": "6.13.1",
68+
"@typescript-eslint/parser": "6.13.1",
7069
"@vitest/coverage-v8": "^0.34.3",
7170
"@vitest/ui": "^0.34.3",
7271
"all-contributors-cli": "^6.26.1",
@@ -86,7 +85,7 @@
8685
"daisyui": "^3.6.4",
8786
"danger": "^11.2.8",
8887
"eslint": "^8.48.0",
89-
"eslint-config-prettier": "^8",
88+
"eslint-config-prettier": "9.0.0",
9089
"eslint-plugin-cypress": "^2.14.0",
9190
"eslint-plugin-qwik": "^1.2.19",
9291
"eslint-plugin-storybook": "^0.6.13",
@@ -97,8 +96,7 @@
9796
"ngx-deploy-npm": "^7.0.1",
9897
"node-fetch": "^3.3.2",
9998
"np": "^8.0.4",
100-
"nx": "16.9.1",
101-
"nx-cloud": "16.4.0",
99+
"nx": "17.1.3",
102100
"postcss": "^8.4.29",
103101
"prettier": "^2.8.8",
104102
"prettier-plugin-tailwindcss": "0.4.1",
@@ -126,7 +124,8 @@
126124
"vite-plugin-static-copy": "0.17.0",
127125
"vite-tsconfig-paths": "4.2.0",
128126
"vitest": "^0.34.3",
129-
"wrangler": "^3.11.0"
127+
"wrangler": "^3.11.0",
128+
"@nx/eslint": "17.1.3"
130129
},
131130
"dependencies": {
132131
"@fontsource-variable/inter": "5.0.8",

packages/kit-fluffy/project.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@
2626
}
2727
},
2828
"lint": {
29-
"executor": "@nx/linter:eslint",
29+
"executor": "@nx/eslint:lint",
3030
"outputs": ["{options.outputFile}"],
3131
"options": {
3232
"lintFilePatterns": ["packages/kit-fluffy/**/*.{ts,tsx,js,jsx}"]
3333
}
3434
},
35-
3635
"storybook": {
3736
"executor": "@nx/storybook:storybook",
3837
"options": {

packages/kit-headless/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
},
2828
"lint": {
29-
"executor": "@nx/linter:eslint",
29+
"executor": "@nx/eslint:lint",
3030
"outputs": ["{options.outputFile}"],
3131
"options": {
3232
"lintFilePatterns": ["packages/kit-headless/**/*.{ts,tsx,js,jsx}"]

packages/kit-material/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
},
2727
"lint": {
28-
"executor": "@nx/linter:eslint",
28+
"executor": "@nx/eslint:lint",
2929
"outputs": ["{options.outputFile}"],
3030
"options": {
3131
"lintFilePatterns": ["packages/kit-material/**/*.{ts,tsx,js,jsx}"]

packages/kit-tailwind/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
},
2828
"lint": {
29-
"executor": "@nx/linter:eslint",
29+
"executor": "@nx/eslint:lint",
3030
"outputs": ["{options.outputFile}"],
3131
"options": {
3232
"lintFilePatterns": ["packages/kit-tailwind/**/*.{ts,tsx,js,jsx}"]

0 commit comments

Comments
 (0)