Skip to content

Commit bb55d7a

Browse files
dmitry-stepanenkodmitry-stepanenko
committed
feat(qwik-nx): nx 19 support
1 parent 425230e commit bb55d7a

File tree

10 files changed

+547
-421
lines changed

10 files changed

+547
-421
lines changed

‎README.md‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,11 @@ 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, ^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 |
106-
107-
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].
94+
| qwik-nx version | Nx version |
95+
| --------------- | ------------------------- |
96+
| ^2.0.0 | ^17.0.0, ^18.0.0, ^19.0.0 |
97+
| ^1.1.0 | ^16.8.0 |
98+
| ^1.0.0 | ^16.0.0 |
10899

109100
## ROADMAP:
110101

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ describe('misc checks', () => {
2323
expect(packageJson.dependencies).toBeUndefined();
2424
expect(packageJson.devDependencies).toBeUndefined();
2525
expect(packageJson.peerDependencies).toEqual({
26-
'@nx/devkit': '^17.0.0 || ^18.0.0',
27-
'@nx/js': '^17.0.0 || ^18.0.0',
28-
'@nx/eslint': '^17.0.0 || ^18.0.0',
29-
'@nx/vite': '^17.0.0 || ^18.0.0',
26+
'@nx/devkit': '^17.0.0 || ^18.0.0 || ^19.0.0',
27+
'@nx/js': '^17.0.0 || ^18.0.0 || ^19.0.0',
28+
'@nx/eslint': '^17.0.0 || ^18.0.0 || ^19.0.0',
29+
'@nx/vite': '^17.0.0 || ^18.0.0 || ^19.0.0',
3030
});
3131
},
3232
DEFAULT_E2E_TIMEOUT

‎nx.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@
4343
"appsDir": "e2e",
4444
"libsDir": "packages"
4545
},
46-
"nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU="
46+
"nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU=",
47+
"useInferencePlugins": false
4748
}

‎package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,36 @@
2424
"@commitlint/config-angular": "^17.8.1",
2525
"@commitlint/config-conventional": "^17.8.1",
2626
"@jscutlery/semver": "^4.2.0",
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",
38-
"@swc-node/register": "1.6.8",
39-
"@swc/cli": "0.1.62",
27+
"@nx/cypress": "19.0.6",
28+
"@nx/devkit": "19.0.6",
29+
"@nx/eslint": "19.0.6",
30+
"@nx/eslint-plugin": "19.0.6",
31+
"@nx/jest": "19.0.6",
32+
"@nx/js": "19.0.6",
33+
"@nx/playwright": "19.0.6",
34+
"@nx/plugin": "19.0.6",
35+
"@nx/storybook": "19.0.6",
36+
"@nx/vite": "19.0.6",
37+
"@nx/workspace": "19.0.6",
38+
"@swc-node/register": "1.8.0",
39+
"@swc/cli": "0.3.12",
4040
"@swc/core": "^1.4.1",
4141
"@types/fs-extra": "11.0.1",
4242
"@types/jest": "29.4.0",
4343
"@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": "6.21.0",
48-
"@typescript-eslint/parser": "6.21.0",
47+
"@typescript-eslint/eslint-plugin": "7.9.0",
48+
"@typescript-eslint/parser": "7.9.0",
4949
"all-contributors-cli": "^6.26.1",
5050
"chalk": "^4.1.2",
5151
"commitizen": "^4.3.0",
5252
"commitlint": "^17.8.1",
5353
"create-nx-workspace": "17.0.3",
5454
"cz-conventional-changelog": "^3.3.0",
5555
"enquirer": "2.3.6",
56-
"eslint": "8.48.0",
56+
"eslint": "8.57.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.4.0",
6666
"kill-port": "2.0.1",
6767
"ngx-deploy-npm": "8.0.1",
68-
"nx": "17.3.0",
68+
"nx": "19.0.6",
6969
"prettier": "^2.8.8",
7070
"pretty-quick": "^3.3.1",
7171
"semver": "7.6.0",

‎packages/qwik-nx/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"generators": "./generators.json",
2323
"executors": "./executors.json",
2424
"peerDependencies": {
25-
"@nx/devkit": "^17.0.0 || ^18.0.0",
26-
"@nx/js": "^17.0.0 || ^18.0.0",
27-
"@nx/vite": "^17.0.0 || ^18.0.0",
28-
"@nx/eslint": "^17.0.0 || ^18.0.0"
25+
"@nx/devkit": "^17.0.0 || ^18.0.0 || ^19.0.0",
26+
"@nx/js": "^17.0.0 || ^18.0.0 || ^19.0.0",
27+
"@nx/vite": "^17.0.0 || ^18.0.0 || ^19.0.0",
28+
"@nx/eslint": "^17.0.0 || ^18.0.0 || ^19.0.0"
2929
},
3030
"nx-migrations": {
3131
"migrations": "./migrations.json"

‎packages/qwik-nx/src/generators/application/generator-internal.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ export async function appGeneratorInternal(
8080
);
8181

8282
if (normalizedOptions.linter === Linter.EsLint) {
83-
tasks.push(configureEslint(tree, normalizedOptions.projectName, true));
83+
tasks.push(
84+
await configureEslint(tree, normalizedOptions.projectName, true)
85+
);
8486
}
8587

8688
if (normalizedOptions.styleExtension) {

‎packages/qwik-nx/src/generators/host/__snapshots__/generator.spec.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,7 @@ exports[`host generator should run successfully 3`] = `
10361036
\\"$schema\\": \\"../../node_modules/nx/schemas/project-schema.json\\",
10371037
\\"projectType\\": \\"application\\",
10381038
\\"sourceRoot\\": \\"apps/myhostapp/src\\",
1039+
\\"tags\\": [],
10391040
\\"targets\\": {
10401041
\\"build\\": {
10411042
\\"executor\\": \\"qwik-nx:build\\",
@@ -1097,8 +1098,7 @@ exports[`host generator should run successfully 3`] = `
10971098
\\"cwd\\": \\"apps/myhostapp\\"
10981099
}
10991100
}
1100-
},
1101-
\\"tags\\": []
1101+
}
11021102
}
11031103
"
11041104
`;

‎packages/qwik-nx/src/generators/library/generator-internal.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export async function libraryGeneratorInternal(
4242
tasks.push(await configureVite(tree, options));
4343

4444
if (options.linter === Linter.EsLint) {
45-
tasks.push(configureEslint(tree, options.projectName, true));
45+
tasks.push(await configureEslint(tree, options.projectName, true));
4646
}
4747

4848
tasks.push(addCommonQwikDependencies(tree));

‎packages/qwik-nx/src/utils/configure-eslint.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import {
88
import { lintProjectGenerator, Linter } from '@nx/eslint';
99
import { qwikEslintPluginVersion } from './versions';
1010

11-
export function configureEslint(
11+
export async function configureEslint(
1212
tree: Tree,
1313
project: string,
1414
skipLibsEslintConfig = false
15-
): GeneratorCallback {
15+
): Promise<GeneratorCallback> {
1616
const cfg = readProjectConfiguration(tree, project);
1717

1818
const existingLibEslintConfigPath = joinPathFragments(
@@ -26,7 +26,7 @@ export function configureEslint(
2626
existingLibEslintConfig = tree.read(existingLibEslintConfigPath);
2727
}
2828

29-
lintProjectGenerator(tree, {
29+
await lintProjectGenerator(tree, {
3030
project: project,
3131
linter: Linter.EsLint,
3232
skipFormat: true,

0 commit comments

Comments
 (0)