@nx/vite 22.1.0-beta.0 → 22.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "22.1.0-beta.0",
+  "version": "22.1.0-beta.2",
   "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.1.0-beta.0",
+    "@nx/devkit": "22.1.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6",
-    "@nx/js": "22.1.0-beta.0",
+    "@nx/js": "22.1.0-beta.2",
     "picomatch": "4.0.2",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -41,7 +41,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.0"
+    "nx": "22.1.0-beta.2"
   },
   "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;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"}
+{"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,GAsKzD,MAAM,CA0EZ"}

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

@@ -33,6 +33,7 @@ function nxViteTsPaths(options = {}) {
     options.mainFields ??= [['exports', '.', 'import'], 'module', 'main'];
     options.buildLibsFromSource ??= true;
     let projectRoot = '';
+    let projectRootFromWorkspaceRoot;
     return {
         name: 'nx-vite-ts-paths',
         // Ensure the resolveId aspect of the plugin is called before vite's internal resolver
@@ -40,7 +41,7 @@ function nxViteTsPaths(options = {}) {
         enforce: 'pre',
         async configResolved(config) {
             projectRoot = config.root;
-            const projectRootFromWorkspaceRoot = (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot);
+            projectRootFromWorkspaceRoot = (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot);
             foundTsConfigPath = getTsConfig(process.env.NX_TSCONFIG_PATH ??
                 (0, node_path_1.join)(devkit_1.workspaceRoot, 'tmp', projectRootFromWorkspaceRoot, process.env.NX_TASK_TARGET_TARGET ?? 'build', 'tsconfig.generated.json'));
             if (!foundTsConfigPath)
@@ -137,10 +138,12 @@ function nxViteTsPaths(options = {}) {
         },
     };
     function getTsConfig(preferredTsConfigPath) {
-        const projectTsConfigPath = (0, options_utils_1.getProjectTsConfigPath)(projectRoot);
+        const projectTsConfigPath = (0, options_utils_1.getProjectTsConfigPath)(projectRootFromWorkspaceRoot);
         return [
             (0, node_path_1.resolve)(preferredTsConfigPath),
-            projectTsConfigPath ? (0, node_path_1.resolve)(projectTsConfigPath) : null,
+            projectTsConfigPath
+                ? (0, node_path_1.resolve)((0, node_path_1.join)(devkit_1.workspaceRoot, projectTsConfigPath))
+                : null,
             (0, node_path_1.resolve)((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json')),
             (0, node_path_1.resolve)((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.json')),
             (0, node_path_1.resolve)((0, node_path_1.join)(devkit_1.workspaceRoot, 'jsconfig.json')),

package/src/executors/build/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "title": "Vite Prod Builder",
   "cli": "nx",
-  "description": "Builds a Vite.js application for production.",
+  "description": "Builds a Vite application for production.",
   "type": "object",
   "presets": [
     {
@@ -36,7 +36,7 @@
     },
     "configFile": {
       "type": "string",
-      "description": "The name of the Vite.js configuration file.",
+      "description": "The name of the Vite configuration file.",
       "x-completion-type": "file",
       "x-completion-glob": "vite.config.@(js|ts)"
     },

package/src/generators/configuration/schema.json

@@ -1,7 +1,7 @@
 {
   "cli": "nx",
-  "title": "Configure a project to use Vite.js.",
-  "description": "Configure a project to use Vite.js.",
+  "title": "Configure a project to use Vite.",
+  "description": "Configure a project to use Vite.",
   "$id": "configure-vite-project",
   "type": "object",
   "properties": {

package/src/plugins/plugin.d.ts

@@ -12,6 +12,14 @@ export interface VitePluginOptions {
     typecheckTargetName?: string;
     watchDepsTargetName?: string;
     buildDepsTargetName?: string;
+    /**
+     * Atomizer for vitest
+     */
+    ciTargetName?: string;
+    /**
+     * The name that should be used to group atomized tasks on CI
+     */
+    ciGroupName?: string;
 }
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.

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,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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EASd,MAAM,YAAY,CAAC;AAgBpB,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;IAE7B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;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

@@ -2,20 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
-const fs_1 = require("fs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
-const executor_utils_1 = require("../utils/executor-utils");
+const util_1 = require("@nx/js/src/plugins/typescript/util");
+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 file_hasher_1 = require("nx/src/hasher/file-hasher");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+const plugins_1 = require("nx/src/utils/plugins");
+const executor_utils_1 = require("../utils/executor-utils");
 const picomatch = require("picomatch");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, fs_1.existsSync)(cachePath)
+    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
         ? (0, devkit_1.readJsonFile)(cachePath)
         : {};
 }
@@ -35,11 +36,11 @@ exports.createNodes = [
     async (configFilePaths, options, context) => {
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const normalizedOptions = normalizeOptions(options);
-        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `vite-${optionsHash}.hash`);
+        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `vite-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
         const { roots: projectRoots, configFiles: validConfigFiles } = configFilePaths.reduce((acc, configFile) => {
-            const potentialRoot = (0, path_1.dirname)(configFile);
+            const potentialRoot = (0, node_path_1.dirname)(configFile);
             if (checkIfConfigFileShouldBeProject(potentialRoot, context)) {
                 acc.roots.push(potentialRoot);
                 acc.configFiles.push(configFile);
@@ -53,9 +54,9 @@ exports.createNodes = [
         const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((r) => [lockfile]));
         try {
             return await (0, devkit_1.createNodesFromFiles)(async (configFile, _, context, idx) => {
-                const projectRoot = (0, path_1.dirname)(configFile);
+                const projectRoot = (0, node_path_1.dirname)(configFile);
                 // 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));
+                const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
                 const tsConfigFiles = siblingFiles.filter((p) => picomatch('tsconfig*{.json,.*.json}')(p)) ?? [];
                 const hasReactRouterConfig = siblingFiles.some((configFile) => {
                     const parts = configFile.split('.');
@@ -109,12 +110,84 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
         configFile: absoluteConfigFilePath,
         mode: 'development',
     }, 'build');
+    let metadata = {};
     const { buildOutputs, testOutputs, hasTest, isBuildable, hasServeConfig } = getOutputs(viteBuildConfig, projectRoot, context.workspaceRoot);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
-    // if file is vitest.config or vite.config has definition for test, create target for test
+    // if file is vitest.config or vite.config has definition for test, create targets for test and/or atomized tests
     if (configFilePath.includes('vitest.config') || hasTest) {
         targets[options.testTargetName] = await testTarget(namedInputs, testOutputs, projectRoot);
+        if (options.ciTargetName) {
+            const groupName = options.ciGroupName ?? (0, plugins_1.deriveGroupNameFromTarget)(options.ciTargetName);
+            const targetGroup = [];
+            const dependsOn = [];
+            metadata = {
+                targetGroups: {
+                    [groupName]: targetGroup,
+                },
+            };
+            const projectRootRelativeTestPaths = await getTestPathsRelativeToProjectRoot(projectRoot);
+            for (const relativePath of projectRootRelativeTestPaths) {
+                if (relativePath.includes('../')) {
+                    throw new Error('@nx/vite/plugin attempted to run tests outside of the project root. This is not supported and should not happen. Please open an issue at https://github.com/nrwl/nx/issues/new/choose with the following information:\n\n' +
+                        `\n\n${JSON.stringify({
+                            projectRoot,
+                            relativePath,
+                            projectRootRelativeTestPaths,
+                            context,
+                        }, null, 2)}`);
+                }
+                const targetName = `${options.ciTargetName}--${relativePath}`;
+                dependsOn.push(targetName);
+                targets[targetName] = {
+                    // It does not make sense to run atomized tests in watch mode as they are intended to be run in CI
+                    command: `vitest run ${relativePath}`,
+                    cache: targets[options.testTargetName].cache,
+                    inputs: targets[options.testTargetName].inputs,
+                    outputs: targets[options.testTargetName].outputs,
+                    options: {
+                        cwd: projectRoot,
+                        env: targets[options.testTargetName].options.env,
+                    },
+                    metadata: {
+                        technologies: ['vitest'],
+                        description: `Run Vitest Tests in ${relativePath}`,
+                        help: {
+                            command: `${pmc.exec} vitest --help`,
+                            example: {
+                                options: {
+                                    coverage: true,
+                                },
+                            },
+                        },
+                    },
+                };
+                targetGroup.push(targetName);
+            }
+            if (targetGroup.length > 0) {
+                targets[options.ciTargetName] = {
+                    executor: 'nx:noop',
+                    cache: true,
+                    inputs: targets[options.testTargetName].inputs,
+                    outputs: targets[options.testTargetName].outputs,
+                    dependsOn,
+                    metadata: {
+                        technologies: ['vitest'],
+                        description: 'Run Vitest Tests in CI',
+                        nonAtomizedTarget: options.testTargetName,
+                        help: {
+                            command: `${pmc.exec} vitest --help`,
+                            example: {
+                                options: {
+                                    coverage: true,
+                                },
+                            },
+                        },
+                    },
+                };
+                targetGroup.unshift(options.ciTargetName);
+            }
+        }
     }
     if (hasReactRouterConfig) {
         // If we have a react-router config, we can skip the rest of the targets
@@ -186,7 +259,6 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
         }
     }
     (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
-    const metadata = {};
     return {
         targets,
         metadata,
@@ -324,7 +396,7 @@ function getOutputs(viteBuildConfig, projectRoot, workspaceRoot) {
     const buildOutputPath = normalizeOutputPath(build?.outDir, projectRoot, workspaceRoot, 'dist');
     const isBuildable = build?.lib ||
         build?.rollupOptions?.input ||
-        (0, fs_1.existsSync)((0, path_1.join)(workspaceRoot, projectRoot, 'index.html'));
+        (0, node_fs_1.existsSync)((0, node_path_1.join)(workspaceRoot, projectRoot, 'index.html'));
     const hasServeConfig = Boolean(server?.host || server?.port);
     const reportsDirectoryPath = normalizeOutputPath(test?.coverage?.reportsDirectory, projectRoot, workspaceRoot, 'coverage');
     return {
@@ -345,15 +417,15 @@ function normalizeOutputPath(outputPath, projectRoot, workspaceRoot, path) {
         }
     }
     else {
-        if ((0, path_1.isAbsolute)(outputPath)) {
-            return `{workspaceRoot}/${(0, path_1.relative)(workspaceRoot, outputPath)}`;
+        if ((0, node_path_1.isAbsolute)(outputPath)) {
+            return `{workspaceRoot}/${(0, node_path_1.relative)(workspaceRoot, outputPath)}`;
         }
         else {
             if (outputPath.startsWith('..')) {
-                return (0, path_1.join)('{workspaceRoot}', (0, path_1.join)(projectRoot, outputPath));
+                return (0, node_path_1.join)('{workspaceRoot}', (0, node_path_1.join)(projectRoot, outputPath));
             }
             else {
-                return (0, path_1.join)('{projectRoot}', outputPath);
+                return (0, node_path_1.join)('{projectRoot}', outputPath);
             }
         }
     }
@@ -371,10 +443,21 @@ function normalizeOptions(options) {
 }
 function checkIfConfigFileShouldBeProject(projectRoot, context) {
     // 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));
+    const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
     if (!siblingFiles.includes('package.json') &&
         !siblingFiles.includes('project.json')) {
         return false;
     }
     return true;
 }
+async function getTestPathsRelativeToProjectRoot(projectRoot) {
+    const fullProjectRoot = (0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot);
+    const { createVitest } = await Promise.resolve().then(() => require('vitest/node'));
+    const vitest = await createVitest('test', {
+        dir: fullProjectRoot,
+        filesOnly: true,
+        watch: false,
+    });
+    const relevantTestSpecifications = await vitest.getRelevantTestSpecifications();
+    return relevantTestSpecifications.map((ts) => (0, node_path_1.relative)(projectRoot, ts.moduleId));
+}

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

@@ -1 +1 @@
-{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/generator-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/generator-utils.ts"],"names":[],"mappings":"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"}

package/src/utils/generator-utils.js

@@ -282,7 +282,7 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
         ? ''
         : options.includeLib
             ? `  // Configuration for building your library.
-  // See: https://vitejs.dev/guide/build.html#library-mode
+  // See: https://vite.dev/guide/build.html#library-mode
   build: {
     outDir: '${buildOutDir}',
     emptyOutDir: true,
@@ -370,7 +370,12 @@ ${options.inSourceTests
     port: ${options.previewPort ?? 4300},
     host: 'localhost',
   },`;
-    const workerOption = `  // Uncomment this if you are using workers.
+    const workerOption = isTsSolutionSetup
+        ? `  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [],
+  // },`
+        : `  // Uncomment this if you are using workers.
   // worker: {
   //  plugins: [ nxViteTsPaths() ],
   // },`;
@@ -430,8 +435,8 @@ async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName
     devkit_1.logger.warn(`The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nx/vite:${executor} executor.
      However, we found the following ${target} target in your project that can be converted: ${validFoundTargetName}
 
-     Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
-     your changes before converting a project to use Vite.js, and test the converted project thoroughly before deploying it.
+     Please note that converting a potentially non-compatible project to use Vite may result in unexpected behavior. Always commit
+     your changes before converting a project to use Vite, and test the converted project thoroughly before deploying it.
     `);
     const { Confirm } = require('enquirer');
     const prompt = new Confirm({
@@ -445,8 +450,8 @@ async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName
       Please try again, either by providing a different ${target} target or by not providing a target at all (Nx will
         convert the first one it finds, most probably this one: ${validFoundTargetName})
 
-      Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
-      your changes before converting a project to use Vite.js, and test the converted project thoroughly before deploying it.
+      Please note that converting a potentially non-compatible project to use Vite may result in unexpected behavior. Always commit
+      your changes before converting a project to use Vite, and test the converted project thoroughly before deploying it.
       `);
     }
 }

package/src/utils/test-files/test-vite-configs.d.ts

@@ -5,8 +5,8 @@ export declare const conditionalConfig = "\n    /// <reference types=\"vitest\"
 export declare const configNoDefineConfig = "\n    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n\n    export default {\n      plugins: [\n        react(),\n        nxViteTsPaths(),\n      ],\n    };\n    ";
 export declare const noBuildOptionsHasTestOption = "\n    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n\n    export default defineConfig({\n    \n      cacheDir: '../../node_modules/.vitest',\n      plugins: [\n        react(),\n        nxViteTsPaths(),\n      ],\n\n      test: {\n        globals: true,\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n\n    });\n    ";
 export declare const someBuildOptionsSomeTestOption = "\n    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n\n    export default defineConfig({\n      plugins: [\n        react(),\n        nxViteTsPaths(),\n      ],\n\n      test: {\n        my: 'option',\n      },\n\n      build: {\n        my: 'option',\n      }\n\n    });\n    ";
-export declare const hasEverything = "\n    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n    import dts from 'vite-plugin-dts';\n    import { joinPathFragments } from '@nx/devkit';\n\n    export default defineConfig({\n      cacheDir: '../../node_modules/.vitest',\n      plugins: [\n        dts({ entryRoot: 'src', tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'), skipDiagnostics: true }),\n        react(),\n        nxViteTsPaths(),\n      ],\n    \n      // Configuration for building your library.\n      // See: https://vitejs.dev/guide/build.html#library-mode\n      build: {\n        lib: {\n          // Could also be a dictionary or array of multiple entry points.\n          entry: 'src/index.ts',\n          name: 'pure-libs-react-vite',\n          fileName: 'index',\n          // Change this to the formats you want to support.\n          // Don't forget to update your package.json as well.\n          formats: ['es'],\n        },\n        rollupOptions: {\n          // External packages that should not be bundled into your library.\n          external: ['react', 'react-dom', 'react/jsx-runtime'],\n        },\n      },\n    \n      test: {\n        globals: true,\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n    });\n    ";
-export declare const buildOption = "\n    // Configuration for building your library.\n    // See: https://vitejs.dev/guide/build.html#library-mode\n    build: {\n      lib: {\n        // Could also be a dictionary or array of multiple entry points.\n        entry: 'src/index.ts',\n        name: 'my-app',\n        fileName: 'index',\n        // Change this to the formats you want to support.\n        // Don't forget to update your package.json as well.\n        formats: ['es']\n      },\n      rollupOptions: {\n        // External packages that should not be bundled into your library.\n        external: ['react', 'react-dom', 'react/jsx-runtime']\n      }\n    },";
+export declare const hasEverything = "\n    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n    import dts from 'vite-plugin-dts';\n    import { joinPathFragments } from '@nx/devkit';\n\n    export default defineConfig({\n      cacheDir: '../../node_modules/.vitest',\n      plugins: [\n        dts({ entryRoot: 'src', tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'), skipDiagnostics: true }),\n        react(),\n        nxViteTsPaths(),\n      ],\n    \n      // Configuration for building your library.\n      // See: https://vite.dev/guide/build.html#library-mode\n      build: {\n        lib: {\n          // Could also be a dictionary or array of multiple entry points.\n          entry: 'src/index.ts',\n          name: 'pure-libs-react-vite',\n          fileName: 'index',\n          // Change this to the formats you want to support.\n          // Don't forget to update your package.json as well.\n          formats: ['es'],\n        },\n        rollupOptions: {\n          // External packages that should not be bundled into your library.\n          external: ['react', 'react-dom', 'react/jsx-runtime'],\n        },\n      },\n    \n      test: {\n        globals: true,\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n    });\n    ";
+export declare const buildOption = "\n    // Configuration for building your library.\n    // See: https://vite.dev/guide/build.html#library-mode\n    build: {\n      lib: {\n        // Could also be a dictionary or array of multiple entry points.\n        entry: 'src/index.ts',\n        name: 'my-app',\n        fileName: 'index',\n        // Change this to the formats you want to support.\n        // Don't forget to update your package.json as well.\n        formats: ['es']\n      },\n      rollupOptions: {\n        // External packages that should not be bundled into your library.\n        external: ['react', 'react-dom', 'react/jsx-runtime']\n      }\n    },";
 export declare const buildOptionObject: {
     lib: {
         entry: string;

package/src/utils/test-files/test-vite-configs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-vite-configs.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/utils/test-files/test-vite-configs.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,iiBAoBtB,CAAC;AAEN,eAAO,MAAM,gBAAgB,mlBAwBxB,CAAC;AAEN,eAAO,MAAM,qBAAqB,oQAO7B,CAAC;AAEN,eAAO,MAAM,iBAAiB,4YAgBzB,CAAC;AAEN,eAAO,MAAM,oBAAoB,oUAY5B,CAAC;AAEN,eAAO,MAAM,2BAA2B,uiBAqBnC,CAAC;AAEN,eAAO,MAAM,8BAA8B,wbAqBtC,CAAC;AAEN,eAAO,MAAM,aAAa,o7CAwCrB,CAAC;AAEN,eAAO,MAAM,WAAW,goBAiBjB,CAAC;AACR,eAAO,MAAM,iBAAiB;;;;;;;;;;CAU7B,CAAC;AAEF,eAAO,MAAM,UAAU,uJAIhB,CAAC;AAER,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAC;AAEF,eAAO,MAAM,OAAO,UAGnB,CAAC;AAEF,eAAO,MAAM,OAAO,UAAiC,CAAC"}
+{"version":3,"file":"test-vite-configs.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/utils/test-files/test-vite-configs.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,iiBAoBtB,CAAC;AAEN,eAAO,MAAM,gBAAgB,mlBAwBxB,CAAC;AAEN,eAAO,MAAM,qBAAqB,oQAO7B,CAAC;AAEN,eAAO,MAAM,iBAAiB,4YAgBzB,CAAC;AAEN,eAAO,MAAM,oBAAoB,oUAY5B,CAAC;AAEN,eAAO,MAAM,2BAA2B,uiBAqBnC,CAAC;AAEN,eAAO,MAAM,8BAA8B,wbAqBtC,CAAC;AAEN,eAAO,MAAM,aAAa,k7CAwCrB,CAAC;AAEN,eAAO,MAAM,WAAW,8nBAiBjB,CAAC;AACR,eAAO,MAAM,iBAAiB;;;;;;;;;;CAU7B,CAAC;AAEF,eAAO,MAAM,UAAU,uJAIhB,CAAC;AAER,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAC;AAEF,eAAO,MAAM,OAAO,UAGnB,CAAC;AAEF,eAAO,MAAM,OAAO,UAAiC,CAAC"}

package/src/utils/test-files/test-vite-configs.js

@@ -146,7 +146,7 @@ exports.hasEverything = `
       ],
     
       // Configuration for building your library.
-      // See: https://vitejs.dev/guide/build.html#library-mode
+      // See: https://vite.dev/guide/build.html#library-mode
       build: {
         lib: {
           // Could also be a dictionary or array of multiple entry points.
@@ -172,7 +172,7 @@ exports.hasEverything = `
     `;
 exports.buildOption = `
     // Configuration for building your library.
-    // See: https://vitejs.dev/guide/build.html#library-mode
+    // See: https://vite.dev/guide/build.html#library-mode
     build: {
       lib: {
         // Could also be a dictionary or array of multiple entry points.