@nx/vite 23.0.0-pr.35465.2bc2643 → 23.0.0-rc.1

package/dist/PLUGIN.md

@@ -0,0 +1,33 @@
+# Vite with Vitest
+
+After making changes to a project, run the relevant test file to verify your changes work correctly.
+
+## Mode Detection
+
+Check in order (first match wins):
+
+| Mode      | Detection                                                  |
+| --------- | ---------------------------------------------------------- |
+| Inference | `@nx/vitest` or `@nx/vite/plugin` in nx.json plugins array |
+| Executor  | `@nx/vitest:test` executor in project.json targets         |
+
+## Run Specific Test File
+
+### Inference
+
+```bash
+nx test <project> -- <path/to/file.spec.ts>
+```
+
+### Executor
+
+```bash
+nx run <project>:test --testFile=<path/to/file.spec.ts>
+```
+
+## Quick Reference
+
+| Task        | Inference                           | Executor                                        |
+| ----------- | ----------------------------------- | ----------------------------------------------- |
+| Run file    | `nx test proj -- path/file.spec.ts` | `nx run proj:test --testFile=path/file.spec.ts` |
+| Run pattern | `nx test proj -- -t "pattern"`      | `nx run proj:test --testNamePattern="pattern"`  |

package/{executors.d.ts → dist/executors.d.ts}

@@ -4,6 +4,3 @@ export { type ViteDevServerExecutorOptions } from './src/executors/dev-server/sc
 export { viteDevServerExecutor } from './src/executors/dev-server/dev-server.impl';
 export { type VitePreviewServerExecutorOptions } from './src/executors/preview-server/schema';
 export { vitePreviewServerExecutor } from './src/executors/preview-server/preview-server.impl';
-export { type VitestExecutorOptions } from './src/executors/test/schema';
-export { vitestExecutor } from './src/executors/test/vitest.impl';
-//# sourceMappingURL=executors.d.ts.map

package/{executors.js → dist/executors.js}

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vitestExecutor = exports.vitePreviewServerExecutor = exports.viteDevServerExecutor = exports.viteBuildExecutor = void 0;
+exports.vitePreviewServerExecutor = exports.viteDevServerExecutor = exports.viteBuildExecutor = void 0;
 var build_impl_1 = require("./src/executors/build/build.impl");
 Object.defineProperty(exports, "viteBuildExecutor", { enumerable: true, get: function () { return build_impl_1.viteBuildExecutor; } });
 var dev_server_impl_1 = require("./src/executors/dev-server/dev-server.impl");
 Object.defineProperty(exports, "viteDevServerExecutor", { enumerable: true, get: function () { return dev_server_impl_1.viteDevServerExecutor; } });
 var preview_server_impl_1 = require("./src/executors/preview-server/preview-server.impl");
 Object.defineProperty(exports, "vitePreviewServerExecutor", { enumerable: true, get: function () { return preview_server_impl_1.vitePreviewServerExecutor; } });
-var vitest_impl_1 = require("./src/executors/test/vitest.impl");
-Object.defineProperty(exports, "vitestExecutor", { enumerable: true, get: function () { return vitest_impl_1.vitestExecutor; } });

package/{index.d.ts → dist/index.d.ts}

@@ -3,8 +3,5 @@ export * from './src/utils/generator-utils';
 export * from './src/utils/e2e-web-server-info-utils';
 export { type ViteConfigurationGeneratorSchema } from './src/generators/configuration/schema';
 export { viteConfigurationGenerator } from './src/generators/configuration/configuration';
-export { type VitestGeneratorSchema } from './src/generators/vitest/schema';
-export { vitestGenerator } from './src/generators/vitest/vitest-generator';
 export { type InitGeneratorSchema } from './src/generators/init/schema';
 export { initGenerator } from './src/generators/init/init';
-//# sourceMappingURL=index.d.ts.map

package/{index.js → dist/index.js}

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initGenerator = exports.vitestGenerator = exports.viteConfigurationGenerator = void 0;
+exports.initGenerator = exports.viteConfigurationGenerator = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/utils/versions"), exports);
 tslib_1.__exportStar(require("./src/utils/generator-utils"), exports);
 tslib_1.__exportStar(require("./src/utils/e2e-web-server-info-utils"), exports);
 var configuration_1 = require("./src/generators/configuration/configuration");
 Object.defineProperty(exports, "viteConfigurationGenerator", { enumerable: true, get: function () { return configuration_1.viteConfigurationGenerator; } });
-var vitest_generator_1 = require("./src/generators/vitest/vitest-generator");
-Object.defineProperty(exports, "vitestGenerator", { enumerable: true, get: function () { return vitest_generator_1.vitestGenerator; } });
 var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "initGenerator", { enumerable: true, get: function () { return init_1.initGenerator; } });

package/{plugin.d.ts → dist/plugin.d.ts}

@@ -1,2 +1 @@
 export { createNodes, createNodesV2, VitePluginOptions, createDependencies, } from './src/plugins/plugin';
-//# sourceMappingURL=plugin.d.ts.map

package/dist/plugins/nx-copy-assets.plugin.d.ts

@@ -0,0 +1,9 @@
+import type { Plugin } from 'vite';
+import { AssetGlob } from '@nx/js/internal';
+/**
+ * @deprecated Will be removed in Nx v24. Use Vite's native `publicDir` option
+ * for static assets, or the `vite-plugin-static-copy` package for anything
+ * that needs glob-based copying. See
+ * https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.
+ */
+export declare function nxCopyAssetsPlugin(_assets: (string | AssetGlob)[]): Plugin;

package/{plugins → dist/plugins}/nx-copy-assets.plugin.js

@@ -3,8 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxCopyAssetsPlugin = nxCopyAssetsPlugin;
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
-const copy_assets_handler_1 = require("@nx/js/src/utils/assets/copy-assets-handler");
+const internal_1 = require("@nx/js/internal");
+const deprecation_1 = require("../src/utils/deprecation");
+/**
+ * @deprecated Will be removed in Nx v24. Use Vite's native `publicDir` option
+ * for static assets, or the `vite-plugin-static-copy` package for anything
+ * that needs glob-based copying. See
+ * https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.
+ */
 function nxCopyAssetsPlugin(_assets) {
+    (0, deprecation_1.warnNxCopyAssetsPluginDeprecation)();
     let config;
     let handler;
     let dispose;
@@ -28,7 +36,7 @@ function nxCopyAssetsPlugin(_assets) {
                     };
                 }
             });
-            handler = new copy_assets_handler_1.CopyAssetsHandler({
+            handler = new internal_1.CopyAssetsHandler({
                 rootDir: devkit_1.workspaceRoot,
                 projectDir: config.root,
                 outputDir: config.build.outDir.startsWith(config.root)

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

@@ -25,5 +25,11 @@ export interface nxViteTsPathsOptions {
      */
     buildLibsFromSource?: boolean;
 }
+/**
+ * @deprecated Will be removed in Nx v24. Replace with `tsconfigPaths()` from
+ * the `vite-tsconfig-paths` package. The inferred `@nx/vite/plugin` already
+ * ensures projects extend the workspace base tsconfig, so the community
+ * plugin handles monorepo path resolution end-to-end. See
+ * https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.
+ */
 export declare function nxViteTsPaths(options?: nxViteTsPathsOptions): Plugin;
-//# sourceMappingURL=nx-tsconfig-paths.plugin.d.ts.map

package/{plugins → dist/plugins}/nx-tsconfig-paths.plugin.js

@@ -2,16 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxViteTsPaths = nxViteTsPaths;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
+const js_1 = require("@nx/js");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const tsconfig_paths_1 = require("tsconfig-paths");
+const deprecation_1 = require("../src/utils/deprecation");
 const nx_tsconfig_paths_find_file_1 = require("../src/utils/nx-tsconfig-paths-find-file");
 const options_utils_1 = require("../src/utils/options-utils");
 const nx_vite_build_coordination_plugin_1 = require("./nx-vite-build-coordination.plugin");
+/**
+ * @deprecated Will be removed in Nx v24. Replace with `tsconfigPaths()` from
+ * the `vite-tsconfig-paths` package. The inferred `@nx/vite/plugin` already
+ * ensures projects extend the workspace base tsconfig, so the community
+ * plugin handles monorepo path resolution end-to-end. See
+ * https://nx.dev/docs/technologies/build-tools/vite/configure-vite for details.
+ */
 function nxViteTsPaths(options = {}) {
+    (0, deprecation_1.warnNxViteTsPathsDeprecation)();
     let foundTsConfigPath;
     let matchTsPathEsm;
     let matchTsPathFallback;
@@ -58,7 +66,7 @@ function nxViteTsPaths(options = {}) {
                     process.env.NX_TASK_TARGET_TARGET === 'test'
                     ? 'build'
                     : process.env.NX_TASK_TARGET_TARGET;
-                const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, process.env.NX_TASK_TARGET_PROJECT, depsBuildTarget, process.env.NX_TASK_TARGET_CONFIGURATION);
+                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) {
                     // This is needed for vitest browser mode because it runs two vite dev servers
                     // so we want to reuse the same tsconfig file for both servers
@@ -67,7 +75,7 @@ function nxViteTsPaths(options = {}) {
                 else {
                     // This tsconfig is used via the Vite ts paths plugin.
                     // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
-                    foundTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(foundTsConfigPath, devkit_1.workspaceRoot, (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot), dependencies, true);
+                    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') {
@@ -85,13 +93,13 @@ function nxViteTsPaths(options = {}) {
                 throw new Error(`Failed loading tsconfig at ${foundTsConfigPath}`);
             }
             tsConfigPathsEsm = parsed;
-            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0, ts_config_1.resolvePathsBaseUrl)(foundTsConfigPath), parsed.paths, options.mainFields);
+            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0, js_1.resolvePathsBaseUrl)(foundTsConfigPath), parsed.paths, options.mainFields);
             const rootLevelTsConfig = getTsConfig((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json'));
             const rootLevelParsed = (0, tsconfig_paths_1.loadConfig)(rootLevelTsConfig);
             logIt('fallback parsed tsconfig: ', rootLevelParsed);
             if (rootLevelParsed.resultType === 'success') {
                 tsConfigPathsFallback = rootLevelParsed;
-                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0, ts_config_1.resolvePathsBaseUrl)(rootLevelTsConfig), rootLevelParsed.paths, ['main', 'module']);
+                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0, js_1.resolvePathsBaseUrl)(rootLevelTsConfig), rootLevelParsed.paths, ['main', 'module']);
             }
         },
         resolveId(importPath) {
@@ -129,7 +137,7 @@ function nxViteTsPaths(options = {}) {
             return resolvedFile || null;
         },
         async writeBundle(options) {
-            if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)())
+            if ((0, internal_1.isUsingTsSolutionSetup)())
                 return;
             const outDir = options.dir || 'dist';
             const src = (0, node_path_1.resolve)(projectRoot, 'package.json');

package/{plugins → dist/plugins}/nx-vite-build-coordination.plugin.d.ts

@@ -3,4 +3,3 @@ export interface NxViteBuildCoordinationPluginOptions {
     buildCommand: string;
 }
 export declare function nxViteBuildCoordinationPlugin(options: NxViteBuildCoordinationPluginOptions): Plugin;
-//# sourceMappingURL=nx-vite-build-coordination.plugin.d.ts.map

package/{plugins → dist/plugins}/rollup-replace-files.plugin.d.ts

@@ -14,4 +14,3 @@ export interface FileReplacement {
     replace: string;
     with: string;
 }
-//# sourceMappingURL=rollup-replace-files.plugin.d.ts.map

package/{src → dist/src}/executors/build/build.impl.d.ts

@@ -9,4 +9,3 @@ export declare function getBuildExtraArgs(options: ViteBuildExecutorOptions): Pr
     otherOptions: Record<string, any>;
 }>;
 export default viteBuildExecutor;
-//# sourceMappingURL=build.impl.d.ts.map

package/{src → dist/src}/executors/build/build.impl.js

@@ -1,49 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteBuildExecutor = viteBuildExecutor;
 exports.getBuildExtraArgs = getBuildExtraArgs;
+const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const options_utils_1 = require("../../utils/options-utils");
+const schema_json_1 = tslib_1.__importDefault(require("./schema.json"));
 const js_1 = require("@nx/js");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const executor_utils_1 = require("../../utils/executor-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const deprecation_1 = require("../../utils/deprecation");
+const internal_2 = require("@nx/js/internal");
 async function* viteBuildExecutor(options, context) {
+    (0, deprecation_1.warnViteBuildExecutorDeprecation)();
     process.env.VITE_CJS_IGNORE_WARNING = 'true';
     // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
     const { mergeConfig, build, resolveConfig, createBuilder } = await (0, executor_utils_1.loadViteDynamicImport)();
@@ -74,7 +45,7 @@ async function* viteBuildExecutor(options, context) {
         ...otherOptions,
     });
     // New TS Solution already has a typecheck target
-    if (!options.skipTypeCheck && !(0, ts_solution_setup_1.isUsingTsSolutionSetup)()) {
+    if (!options.skipTypeCheck && !(0, internal_2.isUsingTsSolutionSetup)()) {
         await (0, executor_utils_1.validateTypes)({
             workspaceRoot: context.root,
             tsconfig: tsConfigForBuild,
@@ -150,7 +121,7 @@ async function* viteBuildExecutor(options, context) {
                 ],
             }, context);
         }
-        const iterable = (0, async_iterable_1.createAsyncIterable)(({ next, done }) => {
+        const iterable = (0, internal_1.createAsyncIterable)(({ next, done }) => {
             if ('on' in watcherOrOutput) {
                 let success = true;
                 watcherOrOutput.on('event', (event) => {
@@ -180,14 +151,13 @@ async function* viteBuildExecutor(options, context) {
         });
         iterables.push(iterable);
     }
-    return yield* (0, async_iterable_1.combineAsyncIterables)(iterables.shift(), ...(iterables ?? []));
+    return yield* (0, internal_1.combineAsyncIterables)(iterables.shift(), ...(iterables ?? []));
 }
 async function getBuildExtraArgs(options) {
     // support passing extra args to vite cli
-    const schema = await Promise.resolve().then(() => __importStar(require('./schema.json')));
     const extraArgs = {};
     for (const key of Object.keys(options)) {
-        if (!schema.properties[key]) {
+        if (!schema_json_1.default.properties[key]) {
             extraArgs[key] = options[key];
         }
     }

package/{src → dist/src}/executors/build/compat.d.ts

@@ -1,3 +1,2 @@
 declare const _default: any;
 export default _default;
-//# sourceMappingURL=compat.d.ts.map

package/{src → dist/src}/executors/build/schema.json

@@ -5,6 +5,7 @@
     "cli": "nx",
     "description": "Builds a Vite application for production.",
     "type": "object",
+    "x-deprecated": "The `@nx/vite:build` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vite:convert-to-inferred` to migrate to the `@nx/vite/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
     "presets": [
         {
             "name": "Default minimum setup",

package/{src → dist/src}/executors/dev-server/compat.d.ts

@@ -1,3 +1,2 @@
 declare const _default: any;
 export default _default;
-//# sourceMappingURL=compat.d.ts.map

package/{src → dist/src}/executors/dev-server/dev-server.impl.d.ts

@@ -5,4 +5,3 @@ export declare function viteDevServerExecutor(options: ViteDevServerExecutorOpti
     baseUrl: string;
 }>;
 export default viteDevServerExecutor;
-//# sourceMappingURL=dev-server.impl.d.ts.map

package/{src → dist/src}/executors/dev-server/dev-server.impl.js

@@ -1,45 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteDevServerExecutor = viteDevServerExecutor;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const options_utils_1 = require("../../utils/options-utils");
+const schema_json_1 = tslib_1.__importDefault(require("./schema.json"));
 const executor_utils_1 = require("../../utils/executor-utils");
+const deprecation_1 = require("../../utils/deprecation");
 const path_1 = require("path");
 const build_impl_1 = require("../build/build.impl");
 async function* viteDevServerExecutor(options, context) {
+    (0, deprecation_1.warnViteDevServerExecutorDeprecation)();
     process.env.VITE_CJS_IGNORE_WARNING = 'true';
     // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
     const { mergeConfig, createServer, resolveConfig } = await (0, executor_utils_1.loadViteDynamicImport)();
@@ -111,10 +82,9 @@ async function runViteDevServer(server) {
 exports.default = viteDevServerExecutor;
 async function getServerExtraArgs(options, configuration, buildOptionsFromBuildTarget, otherOptionsFromBuildTarget) {
     // support passing extra args to vite cli
-    const schema = await Promise.resolve().then(() => __importStar(require('./schema.json')));
     const extraArgs = {};
     for (const key of Object.keys(options)) {
-        if (!schema.properties[key]) {
+        if (!schema_json_1.default.properties[key]) {
             extraArgs[key] = options[key];
         }
     }

package/{src → dist/src}/executors/dev-server/schema.json

@@ -6,6 +6,7 @@
     "cli": "nx",
     "description": "Starts a dev server using Vite.",
     "type": "object",
+    "x-deprecated": "The `@nx/vite:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vite:convert-to-inferred` to migrate to the `@nx/vite/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
     "presets": [
         {
             "name": "Default minimum setup",

package/{src → dist/src}/executors/preview-server/compat.d.ts

@@ -1,3 +1,2 @@
 declare const _default: any;
 export default _default;
-//# sourceMappingURL=compat.d.ts.map

package/{src → dist/src}/executors/preview-server/preview-server.impl.d.ts

@@ -5,4 +5,3 @@ export declare function vitePreviewServerExecutor(options: VitePreviewServerExec
     baseUrl: any;
 }, void, unknown>;
 export default vitePreviewServerExecutor;
-//# sourceMappingURL=preview-server.impl.d.ts.map

package/{src → dist/src}/executors/preview-server/preview-server.impl.js

@@ -1,45 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vitePreviewServerExecutor = vitePreviewServerExecutor;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const options_utils_1 = require("../../utils/options-utils");
+const schema_json_1 = tslib_1.__importDefault(require("./schema.json"));
 const path_1 = require("path");
 const build_impl_1 = require("../build/build.impl");
 const executor_utils_1 = require("../../utils/executor-utils");
+const deprecation_1 = require("../../utils/deprecation");
 async function* vitePreviewServerExecutor(options, context) {
+    (0, deprecation_1.warnVitePreviewServerExecutorDeprecation)();
     process.env.VITE_CJS_IGNORE_WARNING = 'true';
     // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
     const { mergeConfig, preview, resolveConfig } = await (0, executor_utils_1.loadViteDynamicImport)();
@@ -174,10 +145,9 @@ function closeServer(server) {
 exports.default = vitePreviewServerExecutor;
 async function getExtraArgs(options, configuration, otherOptionsFromBuildTarget) {
     // support passing extra args to vite cli
-    const schema = await Promise.resolve().then(() => __importStar(require('./schema.json')));
     const extraArgs = {};
     for (const key of Object.keys(options)) {
-        if (!schema.properties[key]) {
+        if (!schema_json_1.default.properties[key]) {
             extraArgs[key] = options[key];
         }
     }

package/{src → dist/src}/executors/preview-server/schema.json

@@ -6,6 +6,7 @@
     "description": "Preview Server for Vite.",
     "continuous": true,
     "type": "object",
+    "x-deprecated": "The `@nx/vite:preview-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vite:convert-to-inferred` to migrate to the `@nx/vite/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
     "presets": [
         {
             "name": "Default minimum setup",

package/{src → dist/src}/generators/configuration/configuration.d.ts

@@ -3,4 +3,3 @@ import { ViteConfigurationGeneratorSchema } from './schema';
 export declare function viteConfigurationGenerator(host: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
 export declare function viteConfigurationGeneratorInternal(tree: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
 export default viteConfigurationGenerator;
-//# sourceMappingURL=configuration.d.ts.map

package/{src → dist/src}/generators/configuration/configuration.js

@@ -5,13 +5,14 @@ exports.viteConfigurationGeneratorInternal = viteConfigurationGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const posix_1 = require("node:path/posix");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
+const assert_supported_vite_version_1 = require("../../utils/assert-supported-vite-version");
+const deprecation_1 = require("../../utils/deprecation");
 const generator_utils_1 = require("../../utils/generator-utils");
+const versions_1 = require("../../utils/versions");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
-const vitest_generator_1 = tslib_1.__importDefault(require("../vitest/vitest-generator"));
 const convert_non_vite_1 = require("./lib/convert-non-vite");
 function viteConfigurationGenerator(host, schema) {
     return viteConfigurationGeneratorInternal(host, {
@@ -20,10 +21,11 @@ function viteConfigurationGenerator(host, schema) {
     });
 }
 async function viteConfigurationGeneratorInternal(tree, schema) {
+    (0, assert_supported_vite_version_1.assertSupportedViteVersion)(tree);
     const tasks = [];
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const { targets, root: projectRoot } = projectConfig;
-    const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectConfig.root, schema.projectType ?? projectConfig.projectType);
+    const projectType = (0, internal_1.getProjectType)(tree, projectConfig.root, schema.projectType ?? projectConfig.projectType);
     schema.includeLib ??= projectType === 'library';
     // Setting default to jsdom since it is the most common use case (React, Web).
     // The @nx/js:lib generator specifically sets this to node to be more generic.
@@ -57,6 +59,13 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
         ? p === '@nx/vite/plugin'
         : p.plugin === '@nx/vite/plugin');
     if (!hasPlugin) {
+        const willScaffoldExecutorTargets = !projectAlreadyHasViteTargets.build ||
+            (!schema.includeLib &&
+                (!projectAlreadyHasViteTargets.serve ||
+                    !projectAlreadyHasViteTargets.preview));
+        if (willScaffoldExecutorTargets) {
+            (0, deprecation_1.warnViteExecutorGenerating)();
+        }
         if (!projectAlreadyHasViteTargets.build) {
             (0, generator_utils_1.addBuildTarget)(tree, schema, 'build');
         }
@@ -88,7 +97,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
                 includeLib: schema.includeLib,
                 includeVitest: schema.includeVitest,
                 inSourceTests: schema.inSourceTests,
-                rollupOptionsExternal: [
+                rolldownOptionsExternal: [
                     "'react'",
                     "'react-dom'",
                     "'react/jsx-runtime'",
@@ -108,7 +117,11 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
         }
     }
     if (schema.includeVitest) {
-        const vitestTask = await (0, vitest_generator_1.default)(tree, {
+        (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+        // CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
+        // exposes the temp install via `Module._initPaths`, which ESM ignores.
+        const { configurationGenerator: vitestConfigurationGenerator, } = require('@nx/vitest/generators');
+        const vitestTask = await vitestConfigurationGenerator(tree, {
             project: schema.project,
             uiFramework: schema.uiFramework,
             inSourceTests: schema.inSourceTests,
@@ -119,10 +132,11 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
             addPlugin: schema.addPlugin,
             compiler: schema.compiler,
             projectType,
-        }, false, true);
+            testEnvironment: schema.testEnvironment,
+        });
         tasks.push(vitestTask);
     }
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(tree)) {
         updatePackageJson(tree, schema, projectType);
     }
     if (!schema.skipFormat) {
@@ -140,10 +154,10 @@ function updatePackageJson(tree, options, projectType) {
     }
     else {
         packageJson = {
-            name: (0, get_import_path_1.getImportPath)(tree, options.project),
+            name: (0, internal_1.getImportPath)(tree, options.project),
             version: '0.0.1',
         };
-        if ((0, ts_solution_setup_1.getProjectType)(tree, project.root, projectType) === 'application') {
+        if ((0, internal_1.getProjectType)(tree, project.root, projectType) === 'application') {
             packageJson.private = true;
         }
     }
@@ -162,7 +176,7 @@ function updatePackageJson(tree, options, projectType) {
             generateExportsField: true,
             packageJsonPath,
             format: ['esm'],
-            developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
+            developmentConditionName: (0, internal_1.getDefinedCustomConditionName)(tree),
         });
     }
     (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);

package/{src → dist/src}/generators/configuration/lib/convert-non-vite.d.ts

@@ -3,4 +3,3 @@ import { ViteConfigurationGeneratorSchema } from '../schema';
 export declare function convertNonVite(tree: Tree, schema: ViteConfigurationGeneratorSchema, projectRoot: string, _projectType: string, targets: {
     [targetName: string]: TargetConfiguration<any>;
 }): Promise<void>;
-//# sourceMappingURL=convert-non-vite.d.ts.map

package/{src → dist/src}/generators/configuration/lib/convert-non-vite.js

@@ -4,14 +4,14 @@ exports.convertNonVite = convertNonVite;
 const devkit_1 = require("@nx/devkit");
 const find_vite_config_1 = require("../../../utils/find-vite-config");
 const generator_utils_1 = require("../../../utils/generator-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 async function convertNonVite(tree, schema, projectRoot, _projectType, targets) {
     // Check if it has vite
     const hasViteConfig = (0, find_vite_config_1.findViteConfig)(tree, projectRoot);
     const hasIndexHtmlAtRoot = tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'index.html'));
     // Check if it has webpack
     const hasWebpackConfig = (0, find_vite_config_1.findWebpackConfig)(tree, projectRoot);
-    const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, _projectType);
+    const projectType = (0, internal_1.getProjectType)(tree, projectRoot, _projectType);
     if (hasWebpackConfig) {
         if (projectType === 'application') {
             (0, generator_utils_1.moveAndEditIndexHtml)(tree, schema);

package/{src → dist/src}/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -5,4 +5,3 @@ interface Schema {
 }
 export declare function convertToInferred(tree: Tree, options: Schema): Promise<() => void>;
 export default convertToInferred;
-//# sourceMappingURL=convert-to-inferred.d.ts.map