Skip to content

Commit b740703

Browse files
dmitry-stepanenkodmitry-stepanenko
authored
chore(qwik-nx): nx 17.3 support (#224)
* chore(repo): update dependencies * chore(repo): [nx migration] simplify-eslint-patterns * chore(repo): [nx migration] move-options-to-target-defaults * chore(repo): [nx migration] move-options-to-target-defaults * chore(qwik-nx): additional updates
1 parent 9efc0b5 commit b740703

File tree

18 files changed

+872
-689
lines changed

18 files changed

+872
-689
lines changed

‎.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"files": ["*.ts", "*.tsx"],
2626
"extends": ["plugin:@nx/typescript"],
2727
"rules": {
28+
"@typescript-eslint/no-explicit-any": "off",
2829
"@typescript-eslint/no-var-requires": "off",
2930
"@typescript-eslint/no-non-null-assertion": "off",
3031
"unused-imports/no-unused-imports": "error",

‎README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ This plugin supports Nx migrations and provides necessary version and code updat
9191

9292
## qwik-nx & Nx Compatibility Chart
9393

94-
| qwik-nx version | Nx version |
95-
| ------------------ | ---------- |
96-
| ^2.0.0 | ^17.0.0 |
97-
| ^1.1.0 | ^16.8.0 |
98-
| ^1.0.0 | ^16.0.0 |
99-
| ^0.16.0 | ^16.0.0 |
100-
| >= 0.12.0 < 0.16.0 | ^15.8.0 |
101-
| ~0.10.0, ~0.11.0 | ~15.7.2 |
102-
| >= 0.6.0 < 0.10.0 | ~15.6.0 |
103-
| ~0.5.0 | ~15.5.0 |
104-
| ~0.4.0 | ~15.4.0 |
105-
| <=0.4.0 | ^15.0.0 |
94+
| qwik-nx version | Nx version |
95+
| ------------------ | ---------------- |
96+
| ^2.0.0 | ^17.0.0, ^18.0.0 |
97+
| ^1.1.0 | ^16.8.0 |
98+
| ^1.0.0 | ^16.0.0 |
99+
| ^0.16.0 | ^16.0.0 |
100+
| >= 0.12.0 < 0.16.0 | ^15.8.0 |
101+
| ~0.10.0, ~0.11.0 | ~15.7.2 |
102+
| >= 0.6.0 < 0.10.0 | ~15.6.0 |
103+
| ~0.5.0 | ~15.5.0 |
104+
| ~0.4.0 | ~15.4.0 |
105+
| <=0.4.0 | ^15.0.0 |
106106

107107
We will provide support for Nx 15 with critical bug fixes and minor features for a while. If you're using [email protected] or higher, you can stick to [email protected].
108108

‎e2e/qwik-nx-e2e/project.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
},
1515
"lint": {
1616
"executor": "@nx/eslint:lint",
17-
"outputs": ["{options.outputFile}"],
18-
"options": {
19-
"lintFilePatterns": ["e2e/qwik-nx-e2e/**/*.ts"]
20-
}
17+
"outputs": ["{options.outputFile}"]
2118
}
2219
},
2320
"tags": [],

‎jest.preset.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ module.exports = {
1212
* More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
1313
*/
1414
snapshotFormat: { escapeString: true, printBasicPrototype: true },
15+
testTimeout: 10000,
1516
};

‎nx.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,25 @@
1818
"version": {
1919
"dependsOn": ["build"]
2020
},
21-
"lint": {
22-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
21+
"e2e": {
2322
"cache": true
2423
},
25-
"test": {
26-
"inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
24+
"@nx/eslint:lint": {
25+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
2726
"cache": true
2827
},
29-
"e2e": {
30-
"cache": true
28+
"@nx/jest:jest": {
29+
"inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
30+
"cache": true,
31+
"options": {
32+
"passWithNoTests": true
33+
},
34+
"configurations": {
35+
"ci": {
36+
"ci": true,
37+
"codeCoverage": true
38+
}
39+
}
3140
}
3241
},
3342
"workspaceLayout": {

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,41 @@
1919
"pnpm": "^8.0.0"
2020
},
2121
"devDependencies": {
22-
"@builder.io/qwik": "^1.2.12",
22+
"@builder.io/qwik": "~1.4.4",
2323
"@commitlint/cli": "^17.3.0",
2424
"@commitlint/config-angular": "^17.3.0",
2525
"@commitlint/config-conventional": "^17.3.0",
2626
"@jscutlery/semver": "^4.0.0",
27-
"@nx/cypress": "17.0.3",
28-
"@nx/devkit": "17.0.3",
29-
"@nx/eslint": "17.0.3",
30-
"@nx/eslint-plugin": "17.0.3",
31-
"@nx/jest": "17.0.3",
32-
"@nx/js": "17.0.3",
33-
"@nx/playwright": "17.0.3",
34-
"@nx/plugin": "17.0.3",
35-
"@nx/storybook": "17.0.3",
36-
"@nx/vite": "17.0.3",
37-
"@nx/workspace": "17.0.3",
27+
"@nx/cypress": "17.3.0",
28+
"@nx/devkit": "17.3.0",
29+
"@nx/eslint": "17.3.0",
30+
"@nx/eslint-plugin": "17.3.0",
31+
"@nx/jest": "17.3.0",
32+
"@nx/js": "17.3.0",
33+
"@nx/playwright": "17.3.0",
34+
"@nx/plugin": "17.3.0",
35+
"@nx/storybook": "17.3.0",
36+
"@nx/vite": "17.3.0",
37+
"@nx/workspace": "17.3.0",
3838
"@swc-node/register": "1.6.8",
3939
"@swc/cli": "0.1.62",
4040
"@swc/core": "^1.3.95",
4141
"@types/fs-extra": "11.0.1",
4242
"@types/jest": "29.4.0",
43-
"@types/node": "16.11.7",
43+
"@types/node": "18.19.15",
4444
"@types/semver": "7.5.6",
4545
"@types/tcp-port-used": "1.0.1",
4646
"@types/yargs": "17.0.24",
47-
"@typescript-eslint/eslint-plugin": "5.62.0",
48-
"@typescript-eslint/parser": "5.62.0",
47+
"@typescript-eslint/eslint-plugin": "6.21.0",
48+
"@typescript-eslint/parser": "6.21.0",
4949
"all-contributors-cli": "^6.24.0",
5050
"chalk": "^4.1.0",
5151
"commitizen": "^4.2.5",
5252
"commitlint": "^17.3.0",
5353
"create-nx-workspace": "17.0.3",
5454
"cz-conventional-changelog": "^3.3.0",
5555
"enquirer": "2.3.6",
56-
"eslint": "8.46.0",
56+
"eslint": "8.48.0",
5757
"eslint-config-prettier": "9.0.0",
5858
"eslint-plugin-unused-imports": "2.0.0",
5959
"fs-extra": "11.1.0",
@@ -65,7 +65,7 @@
6565
"jsonc-eslint-parser": "^2.1.0",
6666
"kill-port": "2.0.1",
6767
"ngx-deploy-npm": "^6.0.0",
68-
"nx": "17.0.3",
68+
"nx": "17.3.0",
6969
"prettier": "^2.8.0",
7070
"pretty-quick": "^3.1.3",
7171
"semver": "7.6.0",
@@ -76,7 +76,7 @@
7676
"ts-node": "10.9.1",
7777
"typescript": "4.9.5",
7878
"verdaccio": "5.21.1",
79-
"vite": "~4.4.11",
79+
"vite": "~5.0.0",
8080
"yargs": "17.7.1"
8181
},
8282
"dependencies": {

‎packages/add-nx-to-qwik/project.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
"projectType": "library",
66
"targets": {
77
"lint": {
8-
"executor": "@nx/eslint:lint",
9-
"options": {
10-
"lintFilePatterns": ["packages/add-nx-to-qwik/**/*.ts"]
11-
}
8+
"executor": "@nx/eslint:lint"
129
},
1310
"test": {
1411
"executor": "@nx/jest:jest",
1512
"outputs": ["{workspaceRoot}/coverage/packages/add-nx-to-qwik"],
1613
"options": {
17-
"jestConfig": "packages/add-nx-to-qwik/jest.config.ts",
18-
"passWithNoTests": true
14+
"jestConfig": "packages/add-nx-to-qwik/jest.config.ts"
1915
}
2016
},
2117
"build-base": {

‎packages/add-nx-to-qwik/src/add-nx-to-qwik.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function createNxJsonFile(
202202
repoRoot: string,
203203
targetDefaults: string[],
204204
cacheableOperations: string[],
205-
scriptOutputs: { [name: string]: string }
205+
scriptOutputs: Record<string, string>
206206
) {
207207
const nxJsonPath = joinPathFragments(repoRoot, 'nx.json');
208208
let nxJson = {} as any;

‎packages/create-qwik-nx/project.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,6 @@
4949
},
5050
"lint": {
5151
"executor": "@nx/eslint:lint",
52-
"options": {
53-
"lintFilePatterns": [
54-
"packages/create-qwik-nx/**/*.ts",
55-
"packages/create-qwik-nx/**/*.spec.ts",
56-
"packages/create-qwik-nx/**/*_spec.ts",
57-
"packages/create-qwik-nx/**/*.spec.tsx",
58-
"packages/create-qwik-nx/**/*.spec.js",
59-
"packages/create-qwik-nx/**/*.spec.jsx",
60-
"packages/create-qwik-nx/**/*.d.ts"
61-
]
62-
},
6352
"outputs": ["{options.outputFile}"]
6453
},
6554
"version": {

‎packages/qwik-nx/project.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,13 @@
4848
},
4949
"lint": {
5050
"executor": "@nx/eslint:lint",
51-
"outputs": ["{options.outputFile}"],
52-
"options": {
53-
"lintFilePatterns": [
54-
"packages/qwik-nx/**/*.ts",
55-
"packages/qwik-nx/generators.json",
56-
"packages/qwik-nx/executors.json",
57-
"packages/qwik-nx/package.json",
58-
"packages/qwik-nx/migrations.json"
59-
]
60-
}
51+
"outputs": ["{options.outputFile}"]
6152
},
6253
"test": {
6354
"executor": "@nx/jest:jest",
6455
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
6556
"options": {
66-
"jestConfig": "packages/qwik-nx/jest.config.ts",
67-
"passWithNoTests": true
57+
"jestConfig": "packages/qwik-nx/jest.config.ts"
6858
}
6959
},
7060
"version": {

0 commit comments

Comments
 (0)