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
qwikifiers · Feb 13, 2024 · b740703 · b740703
1 parent 9efc0b5
commit b740703
Show file tree

Hide file tree

Showing 18 changed files with 872 additions and 689 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -25,6 +25,7 @@
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
       "rules": {
+        "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-var-requires": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
         "unused-imports/no-unused-imports": "error",

diff --git a/README.md b/README.md
@@ -91,18 +91,18 @@ 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    |
-| ^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    |
+| 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 [email protected] or higher, you can stick to [email protected].
 

diff --git a/e2e/qwik-nx-e2e/project.json b/e2e/qwik-nx-e2e/project.json
@@ -14,10 +14,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["e2e/qwik-nx-e2e/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/jest.preset.js b/jest.preset.js
@@ -12,4 +12,5 @@ module.exports = {
    * More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
    */
   snapshotFormat: { escapeString: true, printBasicPrototype: true },
+  testTimeout: 10000,
 };
diff --git a/nx.json b/nx.json
@@ -18,16 +18,25 @@
     "version": {
       "dependsOn": ["build"]
     },
-    "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+    "e2e": {
       "cache": true
     },
-    "test": {
-      "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
+    "@nx/eslint:lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
       "cache": true
     },
-    "e2e": {
-      "cache": true
+    "@nx/jest:jest": {
+      "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
+      "cache": true,
+      "options": {
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
     }
   },
   "workspaceLayout": {

diff --git a/package.json b/package.json
@@ -19,41 +19,41 @@
     "pnpm": "^8.0.0"
   },
   "devDependencies": {
-    "@builder.io/qwik": "^1.2.12",
+    "@builder.io/qwik": "~1.4.4",
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-angular": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
     "@jscutlery/semver": "^4.0.0",
-    "@nx/cypress": "17.0.3",
-    "@nx/devkit": "17.0.3",
-    "@nx/eslint": "17.0.3",
-    "@nx/eslint-plugin": "17.0.3",
-    "@nx/jest": "17.0.3",
-    "@nx/js": "17.0.3",
-    "@nx/playwright": "17.0.3",
-    "@nx/plugin": "17.0.3",
-    "@nx/storybook": "17.0.3",
-    "@nx/vite": "17.0.3",
-    "@nx/workspace": "17.0.3",
+    "@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",
     "@swc/core": "^1.3.95",
     "@types/fs-extra": "11.0.1",
     "@types/jest": "29.4.0",
-    "@types/node": "16.11.7",
+    "@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": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
     "all-contributors-cli": "^6.24.0",
     "chalk": "^4.1.0",
     "commitizen": "^4.2.5",
     "commitlint": "^17.3.0",
     "create-nx-workspace": "17.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "enquirer": "2.3.6",
-    "eslint": "8.46.0",
+    "eslint": "8.48.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.1.0",
     "kill-port": "2.0.1",
     "ngx-deploy-npm": "^6.0.0",
-    "nx": "17.0.3",
+    "nx": "17.3.0",
     "prettier": "^2.8.0",
     "pretty-quick": "^3.1.3",
     "semver": "7.6.0",
@@ -76,7 +76,7 @@
     "ts-node": "10.9.1",
     "typescript": "4.9.5",
     "verdaccio": "5.21.1",
-    "vite": "~4.4.11",
+    "vite": "~5.0.0",
     "yargs": "17.7.1"
   },
   "dependencies": {

diff --git a/packages/add-nx-to-qwik/project.json b/packages/add-nx-to-qwik/project.json
@@ -5,17 +5,13 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": ["packages/add-nx-to-qwik/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/packages/add-nx-to-qwik"],
       "options": {
-        "jestConfig": "packages/add-nx-to-qwik/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "packages/add-nx-to-qwik/jest.config.ts"
       }
     },
     "build-base": {

diff --git a/packages/add-nx-to-qwik/src/add-nx-to-qwik.ts b/packages/add-nx-to-qwik/src/add-nx-to-qwik.ts
@@ -202,7 +202,7 @@ function createNxJsonFile(
   repoRoot: string,
   targetDefaults: string[],
   cacheableOperations: string[],
-  scriptOutputs: { [name: string]: string }
+  scriptOutputs: Record<string, string>
 ) {
   const nxJsonPath = joinPathFragments(repoRoot, 'nx.json');
   let nxJson = {} as any;

diff --git a/packages/create-qwik-nx/project.json b/packages/create-qwik-nx/project.json
@@ -49,17 +49,6 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": [
-          "packages/create-qwik-nx/**/*.ts",
-          "packages/create-qwik-nx/**/*.spec.ts",
-          "packages/create-qwik-nx/**/*_spec.ts",
-          "packages/create-qwik-nx/**/*.spec.tsx",
-          "packages/create-qwik-nx/**/*.spec.js",
-          "packages/create-qwik-nx/**/*.spec.jsx",
-          "packages/create-qwik-nx/**/*.d.ts"
-        ]
-      },
       "outputs": ["{options.outputFile}"]
     },
     "version": {

diff --git a/packages/qwik-nx/project.json b/packages/qwik-nx/project.json
@@ -48,23 +48,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/qwik-nx/**/*.ts",
-          "packages/qwik-nx/generators.json",
-          "packages/qwik-nx/executors.json",
-          "packages/qwik-nx/package.json",
-          "packages/qwik-nx/migrations.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/qwik-nx/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "packages/qwik-nx/jest.config.ts"
       }
     },
     "version": {

diff --git a/packages/qwik-nx/src/generators/application/generator-internal.ts b/packages/qwik-nx/src/generators/application/generator-internal.ts
@@ -66,11 +66,16 @@ export async function appGeneratorInternal(
 
   addFiles(tree, normalizedOptions);
 
+  // TODO: keeping them for compatibility with nx <17.3.0
+  const deprecatedOptions = {
+    includeLib: false,
+    uiFramework: 'none',
+    testEnvironment: 'node',
+  };
   tasks.push(
     await initGenerator(tree, {
-      includeLib: false,
-      uiFramework: 'none',
-      testEnvironment: 'node',
+      ...deprecatedOptions,
+      keepExistingVersions: true,
     })
   );
 

diff --git a/packages/qwik-nx/src/generators/component/utils/normalize-options.ts b/packages/qwik-nx/src/generators/component/utils/normalize-options.ts
@@ -7,12 +7,15 @@ import {
 import { normalizePath } from 'vite';
 import { ComponentGeneratorSchema, NormalizedSchema } from '../schema';
 
-type GenerationPaths = {
+interface GenerationPaths {
   directory: string;
   name: string;
-};
+}
 
-type NameInfo = { name: string; path: string };
+interface NameInfo {
+  name: string;
+  path: string;
+}
 
 function parseNameWithPath(rawName: string): NameInfo {
   const parsedName = normalizePath(rawName).split('/');

diff --git a/...es/qwik-nx/src/generators/integrations/react-library/__snapshots__/generator.spec.ts.snap b/...es/qwik-nx/src/generators/integrations/react-library/__snapshots__/generator.spec.ts.snap
@@ -16,9 +16,6 @@ Object {
           "libs/shared/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -50,9 +47,6 @@ Object {
           "packages/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -84,9 +78,6 @@ Object {
           "packages/shared/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -118,9 +109,6 @@ Object {
           "libs/shared/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -152,9 +140,6 @@ Object {
           "libs/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -186,9 +171,6 @@ Object {
           "libs/shared/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -220,9 +202,6 @@ Object {
           "libs/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",
@@ -364,9 +343,6 @@ Object {
           "libs/mylib/**/*.{ts,tsx,js,jsx}",
         ],
       },
-      "outputs": Array [
-        "{options.outputFile}",
-      ],
     },
     "test": Object {
       "executor": "@nx/vite:test",