Skip to content

Commit ce001ca

Browse files
committed
chore: upgraded nx and qwik
1 parent 5605fdc commit ce001ca

File tree

13 files changed

+971
-496
lines changed

13 files changed

+971
-496
lines changed

.eslintrc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["plugin:@nrwl/nx/typescript"],
26+
"extends": ["plugin:@nx/typescript"],
2727
"rules": {}
2828
},
2929
{
3030
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
31+
"extends": ["plugin:@nx/javascript"],
3232
"rules": {}
3333
},
3434
{

apps/website-e2e/cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineConfig } from 'cypress';
2-
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
2+
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
33

44
export default defineConfig({
55
e2e: nxE2EPreset(__dirname, {

apps/website-e2e/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projectType": "application",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/cypress:cypress",
8+
"executor": "@nx/cypress:cypress",
99
"options": {
1010
"cypressConfig": "apps/website-e2e/cypress.config.ts",
1111
"devServerTarget": "website:serve",
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"lint": {
21-
"executor": "@nrwl/linter:eslint",
21+
"executor": "@nx/linter:eslint",
2222
"outputs": ["{options.outputFile}"],
2323
"options": {
2424
"lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"]

apps/website/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@
1616
}
1717
},
1818
"preview": {
19-
"executor": "@nrwl/vite:preview-server",
19+
"executor": "@nx/vite:preview-server",
2020
"options": {
2121
"buildTarget": "website:build"
2222
}
2323
},
2424
"test": {
25-
"executor": "@nrwl/vite:test",
25+
"executor": "@nx/vite:test",
2626
"outputs": ["../../coverage/apps/website"],
2727
"options": {
2828
"passWithNoTests": true,
2929
"reportsDirectory": "../../coverage/apps/website"
3030
}
3131
},
3232
"serve": {
33-
"executor": "@nrwl/vite:dev-server",
33+
"executor": "@nx/vite:dev-server",
3434
"options": {
3535
"buildTarget": "website:build.client",
3636
"mode": "ssr"
3737
}
3838
},
3939
"build.client": {
40-
"executor": "@nrwl/vite:build",
40+
"executor": "@nx/vite:build",
4141
"options": {
4242
"outputPath": "dist/apps/website",
4343
"configFile": "apps/website/vite.config.ts"
4444
}
4545
},
4646
"build.ssr": {
47-
"executor": "@nrwl/vite:build",
47+
"executor": "@nx/vite:build",
4848
"defaultConfiguration": "preview",
4949
"options": {
5050
"outputPath": "dist/apps/website"

apps/website/src/components/header/header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import {
66
useSignal,
77
} from '@builder.io/qwik';
88
import { Link, useLocation } from '@builder.io/qwik-city';
9-
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
9+
// eslint-disable-next-line @nx/enforce-module-boundaries
1010
import { version as headlessVersion } from '../../../../../packages/kit-headless/package.json';
11-
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
11+
// eslint-disable-next-line @nx/enforce-module-boundaries
1212
import { version as tailwindVersion } from '../../../../../packages/kit-tailwind/package.json';
1313
import { CloseIcon } from '../icons/CloseIcon';
1414
import { GitHubIcon } from '../icons/GitHubIcon';

nx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"tasksRunnerOptions": {
33
"default": {
4-
"runner": "@nrwl/nx-cloud",
4+
"runner": "nx-cloud",
55
"options": {
66
"cacheableOperations": [
77
"build",

package.json

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"test:headless": "nx component-test headless --watch"
1515
},
1616
"devDependencies": {
17-
"@builder.io/qwik": "0.101.0",
18-
"@builder.io/qwik-city": "0.101.0",
17+
"@builder.io/qwik": "1.0.0",
18+
"@builder.io/qwik-city": "1.0.0",
1919
"@commitlint/cli": "^17.4.3",
2020
"@commitlint/config-angular": "^17.4.3",
2121
"@commitlint/config-conventional": "^17.4.3",
@@ -24,29 +24,27 @@
2424
"@floating-ui/dom": "1.0.10",
2525
"@jscutlery/semver": "^2.30.1",
2626
"@k11r/nx-cloudflare-wrangler": "^2.0.0",
27-
"@nrwl/cli": "15.8.7",
28-
"@nrwl/cypress": "15.8.7",
29-
"@nrwl/eslint-plugin-nx": "15.8.7",
30-
"@nrwl/linter": "15.8.7",
31-
"@nrwl/nx-cloud": "15.3.1",
32-
"@nrwl/storybook": "15.8.7",
33-
"@nrwl/vite": "15.8.7",
34-
"@nrwl/workspace": "15.8.7",
35-
"@storybook/addon-a11y": "7.0.0-rc.10",
36-
"@storybook/addon-essentials": "7.0.0-rc.7",
37-
"@storybook/addon-interactions": "7.0.0-rc.7",
38-
"@storybook/addon-links": "7.0.0-rc.7",
39-
"@storybook/blocks": "7.0.0-rc.7",
40-
"@storybook/builder-vite": "7.0.0-rc.7",
41-
"@storybook/html": "7.0.0-rc.7",
42-
"@storybook/html-vite": "7.0.0-rc.7",
43-
"@storybook/jest": "0.0.10",
44-
"@storybook/test-runner": "0.10.0-next.12",
45-
"@storybook/testing-library": "0.0.13",
46-
"@types/eslint": "8.21.3",
47-
"@types/node": "18.15.3",
48-
"@typescript-eslint/eslint-plugin": "5.56.0",
49-
"@typescript-eslint/parser": "5.56.0",
27+
"@nx/workspace": "16.0.3",
28+
"@nx/linter": "16.0.3",
29+
"@nx/cypress": "16.0.3",
30+
"@nx/storybook": "16.0.3",
31+
"@nx/eslint-plugin": "16.0.3",
32+
"@nx/vite": "16.0.3",
33+
"@storybook/addon-a11y": "7.0.8",
34+
"@storybook/addon-essentials": "7.0.8",
35+
"@storybook/addon-interactions": "7.0.8",
36+
"@storybook/addon-links": "7.0.8",
37+
"@storybook/blocks": "7.0.8",
38+
"@storybook/builder-vite": "7.0.8",
39+
"@storybook/html": "7.0.8",
40+
"@storybook/html-vite": "7.0.8",
41+
"@storybook/jest": "0.1.0",
42+
"@storybook/test-runner": "0.10.0",
43+
"@storybook/testing-library": "0.1.0",
44+
"@types/eslint": "8.37.0",
45+
"@types/node": "18.16.1",
46+
"@typescript-eslint/eslint-plugin": "5.59.1",
47+
"@typescript-eslint/parser": "5.59.1",
5048
"@vitest/coverage-c8": "~0.28.5",
5149
"@vitest/ui": "^0.28.5",
5250
"all-contributors-cli": "^6.24.0",
@@ -64,7 +62,7 @@
6462
"eslint": "8.36.0",
6563
"eslint-config-prettier": "8.6.0",
6664
"eslint-plugin-cypress": "^2.12.1",
67-
"eslint-plugin-qwik": "0.23.0",
65+
"eslint-plugin-qwik": "1.0.0",
6866
"eslint-plugin-storybook": "^0.6.11",
6967
"html-webpack-plugin": "^5.5.0",
7068
"husky": "^8.0.3",
@@ -74,25 +72,26 @@
7472
"ngx-deploy-npm": "^5.0.0",
7573
"node-fetch": "3.3.0",
7674
"np": "7.6.3",
77-
"nx": "15.8.7",
75+
"nx": "16.0.3",
76+
"nx-cloud": "16.0.5",
7877
"postcss": "^8.4.21",
79-
"prettier": "2.8.6",
78+
"prettier": "2.8.8",
8079
"pretty-quick": "^3.1.3",
81-
"qwik-nx": "0.14.0",
80+
"qwik-nx": "1.0.0",
8281
"react": "18.2.0",
8382
"react-dom": "18.2.0",
8483
"sass": "1.58.1",
8584
"storybook": "7.0.0-rc.7",
86-
"storybook-framework-qwik": "0.0.8",
85+
"storybook-framework-qwik": "0.2.0",
8786
"tailwindcss": "^3.2.6",
8887
"ts-node": "10.9.1",
89-
"typescript": "5.0.2",
90-
"undici": "5.21.0",
91-
"vite": "4.2.1",
88+
"typescript": "5.0.4",
89+
"undici": "5.22.0",
90+
"vite": "4.3.3",
9291
"vite-plugin-dts": "~1.7.3",
9392
"vite-plugin-eslint": "^1.8.1",
94-
"vite-tsconfig-paths": "4.0.7",
95-
"vitest": "^0.28.5",
93+
"vite-tsconfig-paths": "4.2.0",
94+
"vitest": "0.30.1",
9695
"wrangler": "^2.8.0"
9796
},
9897
"config": {

packages/kit-headless/project.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projectType": "library",
66
"targets": {
77
"build": {
8-
"executor": "@nrwl/vite:build",
8+
"executor": "@nx/vite:build",
99
"outputs": ["{options.outputPath}"],
1010
"defaultConfiguration": "production",
1111
"options": {
@@ -19,14 +19,14 @@
1919
}
2020
},
2121
"test": {
22-
"executor": "@nrwl/vite:test",
22+
"executor": "@nx/vite:test",
2323
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
2424
"options": {
2525
"passWithNoTests": true
2626
}
2727
},
2828
"lint": {
29-
"executor": "@nrwl/linter:eslint",
29+
"executor": "@nx/linter:eslint",
3030
"outputs": ["{options.outputFile}"],
3131
"options": {
3232
"lintFilePatterns": ["packages/kit-headless/**/*.{ts,tsx,js,jsx}"]
@@ -69,7 +69,7 @@
6969
}
7070
},
7171
"storybook": {
72-
"executor": "@nrwl/storybook:storybook",
72+
"executor": "@nx/storybook:storybook",
7373
"options": {
7474
"port": 4400,
7575
"configDir": "packages/kit-headless/.storybook"
@@ -81,7 +81,7 @@
8181
}
8282
},
8383
"build-storybook": {
84-
"executor": "@nrwl/storybook:build",
84+
"executor": "@nx/storybook:build",
8585
"outputs": ["{options.outputDir}"],
8686
"options": {
8787
"uiFramework": "@storybook/html",
@@ -95,7 +95,7 @@
9595
}
9696
},
9797
"component-test": {
98-
"executor": "@nrwl/cypress:cypress",
98+
"executor": "@nx/cypress:cypress",
9999
"options": {
100100
"cypressConfig": "packages/kit-headless/cypress.config.ts",
101101
"testingType": "component"

packages/kit-material/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projectType": "library",
66
"targets": {
77
"build": {
8-
"executor": "@nrwl/vite:build",
8+
"executor": "@nx/vite:build",
99
"outputs": ["{options.outputPath}"],
1010
"defaultConfiguration": "production",
1111
"options": {
@@ -18,14 +18,14 @@
1818
}
1919
},
2020
"test": {
21-
"executor": "@nrwl/vite:test",
21+
"executor": "@nx/vite:test",
2222
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
2323
"options": {
2424
"passWithNoTests": true
2525
}
2626
},
2727
"lint": {
28-
"executor": "@nrwl/linter:eslint",
28+
"executor": "@nx/linter:eslint",
2929
"outputs": ["{options.outputFile}"],
3030
"options": {
3131
"lintFilePatterns": ["packages/kit-material/**/*.{ts,tsx,js,jsx}"]

packages/kit-tailwind/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projectType": "library",
66
"targets": {
77
"build": {
8-
"executor": "@nrwl/vite:build",
8+
"executor": "@nx/vite:build",
99
"outputs": ["{options.outputPath}"],
1010
"defaultConfiguration": "production",
1111
"options": {
@@ -19,14 +19,14 @@
1919
}
2020
},
2121
"test": {
22-
"executor": "@nrwl/vite:test",
22+
"executor": "@nx/vite:test",
2323
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
2424
"options": {
2525
"passWithNoTests": true
2626
}
2727
},
2828
"lint": {
29-
"executor": "@nrwl/linter:eslint",
29+
"executor": "@nx/linter:eslint",
3030
"outputs": ["{options.outputFile}"],
3131
"options": {
3232
"lintFilePatterns": ["packages/kit-tailwind/**/*.{ts,tsx,js,jsx}"]

0 commit comments

Comments
 (0)