fix: support and migrate to Nx 23 (#2393)

brandonroberts · web-flow · commit b4e9140706ba · 2026-06-28T18:20:09.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -76,4 +76,5 @@ vitest.config.*.timestamp*
 .claude/worktrees
 .claude/settings.local.json
 .nx/polygraph
-.nx/self-healing
+.nx/self-healing
+.nx/migrate-runs
diff --git a/libs/my-package/vite.config.ts b/libs/my-package/vite.config.ts
@@ -24,7 +24,7 @@ export default defineConfig(({ mode }) => ({
       fileName: `fesm2022/my-package`,
       formats: ['es' as const],
     },
-    rollupOptions: {
+    rolldownOptions: {
       external: [/^@angular\/.*/, 'rxjs', 'rxjs/operators'],
       output: {
         preserveModules: false,
diff --git a/package.json b/package.json
@@ -59,8 +59,8 @@
     "@astrojs/react": "^5.0.0",
     "@babel/core": "^7.29.0",
     "@mdx-js/react": "3.1.1",
-    "@nx/angular": "22.7.5",
-    "@nx/devkit": "22.7.5",
+    "@nx/angular": "23.0.1",
+    "@nx/devkit": "23.0.1",
     "@trpc/client": "^10.45.2",
     "@trpc/server": "^10.45.2",
     "ajv-formats": "^3.0.1",
@@ -107,16 +107,16 @@
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^10.0.1",
     "@netlify/functions": "^2.8.2",
-    "@nx/cypress": "22.7.5",
-    "@nx/eslint": "22.7.5",
-    "@nx/eslint-plugin": "22.7.5",
-    "@nx/js": "22.7.5",
-    "@nx/playwright": "22.7.5",
-    "@nx/plugin": "22.7.5",
-    "@nx/storybook": "22.7.5",
-    "@nx/vite": "22.7.5",
-    "@nx/vitest": "22.7.5",
-    "@nx/web": "22.7.5",
+    "@nx/cypress": "23.0.1",
+    "@nx/eslint": "23.0.1",
+    "@nx/eslint-plugin": "23.0.1",
+    "@nx/js": "23.0.1",
+    "@nx/playwright": "23.0.1",
+    "@nx/plugin": "23.0.1",
+    "@nx/storybook": "23.0.1",
+    "@nx/vite": "23.0.1",
+    "@nx/vitest": "23.0.1",
+    "@nx/web": "23.0.1",
     "@oxc-angular/vite": "^0.0.15",
     "@oxc-project/runtime": "^0.117.0",
     "@playwright/test": "^1.58.2",
@@ -153,7 +153,7 @@
     "conventional-changelog": "^7.2.0",
     "conventional-changelog-cli": "^5.0.0",
     "cpy-cli": "^7.0.0",
-    "cypress": "15.11.0",
+    "cypress": "15.18.0",
     "esbuild": "0.27.3",
     "eslint": "^10.0.3",
     "eslint-config-prettier": "10.1.8",
@@ -166,7 +166,7 @@
     "find-up": "^8.0.0",
     "fs-extra": "^11.3.4",
     "h3": "^1.13.0",
-    "happy-dom": "^20.8.3",
+    "happy-dom": "20.10.6",
     "jiti": "2.6.1",
     "jsdom": "28.1.0",
     "jsonc-eslint-parser": "^3.1.0",
@@ -177,7 +177,7 @@
     "minimist": "^1.2.8",
     "ng-packagr": "^22.0.0",
     "nitropack": "^2.13.1",
-    "nx": "22.7.5",
+    "nx": "23.0.1",
     "playwright": "^1.58.2",
     "postcss": "^8.5.8",
     "postcss-import": "~16.1.1",
diff --git a/packages/content-plugin/package.json b/packages/content-plugin/package.json
@@ -8,7 +8,7 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
+    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/content/package.json b/packages/content/package.json
@@ -27,7 +27,7 @@
     "@angular/core": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0",
     "@angular/platform-browser": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0",
     "@angular/router": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0",
-    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
+    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
     "front-matter": "^4.0.2",
     "marked": "^15.0.7",
     "marked-gfm-heading-id": "^4.1.1",
diff --git a/packages/nx-plugin/src/executors/vitest/vitest.impl.ts b/packages/nx-plugin/src/executors/vitest/vitest.impl.ts
@@ -1,3 +1,3 @@
-import { vitestExecutor } from '@nx/vite/executors';
+import { vitestExecutor } from '@nx/vitest/executors';
 
 export default vitestExecutor;
diff --git a/packages/nx-plugin/src/generators/app/generator.spec.ts b/packages/nx-plugin/src/generators/app/generator.spec.ts
@@ -10,7 +10,7 @@ import { lt } from 'semver';
 
 import generator from './generator';
 import { AnalogNxApplicationGeneratorOptions } from './schema';
-import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver';
+import { checkAndCleanWithSemver } from '@nx/devkit/internal';
 
 describe('nx-plugin generator', () => {
   const setup = async (
diff --git a/packages/nx-plugin/src/generators/app/lib/add-angular-app.ts b/packages/nx-plugin/src/generators/app/lib/add-angular-app.ts
@@ -1,23 +1,31 @@
 import { getWorkspaceLayout, Tree } from '@nx/devkit';
+// `@nx/angular` exposes its generators only through its `exports` map, which
+// this project's classic `node` module resolution does not consult. Reference
+// the built declaration directly so the type resolves; the runtime entry is
+// imported below via `@nx/angular/generators`.
+import type { applicationGenerator } from '@nx/angular/dist/generators';
 import { NormalizedOptions } from '../generator';
 
 export async function addAngularApp(tree: Tree, options: NormalizedOptions) {
   const isNx = tree.exists('/nx.json');
   const appsDir = isNx ? getWorkspaceLayout(tree).appsDir : 'projects';
 
-  const appOptions: typeof import('@nx/angular/src/generators/application/schema') =
-    {
-      name: options.analogAppName,
-      directory: `${appsDir}/${options.analogAppName}`,
-      linter: !isNx || process.env['NODE_ENV'] === 'test' ? 'none' : 'eslint',
-      unitTestRunner: 'vitest',
-      standalone: true,
-      ssr: false,
-      bundler: 'esbuild',
-      serverRouting: false,
-      skipFormat: true,
-      tags: options.tags,
-    };
+  type ApplicationSchema = Parameters<typeof applicationGenerator>[1];
+  const appOptions: ApplicationSchema = {
+    name: options.analogAppName,
+    directory: `${appsDir}/${options.analogAppName}`,
+    linter: !isNx || process.env['NODE_ENV'] === 'test' ? 'none' : 'eslint',
+    // Analog sets up its own Vitest configuration in the init generator, so the
+    // Angular generator should not scaffold a test runner. Nx 23 also removed
+    // the `'vitest'` option in favour of `'vitest-angular'`/`'vitest-analog'`.
+    unitTestRunner: 'none' as ApplicationSchema['unitTestRunner'],
+    standalone: true,
+    ssr: false,
+    bundler: 'esbuild',
+    serverRouting: false,
+    skipFormat: true,
+    tags: options.tags,
+  };
 
   await (
     await import(
diff --git a/packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts b/packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts
@@ -1,4 +1,4 @@
-import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver';
+import { checkAndCleanWithSemver } from '@nx/devkit/internal';
 import { getTailwindDependencies } from '../versions/tailwind-dependencies';
 import { lt } from 'semver';
 import {
diff --git a/packages/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap b/packages/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap
@@ -30,13 +30,14 @@ exports[`preset generator > should match project.json 1`] = `
   "targets": {
     "build": {
       "executor": "@analogjs/platform:vite",
+      "defaultConfiguration": "production",
+      "outputs": ["{workspaceRoot}/dist/apps/my-app"],
       "options": {
         "configFile": "my-app/vite.config.ts",
         "main": "my-app/src/main.ts",
         "outputPath": "dist/my-app/client",
         "tsConfig": "my-app/tsconfig.app.json"
       },
-      "defaultConfiguration": "production",
       "configurations": {
         "development": {
           "mode": "development"
@@ -45,8 +46,7 @@ exports[`preset generator > should match project.json 1`] = `
           "sourcemap": false,
           "mode": "production"
         }
-      },
-      "outputs": ["{workspaceRoot}/dist/apps/my-app"]
+      }
     },
     "serve": {
       "executor": "@analogjs/platform:vite-dev-server",
diff --git a/packages/nx-plugin/src/generators/preset/generator.spec.ts b/packages/nx-plugin/src/generators/preset/generator.spec.ts
@@ -64,4 +64,12 @@ describe('preset generator', () => {
 
     expect(packageJson['devDependencies']['vitest']).toBe('^3.0.0');
   });
+
+  it('should use @nx/vite 23 for Nx >= 23.0.0', async () => {
+    const { tree } = await setup({ analogAppName: 'my-app' }, '23.0.1');
+
+    const packageJson = JSON.parse(tree.read('/package.json').toString());
+
+    expect(packageJson['devDependencies']['@nx/vite']).toBe('^23.0.0');
+  });
 });
diff --git a/packages/nx-plugin/src/utils/versions/dev-dependencies.ts b/packages/nx-plugin/src/utils/versions/dev-dependencies.ts
@@ -29,6 +29,7 @@ import {
   V19_X_VITE,
   NX_X_LATEST_VITE,
   NX_X_LATEST_VITEST,
+  NX_X_LATEST_NX,
 } from './ng_19_X/versions';
 
 const devDependencyKeys = [
@@ -104,7 +105,10 @@ const getDevDependencies = (
     '@analogjs/platform': V19_X_ANALOG_JS_PLATFORM,
     '@analogjs/vite-plugin-angular': V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR,
     '@analogjs/vitest-angular': V19_X_ANALOG_JS_VITEST_ANGULAR,
-    '@nx/vite': V19_X_NX_VITE,
+    '@nx/vite':
+      escapedNxVersion && !lt(escapedNxVersion, '23.0.0')
+        ? NX_X_LATEST_NX
+        : V19_X_NX_VITE,
     jsdom: V19_X_JSDOM,
     'vite-tsconfig-paths': V19_X_VITE_TSCONFIG_PATHS,
     vite:
diff --git a/packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts b/packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts
@@ -19,3 +19,4 @@ export const V19_X_VITEST = '^3.0.0';
 export const V19_X_VITE = '^5.0.0';
 export const NX_X_LATEST_VITE = '^7.0.0';
 export const NX_X_LATEST_VITEST = '^4.0.0';
+export const NX_X_LATEST_NX = '^23.0.0';
diff --git a/packages/platform/package.json b/packages/platform/package.json
@@ -34,9 +34,9 @@
     "vitefu": "^1.1.2"
   },
   "peerDependencies": {
-    "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
-    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
-    "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^22",
+    "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
+    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
+    "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
     "marked": "^15.0.12",
     "marked-gfm-heading-id": "^4.1.3",
     "marked-highlight": "^2.2.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-import { vitestExecutor } from '@nx/vite/executors';`
	`1`	`+import { vitestExecutor } from '@nx/vitest/executors';`
`2`	`2`
`3`	`3`	`export default vitestExecutor;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { checkAndCleanWithSemver } from '@nx/devkit/src/utils/semver';`
	`1`	`+import { checkAndCleanWithSemver } from '@nx/devkit/internal';`
`2`	`2`	`import { getTailwindDependencies } from '../versions/tailwind-dependencies';`
`3`	`3`	`import { lt } from 'semver';`
`4`	`4`	`import {`