@nx/vite 22.0.0-beta.2 → 22.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "22.0.0-beta.2",
+  "version": "22.0.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -30,10 +30,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.0.0-beta.2",
+    "@nx/devkit": "22.0.0-beta.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6",
-    "@nx/js": "22.0.0-beta.2",
+    "@nx/js": "22.0.0-beta.4",
     "picomatch": "4.0.2",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -41,7 +41,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "22.0.0-beta.2"
+    "nx": "22.0.0-beta.4"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",

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

@@ -1 +1 @@
-{"version":3,"file":"nx-tsconfig-paths.plugin.d.ts","sourceRoot":"","sources":["../../../../packages/vite/plugins/nx-tsconfig-paths.plugin.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAM9B,MAAM,WAAW,oBAAoB;IACnC;;;;QAII;IACJ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;QAKI;IACJ,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnC;;;QAGI;IACJ,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GAiKzD,MAAM,CAsEZ"}
+{"version":3,"file":"nx-tsconfig-paths.plugin.d.ts","sourceRoot":"","sources":["../../../../packages/vite/plugins/nx-tsconfig-paths.plugin.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,MAAM,WAAW,oBAAoB;IACnC;;;;QAII;IACJ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;QAKI;IACJ,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnC;;;QAGI;IACJ,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GAqKzD,MAAM,CAsEZ"}

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

@@ -2,14 +2,14 @@
 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_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const tsconfig_paths_1 = require("tsconfig-paths");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-const nx_vite_build_coordination_plugin_1 = require("./nx-vite-build-coordination.plugin");
 const nx_tsconfig_paths_find_file_1 = require("../src/utils/nx-tsconfig-paths-find-file");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const options_utils_1 = require("../src/utils/options-utils");
+const nx_vite_build_coordination_plugin_1 = require("./nx-vite-build-coordination.plugin");
 function nxViteTsPaths(options = {}) {
     let foundTsConfigPath;
     let matchTsPathEsm;
@@ -45,22 +45,29 @@ function nxViteTsPaths(options = {}) {
                 (0, node_path_1.join)(devkit_1.workspaceRoot, 'tmp', projectRootFromWorkspaceRoot, process.env.NX_TASK_TARGET_TARGET ?? 'build', 'tsconfig.generated.json'));
             if (!foundTsConfigPath)
                 return;
-            if (!options.buildLibsFromSource &&
-                !global.NX_GRAPH_CREATION &&
-                config.mode !== 'test') {
+            if (!options.buildLibsFromSource && !global.NX_GRAPH_CREATION) {
                 const projectGraph = await (0, devkit_1.createProjectGraphAsync)({
                     exitOnError: false,
                     resetDaemonClient: true,
                 });
                 // 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'
+                const depsBuildTarget = process.env.NX_TASK_TARGET_TARGET === 'serve' ||
+                    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);
-                // 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);
+                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
+                    foundTsConfigPath = process.env.NX_GENERATED_TSCONFIG_PATH;
+                }
+                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);
+                    process.env.NX_GENERATED_TSCONFIG_PATH = foundTsConfigPath;
+                }
                 if (config.command === 'serve') {
                     const buildableLibraryDependencies = dependencies
                         .filter((dep) => dep.node.type === 'lib')

package/src/executors/preview-server/preview-server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/preview-server/preview-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAK5D,wBAAuB,yBAAyB,CAC9C,OAAO,EAAE,gCAAgC,EACzC,OAAO,EAAE,eAAe;;;kBA+JzB;AAoBD,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"preview-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/preview-server/preview-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAK5D,wBAAuB,yBAAyB,CAC9C,OAAO,EAAE,gCAAgC,EACzC,OAAO,EAAE,eAAe;;;kBAqKzB;AAoBD,eAAe,yBAAyB,CAAC"}

package/src/executors/preview-server/preview-server.impl.js

@@ -22,7 +22,13 @@ async function* vitePreviewServerExecutor(options, context) {
     const buildTargetOptions = (0, options_utils_1.getNxTargetOptions)(options.buildTarget, context);
     const { configuration } = (0, devkit_1.parseTargetString)(options.buildTarget, context);
     const viteConfigPath = (0, options_utils_1.normalizeViteConfigFilePath)(context.root, projectRoot, buildTargetOptions.configFile);
-    const { buildOptions, otherOptions: otherOptionsFromBuild } = await (0, build_impl_1.getBuildExtraArgs)(buildTargetOptions);
+    const { buildOptions, otherOptions: otherOptionsFromBuild } = await (0, build_impl_1.getBuildExtraArgs)({
+        ...buildTargetOptions,
+        ...{
+            // Enable watch mode by default for the build target.
+            watch: options.watch ?? true,
+        },
+    });
     const { previewOptions, otherOptions } = await getExtraArgs(options, configuration, otherOptionsFromBuild);
     const defaultMode = otherOptions?.mode ?? otherOptionsFromBuild?.mode ?? 'production';
     const resolved = await resolveConfig({

package/src/executors/preview-server/schema.d.ts

@@ -2,4 +2,5 @@ export interface VitePreviewServerExecutorOptions {
   buildTarget: string;
   proxyConfig?: string;
   staticFilePath?: string;
+  watch?: boolean;
 }

package/src/executors/preview-server/schema.json

@@ -30,6 +30,11 @@
       "type": "string",
       "description": "Path where the build artifacts are located. If not provided then it will be infered from the buildTarget executor options as outputPath",
       "x-completion-type": "directory"
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Enable re-building when files change. If not specified, watch mode will be enabled by default.",
+      "default": true
     }
   },
   "definitions": {},

package/src/plugins/plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodes, CreateNodesV2 } from '@nx/devkit';
+import { CreateDependencies, CreateNodesV2 } from '@nx/devkit';
 export interface VitePluginOptions {
     buildTargetName?: string;
     testTargetName?: string;
@@ -17,6 +17,6 @@ export interface VitePluginOptions {
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
 export declare const createDependencies: CreateDependencies;
+export declare const createNodes: CreateNodesV2<VitePluginOptions>;
 export declare const createNodesV2: CreateNodesV2<VitePluginOptions>;
-export declare const createNodes: CreateNodes<VitePluginOptions>;
 //# sourceMappingURL=plugin.d.ts.map

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,WAAW,EAIX,aAAa,EASd,MAAM,YAAY,CAAC;AAkBpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,iBAAiB,CAuG1D,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,iBAAiB,CA0DtD,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAkBpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAuGxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createNodesV2 = exports.createDependencies = void 0;
+exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
@@ -30,7 +30,7 @@ const createDependencies = () => {
 };
 exports.createDependencies = createDependencies;
 const viteVitestConfigGlob = '**/{vite,vitest}.config.{js,ts,mjs,mts,cjs,cts}';
-exports.createNodesV2 = [
+exports.createNodes = [
     viteVitestConfigGlob,
     async (configFilePaths, options, context) => {
         const optionsHash = (0, file_hasher_1.hashObject)(options);
@@ -92,43 +92,7 @@ exports.createNodesV2 = [
         }
     },
 ];
-exports.createNodes = [
-    viteVitestConfigGlob,
-    async (configFilePath, options, context) => {
-        devkit_1.logger.warn('`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.');
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        // Do not create a project if package.json and project.json isn't there.
-        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-        if (!siblingFiles.includes('package.json') &&
-            !siblingFiles.includes('project.json')) {
-            return {};
-        }
-        const tsConfigFiles = siblingFiles.filter((p) => picomatch('tsconfig*{.json,.*.json}')(p)) ??
-            [];
-        const hasReactRouterConfig = siblingFiles.some((configFile) => {
-            const parts = configFile.split('.');
-            return (parts[0] === 'react-router' && parts[1] === 'config' && parts.length > 2);
-        });
-        const normalizedOptions = normalizeOptions(options);
-        const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
-        const { projectType, metadata, targets } = await buildViteTargets(configFilePath, projectRoot, normalizedOptions, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context);
-        const project = {
-            root: projectRoot,
-            targets,
-            metadata,
-        };
-        // If project is buildable, then the project type.
-        // If it is not buildable, then leave it to other plugins/project.json to set the project type.
-        if (project.targets[normalizedOptions.buildTargetName]) {
-            project.projectType = projectType;
-        }
-        return {
-            projects: {
-                [projectRoot]: project,
-            },
-        };
-    },
-];
+exports.createNodesV2 = exports.createNodes;
 async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context) {
     const absoluteConfigFilePath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
     // Workaround for the `build$3 is not a function` error that we sometimes see in agents.

package/src/utils/options-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/options-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAG9E;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAgCpB;AAED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAQpB;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,EAAE,eAAe,GACvB,MAAM,GAAG,SAAS,CAapB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,4BAA4B,EACrC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAyBlC;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,eAAe,EACxB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,SAAS,CAO9C;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,OAG1E"}
+{"version":3,"file":"options-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/options-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAMhB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAG9E;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAgCpB;AAED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAYpB;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,EAAE,eAAe,GACvB,MAAM,GAAG,SAAS,CAapB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,4BAA4B,EACrC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAyBlC;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,eAAe,EACxB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,SAAS,CAO9C;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,OAG1E"}

package/src/utils/options-utils.js

@@ -31,11 +31,11 @@ function normalizeViteConfigFilePath(contextRoot, projectRoot, configFile) {
     }
 }
 function getProjectTsConfigPath(projectRoot) {
-    return (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json'))
+    return (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'tsconfig.app.json'))
         ? (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json')
-        : (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json'))
+        : (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'tsconfig.lib.json'))
             ? (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json')
-            : (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json'))
+            : (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'tsconfig.json'))
                 ? (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json')
                 : undefined;
 }