feat(qwik-nx): nx 19 support (#231)

dmitry-stepanenko · web-flow · commit a821e767773a · 2024-05-23T09:47:36.000+03:00
* feat(qwik-nx): nx 19 support

* feat(qwik-nx): bump deps

* chore(repo): use jest as e2e executor
diff --git a/README.md b/README.md
@@ -91,20 +91,11 @@ This plugin supports Nx migrations and provides necessary version and code updat
 
 ## qwik-nx & Nx Compatibility Chart
 
-| qwik-nx version    | Nx version       |
-| ------------------ | ---------------- |
-| ^2.0.0             | ^17.0.0, ^18.0.0 |
-| ^1.1.0             | ^16.8.0          |
-| ^1.0.0             | ^16.0.0          |
-| ^0.16.0            | ^16.0.0          |
-| >= 0.12.0 < 0.16.0 | ^15.8.0          |
-| ~0.10.0, ~0.11.0   | ~15.7.2          |
-| >= 0.6.0 < 0.10.0  | ~15.6.0          |
-| ~0.5.0             | ~15.5.0          |
-| ~0.4.0             | ~15.4.0          |
-| <=0.4.0            | ^15.0.0          |
-
-We will provide support for Nx 15 with critical bug fixes and minor features for a while. If you're using nx@15.8 or higher, you can stick to qwik-nx@0.15.
+| qwik-nx version | Nx version                |
+| --------------- | ------------------------- |
+| ^2.0.0          | ^17.0.0, ^18.0.0, ^19.0.0 |
+| ^1.1.0          | ^16.8.0                   |
+| ^1.0.0          | ^16.0.0                   |
 
 ## ROADMAP:
 
diff --git a/e2e/qwik-nx-e2e/project.json b/e2e/qwik-nx-e2e/project.json
@@ -5,12 +5,12 @@
   "sourceRoot": "e2e/qwik-nx-e2e/src",
   "targets": {
     "e2e": {
-      "executor": "@nx/plugin:e2e",
+      "executor": "@nx/jest:jest",
       "options": {
-        "target": "qwik-nx:build",
         "jestConfig": "e2e/qwik-nx-e2e/jest.config.ts",
         "maxWorkers": 1
-      }
+      },
+      "dependsOn": ["^build"]
     },
     "lint": {
       "executor": "@nx/eslint:lint",
diff --git a/e2e/qwik-nx-e2e/tests/chore.spec.ts b/e2e/qwik-nx-e2e/tests/chore.spec.ts
@@ -23,10 +23,10 @@ describe('misc checks', () => {
       expect(packageJson.dependencies).toBeUndefined();
       expect(packageJson.devDependencies).toBeUndefined();
       expect(packageJson.peerDependencies).toEqual({
-        '@nx/devkit': '^17.0.0 || ^18.0.0',
-        '@nx/js': '^17.0.0 || ^18.0.0',
-        '@nx/eslint': '^17.0.0 || ^18.0.0',
-        '@nx/vite': '^17.0.0 || ^18.0.0',
+        '@nx/devkit': '^17.0.0 || ^18.0.0 || ^19.0.0',
+        '@nx/js': '^17.0.0 || ^18.0.0 || ^19.0.0',
+        '@nx/eslint': '^17.0.0 || ^18.0.0 || ^19.0.0',
+        '@nx/vite': '^17.0.0 || ^18.0.0 || ^19.0.0',
       });
     },
     DEFAULT_E2E_TIMEOUT
diff --git a/nx.json b/nx.json
@@ -43,5 +43,6 @@
     "appsDir": "e2e",
     "libsDir": "packages"
   },
-  "nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU="
+  "nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU=",
+  "useInferencePlugins": false
 }
diff --git a/package.json b/package.json
@@ -24,36 +24,36 @@
     "@commitlint/config-angular": "^17.8.1",
     "@commitlint/config-conventional": "^17.8.1",
     "@jscutlery/semver": "^4.2.0",
-    "@nx/cypress": "17.3.0",
-    "@nx/devkit": "17.3.0",
-    "@nx/eslint": "17.3.0",
-    "@nx/eslint-plugin": "17.3.0",
-    "@nx/jest": "17.3.0",
-    "@nx/js": "17.3.0",
-    "@nx/playwright": "17.3.0",
-    "@nx/plugin": "17.3.0",
-    "@nx/storybook": "17.3.0",
-    "@nx/vite": "17.3.0",
-    "@nx/workspace": "17.3.0",
-    "@swc-node/register": "1.6.8",
-    "@swc/cli": "0.1.62",
+    "@nx/cypress": "19.0.6",
+    "@nx/devkit": "19.0.6",
+    "@nx/eslint": "19.0.6",
+    "@nx/eslint-plugin": "19.0.6",
+    "@nx/jest": "19.0.6",
+    "@nx/js": "19.0.6",
+    "@nx/playwright": "19.0.6",
+    "@nx/plugin": "19.0.6",
+    "@nx/storybook": "19.0.6",
+    "@nx/vite": "19.0.6",
+    "@nx/workspace": "19.0.6",
+    "@swc-node/register": "1.8.0",
+    "@swc/cli": "0.3.12",
     "@swc/core": "^1.4.1",
     "@types/fs-extra": "11.0.1",
     "@types/jest": "29.4.0",
     "@types/node": "18.19.15",
     "@types/semver": "7.5.6",
     "@types/tcp-port-used": "1.0.1",
     "@types/yargs": "17.0.24",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
+    "@typescript-eslint/eslint-plugin": "7.9.0",
+    "@typescript-eslint/parser": "7.9.0",
     "all-contributors-cli": "^6.26.1",
     "chalk": "^4.1.2",
     "commitizen": "^4.3.0",
     "commitlint": "^17.8.1",
     "create-nx-workspace": "17.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "enquirer": "2.3.6",
-    "eslint": "8.48.0",
+    "eslint": "8.57.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-unused-imports": "2.0.0",
     "fs-extra": "11.1.0",
@@ -65,7 +65,7 @@
     "jsonc-eslint-parser": "^2.4.0",
     "kill-port": "2.0.1",
     "ngx-deploy-npm": "8.0.1",
-    "nx": "17.3.0",
+    "nx": "19.0.6",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.3.1",
     "semver": "7.6.0",
diff --git a/packages/qwik-nx/migrations.json b/packages/qwik-nx/migrations.json
@@ -309,6 +309,23 @@
           "version": "^1.0.0"
         }
       }
+    },
+    "2.3.0": {
+      "version": "2.3.0",
+      "packages": {
+        "@builder.io/qwik": {
+          "version": "~1.5.5"
+        },
+        "@builder.io/qwik-city": {
+          "version": "~1.5.5"
+        },
+        "eslint-plugin-qwik": {
+          "version": "~1.5.5"
+        },
+        "vite": {
+          "version": "~5.2.0"
+        }
+      }
     }
   }
 }
diff --git a/packages/qwik-nx/package.json b/packages/qwik-nx/package.json
@@ -22,10 +22,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nx/devkit": "^17.0.0 || ^18.0.0",
-    "@nx/js": "^17.0.0 || ^18.0.0",
-    "@nx/vite": "^17.0.0 || ^18.0.0",
-    "@nx/eslint": "^17.0.0 || ^18.0.0"
+    "@nx/devkit": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "@nx/js": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "@nx/vite": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "@nx/eslint": "^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
diff --git a/packages/qwik-nx/src/generators/application/generator-internal.ts b/packages/qwik-nx/src/generators/application/generator-internal.ts
@@ -80,7 +80,9 @@ export async function appGeneratorInternal(
   );
 
   if (normalizedOptions.linter === Linter.EsLint) {
-    tasks.push(configureEslint(tree, normalizedOptions.projectName, true));
+    tasks.push(
+      await configureEslint(tree, normalizedOptions.projectName, true)
+    );
   }
 
   if (normalizedOptions.styleExtension) {
diff --git a/packages/qwik-nx/src/generators/host/__snapshots__/generator.spec.ts.snap b/packages/qwik-nx/src/generators/host/__snapshots__/generator.spec.ts.snap
@@ -1036,6 +1036,7 @@ exports[`host generator should run successfully 3`] = `
   \\"$schema\\": \\"../../node_modules/nx/schemas/project-schema.json\\",
   \\"projectType\\": \\"application\\",
   \\"sourceRoot\\": \\"apps/myhostapp/src\\",
+  \\"tags\\": [],
   \\"targets\\": {
     \\"build\\": {
       \\"executor\\": \\"qwik-nx:build\\",
@@ -1097,8 +1098,7 @@ exports[`host generator should run successfully 3`] = `
         \\"cwd\\": \\"apps/myhostapp\\"
       }
     }
-  },
-  \\"tags\\": []
+  }
 }
 "
 `;
diff --git a/packages/qwik-nx/src/generators/library/generator-internal.ts b/packages/qwik-nx/src/generators/library/generator-internal.ts
@@ -42,7 +42,7 @@ export async function libraryGeneratorInternal(
   tasks.push(await configureVite(tree, options));
 
   if (options.linter === Linter.EsLint) {
-    tasks.push(configureEslint(tree, options.projectName, true));
+    tasks.push(await configureEslint(tree, options.projectName, true));
   }
 
   tasks.push(addCommonQwikDependencies(tree));
diff --git a/packages/qwik-nx/src/utils/add-common-qwik-dependencies.spec.ts b/packages/qwik-nx/src/utils/add-common-qwik-dependencies.spec.ts
@@ -33,13 +33,22 @@ describe('init generator', () => {
     expect(devDependencies['@builder.io/qwik']).toBe('my-version');
   });
 
-  it('should override existing versions if they are listed in "unsupportedPackageVersions"', async () => {
+  it('should override existing versions if they are listed in "unsupportedPackageVersions" 1', async () => {
     updateJson(appTree, 'package.json', (json) => {
       (json.devDependencies ??= {})['vite'] = '5.1.1';
       return json;
     });
     await addCommonQwikDependencies(appTree);
     const { devDependencies } = readJson(appTree, 'package.json');
-    expect(devDependencies['vite']).toBe('~5.0.0');
+    expect(devDependencies['vite']).toBe('~5.2.0');
+  });
+  it('should not override existing versions if they are listed in "unsupportedPackageVersions" and have proper version', async () => {
+    updateJson(appTree, 'package.json', (json) => {
+      (json.devDependencies ??= {})['vite'] = '5.2.1';
+      return json;
+    });
+    await addCommonQwikDependencies(appTree);
+    const { devDependencies } = readJson(appTree, 'package.json');
+    expect(devDependencies['vite']).toBe('5.2.1');
   });
 });
diff --git a/packages/qwik-nx/src/utils/add-common-qwik-dependencies.ts b/packages/qwik-nx/src/utils/add-common-qwik-dependencies.ts
@@ -37,7 +37,7 @@ export function addCommonQwikDependencies(tree: Tree): GeneratorCallback {
 
   const unsupportedPackageVersions = new Map<string, string>([
     // https://github.com/vitejs/vite/issues/15870
-    ['vite', '<5.1.0'],
+    ['vite', '<5.1.0 || >=5.2.0'],
   ]);
   let hasChanges = false;
   for (const [dep, versionRange] of unsupportedPackageVersions.entries()) {
diff --git a/packages/qwik-nx/src/utils/configure-eslint.ts b/packages/qwik-nx/src/utils/configure-eslint.ts
@@ -8,11 +8,11 @@ import {
 import { lintProjectGenerator, Linter } from '@nx/eslint';
 import { qwikEslintPluginVersion } from './versions';
 
-export function configureEslint(
+export async function configureEslint(
   tree: Tree,
   project: string,
   skipLibsEslintConfig = false
-): GeneratorCallback {
+): Promise<GeneratorCallback> {
   const cfg = readProjectConfiguration(tree, project);
 
   const existingLibEslintConfigPath = joinPathFragments(
@@ -26,7 +26,7 @@ export function configureEslint(
     existingLibEslintConfig = tree.read(existingLibEslintConfigPath);
   }
 
-  lintProjectGenerator(tree, {
+  await lintProjectGenerator(tree, {
     project: project,
     linter: Linter.EsLint,
     skipFormat: true,
diff --git a/packages/qwik-nx/src/utils/versions.ts b/packages/qwik-nx/src/utils/versions.ts
@@ -1,15 +1,15 @@
 // qwik packages
-export const qwikVersion = '~1.4.4';
-export const qwikCityVersion = '~1.4.4';
-export const qwikEslintPluginVersion = '~1.4.4';
+export const qwikVersion = '~1.5.5';
+export const qwikCityVersion = '~1.5.5';
+export const qwikEslintPluginVersion = '~1.5.5';
 
 // css preprocessors
 export const sassVersion = '~1.56.1';
 export const lessVersion = '~4.1.3';
 export const stylusVersion = '~0.59.0';
 
 export const undiciVersion = '^5.22.0';
-export const viteVersion = '~5.0.0';
+export const viteVersion = '~5.2.0';
 export const viteTsconfigPathsVersion = '~4.2.0';
 export const vitestVersion = '^1.0.0';
 
@@ -45,11 +45,6 @@ export const vitePluginAngularVersion = '~0.2.0';
 export const qwikAngularVersion = '~0.2.0';
 
 // other
-export const eslintVersion = '~8.36.0';
-export const tsEslintVersion = '~5.43.0';
-export const prettierVersion = '~2.8.7';
-export const typescriptVersion = '~5.0.2';
 export const nodeFetchVersion = '~3.3.0';
 export const typesNodeVersion = '^18.16.1';
-export const typesEslint = '~8.37.0';
 export const tsMorphVersion = '^17.0.0';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,6 @@`
`43`	`43`	`"appsDir": "e2e",`
`44`	`44`	`"libsDir": "packages"`
`45`	`45`	`},`
`46`		`- "nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU="`
	`46`	`+ "nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU=",`
	`47`	`+ "useInferencePlugins": false`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,23 @@`
`309`	`309`	`"version": "^1.0.0"`
`310`	`310`	`}`
`311`	`311`	`}`
	`312`	`+ },`
	`313`	`+ "2.3.0": {`
	`314`	`+ "version": "2.3.0",`
	`315`	`+ "packages": {`
	`316`	`+ "@builder.io/qwik": {`
	`317`	`+ "version": "~1.5.5"`
	`318`	`+ },`
	`319`	`+ "@builder.io/qwik-city": {`
	`320`	`+ "version": "~1.5.5"`
	`321`	`+ },`
	`322`	`+ "eslint-plugin-qwik": {`
	`323`	`+ "version": "~1.5.5"`
	`324`	`+ },`
	`325`	`+ "vite": {`
	`326`	`+ "version": "~5.2.0"`
	`327`	`+ }`
	`328`	`+ }`
`312`	`329`	`}`
`313`	`330`	`}`
`314`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,9 @@ export async function appGeneratorInternal(`
`80`	`80`	`);`
`81`	`81`
`82`	`82`	`if (normalizedOptions.linter === Linter.EsLint) {`
`83`		`- tasks.push(configureEslint(tree, normalizedOptions.projectName, true));`
	`83`	`+ tasks.push(`
	`84`	`+ await configureEslint(tree, normalizedOptions.projectName, true)`
	`85`	`+ );`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`if (normalizedOptions.styleExtension) {`
Original file line number	Diff line number	Diff line change
@@ -1036,6 +1036,7 @@ exports[`host generator should run successfully 3`] = `
`1036`	`1036`	`\\"$schema\\": \\"../../node_modules/nx/schemas/project-schema.json\\",`
`1037`	`1037`	`\\"projectType\\": \\"application\\",`
`1038`	`1038`	`\\"sourceRoot\\": \\"apps/myhostapp/src\\",`
	`1039`	`+ \\"tags\\": [],`
`1039`	`1040`	`\\"targets\\": {`
`1040`	`1041`	`\\"build\\": {`
`1041`	`1042`	`\\"executor\\": \\"qwik-nx:build\\",`
@@ -1097,8 +1098,7 @@ exports[`host generator should run successfully 3`] = `
`1097`	`1098`	`\\"cwd\\": \\"apps/myhostapp\\"`
`1098`	`1099`	`}`
`1099`	`1100`	`}`
`1100`		`- },`
`1101`		`- \\"tags\\": []`
	`1101`	`+ }`
`1102`	`1102`	`}`
`1103`	`1103`	`"`
`1104`	`1104`	`;
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export async function libraryGeneratorInternal(`
`42`	`42`	`tasks.push(await configureVite(tree, options));`
`43`	`43`
`44`	`44`	`if (options.linter === Linter.EsLint) {`
`45`		`- tasks.push(configureEslint(tree, options.projectName, true));`
	`45`	`+ tasks.push(await configureEslint(tree, options.projectName, true));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`tasks.push(addCommonQwikDependencies(tree));`