@ng-native/nx 0.18.0 → 0.18.1

package/application/index.cjs

@@ -29,7 +29,7 @@ const {
   addDependenciesToPackageJson,
 } = require('@nx/devkit');
 const native = require('../native-app.cjs');
-const { init, workspaceNxVersion } = require('../init/index.cjs');
+const { init } = require('../init/index.cjs');
 const { usesWorkspaces, includeInWorkspaces } = require('./workspaces.cjs');
 const { asSaved } = require('../save-exact.cjs');
 const { registerSyncGenerator } = require('../sync/index.cjs');
@@ -268,12 +268,11 @@ async function application(tree, options) {
       true,
     );
   }
-  // `nxViteTsPaths()`, which the app's Vitest config uses to reach the workspace's libraries.
+  // `tsconfigPaths()`, which the app's Vitest config uses to reach the workspace's libraries.
   // Added now rather than only when present, because a library generated later is the ordinary
   // case and nothing would come back to add it then.
   if (hasPathAliases(tree, workspaces)) {
-    const vite = { '@nx/vite': workspaceNxVersion(tree) };
-    addDependenciesToPackageJson(tree, {}, vite, 'package.json', true);
+    addDependenciesToPackageJson(tree, {}, native.vitestPathsDependencies, 'package.json', true);
   }
   await writeFiles(tree, resolved);
   addProjectConfiguration(tree, projectName, {

package/library/index.cjs

@@ -328,10 +328,9 @@ async function library(tree, options) {
   });
 
   await addImports(tree, directory, angular ? {} : typecheckDependencies);
-  // `nxViteTsPaths()`, which the Vitest config uses to reach the workspace's other libraries.
+  // `tsconfigPaths()`, which the Vitest config uses to reach the workspace's other libraries.
   if (aliases) {
-    const vite = { '@nx/vite': workspaceNxVersion(tree) };
-    addDependenciesToPackageJson(tree, {}, vite, 'package.json', true);
+    addDependenciesToPackageJson(tree, {}, native.vitestPathsDependencies, 'package.json', true);
   }
 
   if (!options.skipFormat) await formatFiles(tree);

package/migrations.json

@@ -1,7 +1,7 @@
 {
   "generators": {
     "sync-app-versions": {
-      "version": "0.18.0",
+      "version": "0.18.1",
       "description": "Move the @ng-native packages each project's own package.json lists to the new version.",
       "implementation": "./migrations/run.cjs#sync-app-versions"
     },
@@ -44,6 +44,11 @@
       "version": "0.17.2",
       "description": "Keep what watchConditions returns in each app's entry point and stop it as the app is destroyed.",
       "implementation": "./migrations/run.cjs#stop-watching-conditions"
+    },
+    "vitest-tsconfig-paths": {
+      "version": "0.18.1",
+      "description": "Resolve the workspace's path aliases in Nx Vitest configs with vite-tsconfig-paths, as nxViteTsPaths does nothing from Nx 24.",
+      "implementation": "./migrations/run.cjs#vitest-tsconfig-paths"
     }
   }
 }

package/native-app.cjs

@@ -13,8 +13,9 @@
  *   import a library at all: Metro reports `Cannot resolve @org/ui`.
  * - `tsconfig.json` also extends the workspace's `tsconfig.base.json` when there is one, which is
  *   where those aliases live, and puts back the Expo settings the workspace's base overrides.
- * - `vitest.config.mts` adds `nxViteTsPaths` when the workspace has `@nx/vite`, for the same
- *   aliases, which Vitest does not read from tsconfig either.
+ * - `vitest.config.mts` adds `vite-tsconfig-paths` when the workspace has path aliases, for the
+ *   same aliases, which Vitest does not read from tsconfig either. It is what Nx 24 writes in its
+ *   own Vite configs: `nxViteTsPaths` from `@nx/vite` is an inert stub there.
  *
  * What does not depend on Nx, the dependencies, `app.json` and bundle identifier among them, is
  * `@ng-native/migrate/native-app.cjs`, which `@ng-native/schematics` builds its apps from too.
@@ -153,12 +154,22 @@ function vitestConfig(withPaths) {
   return template
     .replace(
       "import { defineConfig } from 'vitest/config';",
-      "import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n" +
+      "import tsconfigPaths from 'vite-tsconfig-paths';\n" +
         "import { defineConfig } from 'vitest/config';",
     )
-    .replace('plugins: [ngNative()],', 'plugins: [nxViteTsPaths(), ngNative()],');
+    .replace('plugins: [ngNative()],', 'plugins: [tsconfigPaths(), ngNative()],');
 }
 
+/**
+ * What `vitestConfig(true)` imports, at the range Nx 24 adds for its own Vite configs, and Vite at
+ * the range `@ng-native/testing` peers on. Both peer on Vite optionally, so npm installs it for
+ * neither, and an integrated workspace from the `angular-monorepo` preset may have none at its root.
+ */
+const vitestPathsDependencies = {
+  'vite-tsconfig-paths': '^5.1.4',
+  vite: '^6.0.0 || ^7.0.0 || ^8.0.0',
+};
+
 /**
  * The ranges a workspace package's `package.json` lists: the root's own where everything it can
  * resolve to is a version Angular Native accepts, so that pnpm does not install a second Vitest
@@ -195,6 +206,7 @@ module.exports = {
   tsconfig,
   typecheckTsconfig,
   vitestConfig,
+  vitestPathsDependencies,
   reuseRootRanges,
   expoCompanions,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-native/nx",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Nx generators for Angular Native: nx add, an Expo app project whose targets run it, and native libraries and components.",
   "keywords": [
     "angular",
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@ng-native/migrate": "0.18.0",
+    "@ng-native/migrate": "0.18.1",
     "@nx/devkit": "^23.0.0 || ^24.0.0",
     "minimatch": "^10.0.0",
     "semver": "^7.7.0"