@nx/vite 23.1.0-pr.36127.e594f53 → 23.1.0-rc.0

package/dist/plugins/nx-tsconfig-paths.plugin.d.ts

@@ -24,6 +24,16 @@ export interface nxViteTsPathsOptions {
      * @default true
      */
     buildLibsFromSource?: boolean;
+    /**
+     * The target to use for building the library dependencies.
+     * @default 'build'
+     */
+    buildTarget?: string;
+    /**
+     * The target to use for testing the library.
+     * @default 'test'
+     */
+    testTarget?: string;
 }
 /**
  * @deprecated Will be removed in Nx v24. Replace with `tsconfigPaths()` from

package/dist/plugins/nx-tsconfig-paths.plugin.js

@@ -40,6 +40,8 @@ function nxViteTsPaths(options = {}) {
         '.less',
     ];
     options.mainFields ??= [['exports', '.', 'import'], 'module', 'main'];
+    options.buildTarget ??= 'build';
+    options.testTarget ??= 'test';
     options.buildLibsFromSource ??= true;
     let projectRoot = '';
     let projectRootFromWorkspaceRoot;
@@ -63,8 +65,8 @@ function nxViteTsPaths(options = {}) {
                 // When using incremental building and the serve target is called
                 // we need to get the deps for the 'build' target instead.
                 const depsBuildTarget = process.env.NX_TASK_TARGET_TARGET === 'serve' ||
-                    process.env.NX_TASK_TARGET_TARGET === 'test'
-                    ? 'build'
+                    process.env.NX_TASK_TARGET_TARGET === options.testTarget
+                    ? options.buildTarget
                     : process.env.NX_TASK_TARGET_TARGET;
                 const { dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, process.env.NX_TASK_TARGET_PROJECT, depsBuildTarget, process.env.NX_TASK_TARGET_CONFIGURATION);
                 if (process.env.NX_GENERATED_TSCONFIG_PATH) {
@@ -77,14 +79,14 @@ function nxViteTsPaths(options = {}) {
                     // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
                     foundTsConfigPath = (0, internal_1.createTmpTsConfig)(foundTsConfigPath, devkit_1.workspaceRoot, (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot), dependencies, true);
                     process.env.NX_GENERATED_TSCONFIG_PATH = foundTsConfigPath;
-                }
-                if (config.command === 'serve') {
-                    const buildableLibraryDependencies = dependencies
-                        .filter((dep) => dep.node.type === 'lib')
-                        .map((dep) => dep.node.name)
-                        .join(',');
-                    const buildCommand = `npx nx run-many --target=${depsBuildTarget} --projects=${buildableLibraryDependencies}`;
-                    config.plugins.push((0, nx_vite_build_coordination_plugin_1.nxViteBuildCoordinationPlugin)({ buildCommand }));
+                    if (config.command === 'serve') {
+                        const buildableLibraryDependencies = dependencies
+                            .filter((dep) => dep.node.type === 'lib')
+                            .map((dep) => dep.node.name)
+                            .join(',');
+                        const buildCommand = `${(0, devkit_1.getPackageManagerCommand)().exec} nx run-many --target=${depsBuildTarget} --projects=${buildableLibraryDependencies}`;
+                        config.plugins.push((0, nx_vite_build_coordination_plugin_1.nxViteBuildCoordinationPlugin)({ buildCommand }));
+                    }
                 }
             }
             const parsed = (0, tsconfig_paths_1.loadConfig)(foundTsConfigPath);
@@ -184,15 +186,20 @@ function nxViteTsPaths(options = {}) {
             const normalizedImport = alias.replace(/\/\*$/, '');
             if (importPath === normalizedImport ||
                 importPath.startsWith(normalizedImport + '/')) {
-                const joinedPath = (0, devkit_1.joinPathFragments)(tsconfig.absoluteBaseUrl, paths[0].replace(/\/\*$/, ''));
-                resolvedFile = (0, nx_tsconfig_paths_find_file_1.findFile)(importPath.replace(normalizedImport, joinedPath), options.extensions);
-                if (resolvedFile === undefined &&
-                    options.extensions.some((ext) => importPath.endsWith(ext))) {
-                    const foundExtension = options.extensions.find((ext) => importPath.endsWith(ext));
-                    const pathWithoutExtension = importPath
-                        .replace(normalizedImport, joinedPath)
-                        .slice(0, -foundExtension.length);
-                    resolvedFile = (0, nx_tsconfig_paths_find_file_1.findFile)(pathWithoutExtension, options.extensions);
+                for (const path of paths) {
+                    const joinedPath = (0, devkit_1.joinPathFragments)(tsconfig.absoluteBaseUrl, path.replace(/\/\*$/, ''));
+                    resolvedFile = (0, nx_tsconfig_paths_find_file_1.findFile)(importPath.replace(normalizedImport, joinedPath), options.extensions);
+                    if (resolvedFile === undefined &&
+                        options.extensions.some((ext) => importPath.endsWith(ext))) {
+                        const foundExtension = options.extensions.find((ext) => importPath.endsWith(ext));
+                        const pathWithoutExtension = importPath
+                            .replace(normalizedImport, joinedPath)
+                            .slice(0, -foundExtension.length);
+                        resolvedFile = (0, nx_tsconfig_paths_find_file_1.findFile)(pathWithoutExtension, options.extensions);
+                    }
+                    if (resolvedFile !== undefined) {
+                        return resolvedFile;
+                    }
                 }
             }
         }

package/dist/plugins/nx-vite-build-coordination.plugin.js

@@ -9,24 +9,44 @@ function nxViteBuildCoordinationPlugin(options) {
     let activeBuildProcess;
     let unregisterFileWatcher;
     async function buildChangedProjects() {
-        await new Promise((res) => {
-            activeBuildProcess = (0, child_process_1.exec)(options.buildCommand, {
-                windowsHide: true,
-            });
-            activeBuildProcess.stdout.pipe(process.stdout);
-            activeBuildProcess.stderr.pipe(process.stderr);
-            activeBuildProcess.on('exit', () => {
-                res();
-            });
-            activeBuildProcess.on('error', () => {
-                res();
-            });
+        const buildProcess = (0, child_process_1.exec)(options.buildCommand, {
+            windowsHide: true,
         });
-        activeBuildProcess = undefined;
+        activeBuildProcess = buildProcess;
+        try {
+            await new Promise((res, rej) => {
+                buildProcess.stdout.pipe(process.stdout);
+                buildProcess.stderr.pipe(process.stderr);
+                buildProcess.on('exit', (code, signal) => {
+                    // A build killed by the file watcher (new changes arrived) is not a failure.
+                    if (buildProcess.killed || signal || code === 0) {
+                        res();
+                    }
+                    else {
+                        rej(new Error(`Build failed with exit code ${code}`));
+                    }
+                });
+                buildProcess.on('error', (error) => {
+                    rej(error);
+                });
+            });
+        }
+        finally {
+            if (activeBuildProcess === buildProcess) {
+                activeBuildProcess = undefined;
+            }
+        }
     }
     function createFileWatcher() {
-        const runner = new watch_1.BatchFunctionRunner(() => buildChangedProjects());
-        return client_1.daemonClient.registerFileWatcher({ watchProjects: 'all' }, (err, { changedProjects, changedFiles }) => {
+        // Failed rebuilds in watch mode should not crash the dev server. Log and
+        // keep watching so the next file change can rebuild.
+        const runner = new watch_1.BatchFunctionRunner(() => buildChangedProjects().catch((error) => {
+            output_1.output.error({
+                title: 'Failed to rebuild projects. Fix the errors and save again.',
+                bodyLines: error?.message ? [error.message] : undefined,
+            });
+        }));
+        return client_1.daemonClient.registerFileWatcher({ watchProjects: 'all' }, (err, data) => {
             if (err === 'reconnecting') {
                 // Silent - daemon restarts automatically on lockfile changes
                 return;
@@ -50,7 +70,10 @@ function nxViteBuildCoordinationPlugin(options) {
                 activeBuildProcess.kill(2);
                 activeBuildProcess = undefined;
             }
-            runner.enqueue(changedProjects, changedFiles);
+            if (data) {
+                const { changedProjects, changedFiles } = data;
+                runner.enqueue(changedProjects, changedFiles);
+            }
         });
     }
     let firstBuildStart = true;

package/dist/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.js

@@ -120,6 +120,10 @@ function migrateTargetDefaults(tree) {
     }
     let hasChanges = false;
     for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (Array.isArray(targetConfig)) {
+            // This migration predates the filtered array value form; values are plain objects here.
+            continue;
+        }
         // Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
         if (targetOrExecutor === '@nx/vite:test') {
             // Move config to new executor key

package/dist/src/migrations/update-23-0-0/ensure-vitest-package-migration.js

@@ -110,6 +110,10 @@ function migrateTargetDefaults(tree) {
     }
     let hasChanges = false;
     for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (Array.isArray(targetConfig)) {
+            // This migration predates the filtered array value form; values are plain objects here.
+            continue;
+        }
         if (targetOrExecutor === '@nx/vite:test') {
             nxJson.targetDefaults['@nx/vitest:test'] ??= {};
             Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);

package/dist/src/utils/deprecation.d.ts

@@ -5,7 +5,7 @@ export declare function warnViteBuildExecutorDeprecation(): void;
 export declare function warnViteDevServerExecutorDeprecation(): void;
 export declare function warnVitePreviewServerExecutorDeprecation(): void;
 export declare function warnViteExecutorGenerating(): void;
-export declare const NX_VITE_TS_PATHS_DEPRECATION_MESSAGE = "The `nxViteTsPaths` plugin from `@nx/vite/plugins/nx-tsconfig-paths.plugin` is deprecated and will be removed in Nx v24. Replace it with `tsconfigPaths()` from the `vite-tsconfig-paths` package. See https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.";
-export declare const NX_COPY_ASSETS_PLUGIN_DEPRECATION_MESSAGE = "The `nxCopyAssetsPlugin` plugin from `@nx/vite/plugins/nx-copy-assets.plugin` is deprecated and will be removed in Nx v24. Use Vite's native `publicDir` option or the `vite-plugin-static-copy` package instead. See https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.";
+export declare const NX_VITE_TS_PATHS_DEPRECATION_MESSAGE = "The `nxViteTsPaths` plugin from `@nx/vite/plugins/nx-tsconfig-paths.plugin` is deprecated and will be removed in Nx v24. Replace it with `tsconfigPaths()` from the `vite-tsconfig-paths` package. See https://nx.dev/docs/technologies/build-tools/vite/guides/configure-vite for details.";
+export declare const NX_COPY_ASSETS_PLUGIN_DEPRECATION_MESSAGE = "The `nxCopyAssetsPlugin` plugin from `@nx/vite/plugins/nx-copy-assets.plugin` is deprecated and will be removed in Nx v24. Use Vite's native `publicDir` option or the `vite-plugin-static-copy` package instead. See https://nx.dev/docs/technologies/build-tools/vite/guides/configure-vite for details.";
 export declare function warnNxViteTsPathsDeprecation(): void;
 export declare function warnNxCopyAssetsPluginDeprecation(): void;

package/dist/src/utils/deprecation.js

@@ -36,8 +36,8 @@ function warnViteExecutorGenerating() {
 // tsconfig, so the community `vite-tsconfig-paths` package handles path
 // resolution end-to-end. Asset copying is covered by Vite's native
 // `publicDir` option or the `vite-plugin-static-copy` package.
-exports.NX_VITE_TS_PATHS_DEPRECATION_MESSAGE = 'The `nxViteTsPaths` plugin from `@nx/vite/plugins/nx-tsconfig-paths.plugin` is deprecated and will be removed in Nx v24. Replace it with `tsconfigPaths()` from the `vite-tsconfig-paths` package. See https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.';
-exports.NX_COPY_ASSETS_PLUGIN_DEPRECATION_MESSAGE = "The `nxCopyAssetsPlugin` plugin from `@nx/vite/plugins/nx-copy-assets.plugin` is deprecated and will be removed in Nx v24. Use Vite's native `publicDir` option or the `vite-plugin-static-copy` package instead. See https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.";
+exports.NX_VITE_TS_PATHS_DEPRECATION_MESSAGE = 'The `nxViteTsPaths` plugin from `@nx/vite/plugins/nx-tsconfig-paths.plugin` is deprecated and will be removed in Nx v24. Replace it with `tsconfigPaths()` from the `vite-tsconfig-paths` package. See https://nx.dev/docs/technologies/build-tools/vite/guides/configure-vite for details.';
+exports.NX_COPY_ASSETS_PLUGIN_DEPRECATION_MESSAGE = "The `nxCopyAssetsPlugin` plugin from `@nx/vite/plugins/nx-copy-assets.plugin` is deprecated and will be removed in Nx v24. Use Vite's native `publicDir` option or the `vite-plugin-static-copy` package instead. See https://nx.dev/docs/technologies/build-tools/vite/guides/configure-vite for details.";
 let nxViteTsPathsWarned = false;
 let nxCopyAssetsPluginWarned = false;
 // Warn-once per process so users don't see the message repeated on every

package/dist/src/utils/e2e-web-server-info-utils.js

@@ -7,13 +7,12 @@ const internal_1 = require("@nx/devkit/internal");
 async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
-    if ((nxJson.targetDefaults?.['dev'] &&
-        nxJson.targetDefaults?.['dev'].options?.port) ||
-        (nxJson.targetDefaults?.['serve'] &&
-            nxJson.targetDefaults?.['serve'].options?.port)) {
-        e2ePort =
-            nxJson.targetDefaults?.['dev'].options?.port ??
-                nxJson.targetDefaults?.['serve'].options?.port;
+    const devPort = (0, internal_1.readTargetDefaultsForTarget)('dev', nxJson.targetDefaults)
+        ?.options?.port;
+    const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
+        ?.options?.port;
+    if (devPort || servePort) {
+        e2ePort = devPort ?? servePort;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/vite/plugin',

package/dist/src/utils/executor-utils.js

@@ -17,6 +17,10 @@ async function validateTypes(opts) {
                 ? opts.tsconfig
                 : (0, path_1.join)(opts.workspaceRoot, opts.tsconfig),
             mode: 'noEmit',
+            // TS 6 defaults rootDir to the tsconfig dir, so from-source workspace
+            // libs (outside the project) trip TS6059. rootDir is emit-only and this
+            // is noEmit, so widen it to the workspace root to clear the false error.
+            rootDir: opts.workspaceRoot,
         });
         await (0, js_1.printDiagnostics)(result.errors, result.warnings);
         if (result.errors.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "23.1.0-pr.36127.e594f53",
+  "version": "23.1.0-rc.0",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -101,13 +101,13 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "ajv": "^8.0.0",
-    "@nx/devkit": "23.1.0-pr.36127.e594f53",
-    "@nx/js": "23.1.0-pr.36127.e594f53",
-    "@nx/vitest": "23.1.0-pr.36127.e594f53"
+    "@nx/devkit": "23.1.0-rc.0",
+    "@nx/vitest": "23.1.0-rc.0",
+    "@nx/js": "23.1.0-rc.0"
   },
   "devDependencies": {
-    "@nx/eslint": "23.1.0-pr.36127.e594f53",
-    "nx": "23.1.0-pr.36127.e594f53"
+    "@nx/eslint": "23.1.0-rc.0",
+    "nx": "23.1.0-rc.0"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"