Skip to content

Commit 1cbf329

Browse files
feat(qwik-nx): nx 17 support (#213)
* feat(qwik-nx): migrate to nx@17 - automated changes * chore(repo): bump @jscutlery/semver * chore(qwik-nx): misc updates * test(qwik-nx): update snapshots
1 parent 887ca75 commit 1cbf329

File tree

38 files changed

+381
-527
lines changed

38 files changed

+381
-527
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ Thumbs.db
4040

4141
# Local Netlify folder
4242
.netlify
43+
44+
# Nx
45+
.nx/cache
46+
migrations.json

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
/dist
44
/coverage
5-
CHANGELOG.md
5+
CHANGELOG.md
6+
/.nx/cache

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ This plugin supports Nx migrations and provides necessary version and code updat
8787

8888
| qwik-nx version | Nx version |
8989
| ------------------ | ---------- |
90+
| ^2.0.0 | ^17.0.0 |
9091
| ^1.1.0 | ^16.8.0 |
9192
| ^1.0.0 | ^16.0.0 |
9293
| ^0.16.0 | ^16.0.0 |

e2e/qwik-nx-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"lint": {
16-
"executor": "@nx/linter:eslint",
16+
"executor": "@nx/eslint:lint",
1717
"outputs": ["{options.outputFile}"],
1818
"options": {
1919
"lintFilePatterns": ["e2e/qwik-nx-e2e/**/*.ts"]

e2e/qwik-nx-e2e/tests/chore.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ describe('misc checks', () => {
2222

2323
expect(packageJson.peerDependencies).toBeUndefined();
2424
expect(packageJson.dependencies).toEqual({
25-
'@nx/devkit': '^16.0.0',
26-
'@nx/js': '^16.0.0',
27-
'@nx/linter': '^16.0.0',
28-
'@nx/vite': '^16.0.0',
25+
'@nx/devkit': '^17.0.0',
26+
'@nx/js': '^17.0.0',
27+
'@nx/eslint': '^17.0.0',
28+
'@nx/vite': '^17.0.0',
2929
});
3030
},
3131
DEFAULT_E2E_TIMEOUT

nx.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
{
22
"$schema": "./node_modules/nx/schemas/nx-schema.json",
3-
"npmScope": "qwikifiers",
43
"tasksRunnerOptions": {
54
"default": {
6-
"runner": "nx-cloud",
75
"options": {
8-
"cacheableOperations": ["build", "lint", "test", "e2e"],
96
"runtimeCacheInputs": [
107
"node ./scripts/get-cache-input.js --type=node",
118
"node ./scripts/get-cache-input.js --type=os"
12-
],
13-
"accessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU="
9+
]
1410
}
1511
}
1612
},
1713
"targetDefaults": {
1814
"build": {
19-
"dependsOn": ["^build"]
15+
"dependsOn": ["^build"],
16+
"cache": true
2017
},
2118
"version": {
2219
"dependsOn": ["build"]
2320
},
2421
"lint": {
25-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
22+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
23+
"cache": true
2624
},
2725
"test": {
28-
"inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"]
26+
"inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
27+
"cache": true
28+
},
29+
"e2e": {
30+
"cache": true
2931
}
3032
},
3133
"workspaceLayout": {
3234
"appsDir": "e2e",
3335
"libsDir": "packages"
34-
}
36+
},
37+
"nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU="
3538
}

package.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
"@commitlint/cli": "^17.3.0",
2424
"@commitlint/config-angular": "^17.3.0",
2525
"@commitlint/config-conventional": "^17.3.0",
26-
"@jscutlery/semver": "^3.1.0",
27-
"@nx/cypress": "16.10.0",
28-
"@nx/devkit": "16.10.0",
29-
"@nx/eslint-plugin": "16.10.0",
30-
"@nx/jest": "16.10.0",
31-
"@nx/js": "16.10.0",
32-
"@nx/linter": "16.10.0",
33-
"@nx/playwright": "16.10.0",
34-
"@nx/plugin": "16.10.0",
35-
"@nx/storybook": "16.10.0",
36-
"@nx/vite": "16.10.0",
37-
"@nx/workspace": "16.10.0",
26+
"@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",
3838
"@swc-node/register": "1.6.8",
3939
"@swc/cli": "0.1.62",
4040
"@swc/core": "^1.3.95",
@@ -49,11 +49,11 @@
4949
"chalk": "^4.1.0",
5050
"commitizen": "^4.2.5",
5151
"commitlint": "^17.3.0",
52-
"create-nx-workspace": "16.0.0",
52+
"create-nx-workspace": "17.0.3",
5353
"cz-conventional-changelog": "^3.3.0",
5454
"enquirer": "2.3.6",
5555
"eslint": "8.46.0",
56-
"eslint-config-prettier": "8.1.0",
56+
"eslint-config-prettier": "9.0.0",
5757
"eslint-plugin-unused-imports": "2.0.0",
5858
"fs-extra": "11.1.0",
5959
"husky": "^8.0.1",
@@ -64,8 +64,7 @@
6464
"jsonc-eslint-parser": "^2.1.0",
6565
"kill-port": "2.0.1",
6666
"ngx-deploy-npm": "^6.0.0",
67-
"nx": "16.10.0",
68-
"nx-cloud": "16.5.2",
67+
"nx": "17.0.3",
6968
"prettier": "^2.8.0",
7069
"pretty-quick": "^3.1.3",
7170
"tcp-port-used": "1.0.2",

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projectType": "library",
66
"targets": {
77
"lint": {
8-
"executor": "@nx/linter:eslint",
8+
"executor": "@nx/eslint:lint",
99
"options": {
1010
"lintFilePatterns": ["packages/add-nx-to-qwik/**/*.ts"]
1111
}
@@ -26,7 +26,6 @@
2626
"tsConfig": "packages/add-nx-to-qwik/tsconfig.lib.json",
2727
"packageJson": "packages/add-nx-to-qwik/package.json",
2828
"main": "packages/add-nx-to-qwik/src/index.ts",
29-
"updateBuildableProjectDepsInPackageJson": false,
3029
"assets": [
3130
"packages/add-nx-to-qwik/*.md",
3231
{

packages/create-qwik-nx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"homepage": "https://github.com/qwikifiers/qwik-nx",
2727
"dependencies": {
28-
"create-nx-workspace": "^16.0.0"
28+
"create-nx-workspace": "^17.0.0"
2929
},
3030
"publishConfig": {
3131
"access": "public",

packages/create-qwik-nx/project.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@
4444
"glob": "LICENSE",
4545
"output": "/"
4646
}
47-
],
48-
"updateBuildableProjectDepsInPackageJson": true
47+
]
4948
}
5049
},
5150
"lint": {
52-
"executor": "@nx/linter:eslint",
51+
"executor": "@nx/eslint:lint",
5352
"options": {
5453
"lintFilePatterns": [
5554
"packages/create-qwik-nx/**/*.ts",

0 commit comments

Comments
 (0)