@nx/vite 18.1.0-beta.2 → 18.1.0-beta.3

package/migrations.json

@@ -53,6 +53,27 @@
     }
   },
   "packageJsonUpdates": {
+    "18.1.0": {
+      "version": "18.1.0-beta.1",
+      "packages": {
+        "vitest": {
+          "version": "^1.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitest/coverage-v8": {
+          "version": "^1.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitest/ui": {
+          "version": "^1.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitest/coverage-istanbul": {
+          "version": "^1.3.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
     "17.3.0": {
       "version": "17.3.0-beta.0",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -29,17 +29,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "18.1.0-beta.2",
+    "@nx/devkit": "18.1.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/js": "18.1.0-beta.2",
+    "@nx/js": "18.1.0-beta.3",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "18.1.0-beta.2"
+    "@nrwl/vite": "18.1.0-beta.3"
   },
   "peerDependencies": {
     "vite": "^5.0.0",
-    "vitest": "^1.0.0"
+    "vitest": "^1.3.1"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/test/lib/utils.d.ts

@@ -1,4 +1,4 @@
 import { ExecutorContext } from '@nx/devkit';
 import { VitestExecutorOptions } from '../schema';
-export declare function getOptions(options: VitestExecutorOptions, context: ExecutorContext, projectRoot: string, extraArgs: Record<string, any>): Promise<Record<string, any>>;
-export declare function getExtraArgs(options: VitestExecutorOptions): Promise<Record<string, any>>;
+export declare function getOptions(options: VitestExecutorOptions, context: ExecutorContext, projectRoot: string): Promise<Record<string, any>>;
+export declare function getOptionsAsArgv(obj: Record<string, any>): string[];

package/src/executors/test/lib/utils.js

@@ -9,8 +9,8 @@ _export(exports, {
     getOptions: function() {
         return getOptions;
     },
-    getExtraArgs: function() {
-        return getExtraArgs;
+    getOptionsAsArgv: function() {
+        return getOptionsAsArgv;
     }
 });
 const _extends = require("@swc/helpers/_/_extends");
@@ -18,7 +18,7 @@ const _devkit = require("@nx/devkit");
 const _optionsutils = require("../../../utils/options-utils");
 const _path = require("path");
 const _executorutils = require("../../../utils/executor-utils");
-async function getOptions(options, context, projectRoot, extraArgs) {
+async function getOptions(options, context, projectRoot) {
     var _resolved_config, _resolved_config1;
     // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
     const { loadConfigFromFile, mergeConfig } = await (0, _executorutils.loadViteDynamicImport)();
@@ -32,9 +32,9 @@ async function getOptions(options, context, projectRoot, extraArgs) {
         You can read more here: https://nx.dev/nx-api/vite/generators/vitest
         `);
     }
-    var _extraArgs_mode;
+    var _options_mode;
     const resolved = await loadConfigFromFile({
-        mode: (_extraArgs_mode = extraArgs == null ? void 0 : extraArgs.mode) != null ? _extraArgs_mode : 'production',
+        mode: (_options_mode = options == null ? void 0 : options.mode) != null ? _options_mode : 'production',
         command: 'serve'
     }, viteConfigPath);
     if (!viteConfigPath || !(resolved == null ? void 0 : (_resolved_config = resolved.config) == null ? void 0 : _resolved_config['test'])) {
@@ -45,7 +45,11 @@ async function getOptions(options, context, projectRoot, extraArgs) {
         `);
     }
     const root = projectRoot === '.' ? process.cwd() : (0, _path.relative)(context.cwd, (0, _devkit.joinPathFragments)(context.root, projectRoot));
-    const normalizedExtraArgs = normalizeArgs(extraArgs);
+    const { parseCLI } = await (0, _executorutils.loadVitestDynamicImport)();
+    const normalizedExtraArgs = parseCLI([
+        'vitest',
+        ...getOptionsAsArgv(options)
+    ]);
     var _resolved_config_root;
     const settings = _extends._({}, normalizedExtraArgs, {
         // This should not be needed as it's going to be set in vite.config.ts
@@ -56,50 +60,18 @@ async function getOptions(options, context, projectRoot, extraArgs) {
     var _resolved_config_test;
     return mergeConfig((_resolved_config_test = resolved == null ? void 0 : (_resolved_config1 = resolved.config) == null ? void 0 : _resolved_config1['test']) != null ? _resolved_config_test : {}, settings);
 }
-async function getExtraArgs(options) {
-    // support passing extra args to vite cli
-    const extraArgs = {};
-    for (const key of Object.keys(options)){
-        extraArgs[key] = options[key];
+function getOptionsAsArgv(obj) {
+    const argv = [];
+    for (const [key, value] of Object.entries(obj)){
+        if (Array.isArray(value)) {
+            value.forEach((item)=>argv.push(`--${key}=${item}`));
+        } else if (typeof value === 'object' && value !== null) {
+            argv.push(`--${key}='${JSON.stringify(value)}'`);
+        } else {
+            argv.push(`--${key}=${value}`);
+        }
     }
-    return extraArgs;
-}
-// normalizes some args that were previously normalized by `startVitest` until this is fixed
-// https://github.com/vitest-dev/vitest/pull/5126/files#diff-49ef635be88fe607c8682e81ab56b061ba9aafd5c94a5690a70b90a54604cd24L40-L62
-function normalizeArgs(extraArgs) {
-    var _args_typecheck;
-    const args = _extends._({}, extraArgs);
-    if (typeof args.coverage === 'boolean') {
-        args.coverage = {
-            enabled: args.coverage
-        };
-    }
-    // running "vitest --browser", assumes browser name is set in the config
-    if (typeof args.browser === 'boolean') {
-        args.browser = {
-            enabled: args.browser
-        };
-    }
-    // running "vitest --browser=chrome"
-    if (typeof args.browser === 'string') {
-        args.browser = {
-            enabled: true,
-            name: args.browser
-        };
-    }
-    if (typeof args.typecheck === 'boolean') {
-        args.typecheck = {
-            enabled: true
-        };
-    }
-    if (typeof ((_args_typecheck = args.typecheck) == null ? void 0 : _args_typecheck.only) === 'boolean') {
-        var _args;
-        var _typecheck;
-        (_typecheck = (_args = args).typecheck) != null ? _typecheck : _args.typecheck = {};
-        args.typecheck.only = true;
-        args.typecheck.enabled = true;
-    }
-    return args;
+    return argv;
 }
 
 //# sourceMappingURL=utils.js.map

package/src/executors/test/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/vite/src/executors/test/lib/utils.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  stripIndents,\n} from '@nx/devkit';\nimport { VitestExecutorOptions } from '../schema';\nimport { normalizeViteConfigFilePath } from '../../../utils/options-utils';\nimport { relative } from 'path';\nimport { loadViteDynamicImport } from '../../../utils/executor-utils';\n\nexport async function getOptions(\n  options: VitestExecutorOptions,\n  context: ExecutorContext,\n  projectRoot: string,\n  extraArgs: Record<string, any>\n) {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { loadConfigFromFile, mergeConfig } = await loadViteDynamicImport();\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    options.configFile\n  );\n\n  if (!viteConfigPath) {\n    throw new Error(\n      stripIndents`\n        Unable to load test config from config file ${viteConfigPath}.\n        \n        Please make sure that vitest is configured correctly, \n        or use the @nx/vite:vitest generator to configure it for you.\n        You can read more here: https://nx.dev/nx-api/vite/generators/vitest\n        `\n    );\n  }\n\n  const resolved = await loadConfigFromFile(\n    {\n      mode: extraArgs?.mode ?? 'production',\n      command: 'serve',\n    },\n    viteConfigPath\n  );\n\n  if (!viteConfigPath || !resolved?.config?.['test']) {\n    logger.warn(stripIndents`Unable to load test config from config file ${\n      resolved?.path ?? viteConfigPath\n    }\n  Some settings may not be applied as expected.\n  You can manually set the config in the project, ${\n    context.projectName\n  }, configuration.\n        `);\n  }\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\n\n  const normalizedExtraArgs = normalizeArgs(extraArgs);\n\n  const settings = {\n    ...normalizedExtraArgs,\n    // This should not be needed as it's going to be set in vite.config.ts\n    // but leaving it here in case someone did not migrate correctly\n    root: resolved.config.root ?? root,\n    configFile: viteConfigPath,\n  };\n\n  return mergeConfig(resolved?.config?.['test'] ?? {}, settings);\n}\n\nexport async function getExtraArgs(\n  options: VitestExecutorOptions\n): Promise<Record<string, any>> {\n  // support passing extra args to vite cli\n  const extraArgs: Record<string, any> = {};\n  for (const key of Object.keys(options)) {\n    extraArgs[key] = options[key];\n  }\n\n  return extraArgs;\n}\n\n// normalizes some args that were previously normalized by `startVitest` until this is fixed\n// https://github.com/vitest-dev/vitest/pull/5126/files#diff-49ef635be88fe607c8682e81ab56b061ba9aafd5c94a5690a70b90a54604cd24L40-L62\nfunction normalizeArgs(extraArgs: Record<string, any>) {\n  const args = { ...extraArgs };\n\n  if (typeof args.coverage === 'boolean') {\n    args.coverage = { enabled: args.coverage };\n  }\n  // running \"vitest --browser\", assumes browser name is set in the config\n  if (typeof args.browser === 'boolean') {\n    args.browser = { enabled: args.browser } as any;\n  }\n  // running \"vitest --browser=chrome\"\n  if (typeof args.browser === 'string') {\n    args.browser = { enabled: true, name: args.browser };\n  }\n  if (typeof args.typecheck === 'boolean') {\n    args.typecheck = { enabled: true };\n  }\n  if (typeof args.typecheck?.only === 'boolean') {\n    args.typecheck ??= {};\n    args.typecheck.only = true;\n    args.typecheck.enabled = true;\n  }\n\n  return args;\n}\n"],"names":["getOptions","getExtraArgs","options","context","projectRoot","extraArgs","resolved","loadConfigFromFile","mergeConfig","loadViteDynamicImport","viteConfigPath","normalizeViteConfigFilePath","root","configFile","Error","stripIndents","mode","command","config","logger","warn","path","projectName","process","cwd","relative","joinPathFragments","normalizedExtraArgs","normalizeArgs","settings","key","Object","keys","args","coverage","enabled","browser","name","typecheck","only"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/vite/src/executors/test/lib/utils.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  stripIndents,\n} from '@nx/devkit';\nimport { VitestExecutorOptions } from '../schema';\nimport { normalizeViteConfigFilePath } from '../../../utils/options-utils';\nimport { relative } from 'path';\nimport {\n  loadViteDynamicImport,\n  loadVitestDynamicImport,\n} from '../../../utils/executor-utils';\n\nexport async function getOptions(\n  options: VitestExecutorOptions,\n  context: ExecutorContext,\n  projectRoot: string\n) {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { loadConfigFromFile, mergeConfig } = await loadViteDynamicImport();\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    options.configFile\n  );\n\n  if (!viteConfigPath) {\n    throw new Error(\n      stripIndents`\n        Unable to load test config from config file ${viteConfigPath}.\n        \n        Please make sure that vitest is configured correctly, \n        or use the @nx/vite:vitest generator to configure it for you.\n        You can read more here: https://nx.dev/nx-api/vite/generators/vitest\n        `\n    );\n  }\n\n  const resolved = await loadConfigFromFile(\n    {\n      mode: options?.mode ?? 'production',\n      command: 'serve',\n    },\n    viteConfigPath\n  );\n\n  if (!viteConfigPath || !resolved?.config?.['test']) {\n    logger.warn(stripIndents`Unable to load test config from config file ${\n      resolved?.path ?? viteConfigPath\n    }\n  Some settings may not be applied as expected.\n  You can manually set the config in the project, ${\n    context.projectName\n  }, configuration.\n        `);\n  }\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\n\n  const { parseCLI } = await loadVitestDynamicImport();\n\n  const normalizedExtraArgs = parseCLI([\n    'vitest',\n    ...getOptionsAsArgv(options),\n  ]);\n\n  const settings = {\n    ...normalizedExtraArgs,\n    // This should not be needed as it's going to be set in vite.config.ts\n    // but leaving it here in case someone did not migrate correctly\n    root: resolved.config.root ?? root,\n    configFile: viteConfigPath,\n  };\n\n  return mergeConfig(resolved?.config?.['test'] ?? {}, settings);\n}\n\nexport function getOptionsAsArgv(obj: Record<string, any>): string[] {\n  const argv: string[] = [];\n\n  for (const [key, value] of Object.entries(obj)) {\n    if (Array.isArray(value)) {\n      value.forEach((item) => argv.push(`--${key}=${item}`));\n    } else if (typeof value === 'object' && value !== null) {\n      argv.push(`--${key}='${JSON.stringify(value)}'`);\n    } else {\n      argv.push(`--${key}=${value}`);\n    }\n  }\n\n  return argv;\n}\n"],"names":["getOptions","getOptionsAsArgv","options","context","projectRoot","resolved","loadConfigFromFile","mergeConfig","loadViteDynamicImport","viteConfigPath","normalizeViteConfigFilePath","root","configFile","Error","stripIndents","mode","command","config","logger","warn","path","projectName","process","cwd","relative","joinPathFragments","parseCLI","loadVitestDynamicImport","normalizedExtraArgs","settings","obj","argv","key","value","Object","entries","Array","isArray","forEach","item","push","JSON","stringify"],"mappings":";;;;;;;;IAcsBA,UAAU;eAAVA;;IAmENC,gBAAgB;eAAhBA;;;;wBA5ET;8BAEqC;sBACnB;+BAIlB;AAEA,eAAeD,WACpBE,OAA8B,EAC9BC,OAAwB,EACxBC,WAAmB;QA+BKC,kBA8BLA;IA3DnB,yFAAyF;IACzF,MAAM,EAAEC,kBAAkB,EAAEC,WAAW,EAAE,GAAG,MAAMC,IAAAA,oCAAqB;IAEvE,MAAMC,iBAAiBC,IAAAA,yCAA2B,EAChDP,QAAQQ,IAAI,EACZP,aACAF,QAAQU,UAAU;IAGpB,IAAI,CAACH,gBAAgB;QACnB,MAAM,IAAII,MACRC,IAAAA,oBAAY,CAAA,CAAC;oDACiC,EAAEL,eAAe;;;;;QAK7D,CAAC;IAEP;QAIUP;IAFV,MAAMG,WAAW,MAAMC,mBACrB;QACES,MAAMb,CAAAA,gBAAAA,2BAAAA,QAASa,IAAI,YAAbb,gBAAiB;QACvBc,SAAS;IACX,GACAP;IAGF,IAAI,CAACA,kBAAkB,EAACJ,6BAAAA,mBAAAA,SAAUY,MAAM,qBAAhBZ,gBAAkB,CAAC,OAAO,GAAE;YAEhDA;QADFa,cAAM,CAACC,IAAI,CAACL,IAAAA,oBAAY,CAAA,CAAC,4CAA4C,EACnET,CAAAA,iBAAAA,4BAAAA,SAAUe,IAAI,YAAdf,iBAAkBI,eACnB;;kDAE6C,EAC9CN,QAAQkB,WAAW,CACpB;QACK,CAAC;IACP;IACA,MAAMV,OACJP,gBAAgB,MACZkB,QAAQC,GAAG,KACXC,IAAAA,cAAQ,EAACrB,QAAQoB,GAAG,EAAEE,IAAAA,yBAAiB,EAACtB,QAAQQ,IAAI,EAAEP;IAE5D,MAAM,EAAEsB,QAAQ,EAAE,GAAG,MAAMC,IAAAA,sCAAuB;IAElD,MAAMC,sBAAsBF,SAAS;QACnC;WACGzB,iBAAiBC;KACrB;QAMOG;IAJR,MAAMwB,WAAW,eACZD;QACH,sEAAsE;QACtE,gEAAgE;QAChEjB,MAAMN,CAAAA,wBAAAA,SAASY,MAAM,CAACN,IAAI,YAApBN,wBAAwBM;QAC9BC,YAAYH;;QAGKJ;IAAnB,OAAOE,YAAYF,CAAAA,wBAAAA,6BAAAA,oBAAAA,SAAUY,MAAM,qBAAhBZ,iBAAkB,CAAC,OAAO,YAA1BA,wBAA8B,CAAC,GAAGwB;AACvD;AAEO,SAAS5B,iBAAiB6B,GAAwB;IACvD,MAAMC,OAAiB,EAAE;IAEzB,KAAK,MAAM,CAACC,KAAKC,MAAM,IAAIC,OAAOC,OAAO,CAACL,KAAM;QAC9C,IAAIM,MAAMC,OAAO,CAACJ,QAAQ;YACxBA,MAAMK,OAAO,CAAC,CAACC,OAASR,KAAKS,IAAI,CAAC,CAAC,EAAE,EAAER,IAAI,CAAC,EAAEO,KAAK,CAAC;QACtD,OAAO,IAAI,OAAON,UAAU,YAAYA,UAAU,MAAM;YACtDF,KAAKS,IAAI,CAAC,CAAC,EAAE,EAAER,IAAI,EAAE,EAAES,KAAKC,SAAS,CAACT,OAAO,CAAC,CAAC;QACjD,OAAO;YACLF,KAAKS,IAAI,CAAC,CAAC,EAAE,EAAER,IAAI,CAAC,EAAEC,MAAM,CAAC;QAC/B;IACF;IAEA,OAAOF;AACT"}

package/src/executors/test/schema.d.ts

@@ -3,4 +3,5 @@ export interface VitestExecutorOptions {
   reportsDirectory?: string;
   testFiles?: string[];
   watch?: boolean;
+  mode?: string;
 }

package/src/executors/test/schema.json

@@ -17,6 +17,10 @@
       "type": "string",
       "description": "Directory to write coverage report to."
     },
+    "mode": {
+      "type": "string",
+      "description": "Mode for Vite."
+    },
     "testFiles": {
       "aliases": ["testFile"],
       "type": "array",

package/src/executors/test/vitest.impl.js

@@ -18,15 +18,15 @@ const _path = require("path");
 const _internal = require("@nx/js/src/internal");
 const _nxreporter = require("./lib/nx-reporter");
 const _utils = require("./lib/utils");
+const _executorutils = require("../../utils/executor-utils");
 async function* vitestExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     (0, _internal.registerTsConfigPaths)((0, _path.resolve)(_devkit.workspaceRoot, projectRoot, 'tsconfig.json'));
     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 { startVitest } = await Function('return import("vitest/node")')();
-    const extraArgs = await (0, _utils.getExtraArgs)(options);
+    const { startVitest } = await (0, _executorutils.loadVitestDynamicImport)();
     var _ref;
-    const resolvedOptions = (_ref = await (0, _utils.getOptions)(options, context, projectRoot, extraArgs)) != null ? _ref : {};
+    const resolvedOptions = (_ref = await (0, _utils.getOptions)(options, context, projectRoot)) != null ? _ref : {};
     const nxReporter = new _nxreporter.NxReporter(resolvedOptions['watch']);
     if (resolvedOptions['reporters'] === undefined) {
         resolvedOptions['reporters'] = [];

package/src/executors/test/vitest.impl.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/executors/test/vitest.impl.ts"],"sourcesContent":["import { ExecutorContext, workspaceRoot } from '@nx/devkit';\nimport { VitestExecutorOptions } from './schema';\nimport { resolve } from 'path';\nimport { registerTsConfigPaths } from '@nx/js/src/internal';\nimport { NxReporter } from './lib/nx-reporter';\nimport { getExtraArgs, getOptions } from './lib/utils';\n\nexport async function* vitestExecutor(\n  options: VitestExecutorOptions,\n  context: ExecutorContext\n) {\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n\n  registerTsConfigPaths(resolve(workspaceRoot, projectRoot, 'tsconfig.json'));\n\n  process.env.VITE_CJS_IGNORE_WARNING = 'true';\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { startVitest } = await (Function(\n    'return import(\"vitest/node\")'\n  )() as Promise<typeof import('vitest/node')>);\n\n  const extraArgs = await getExtraArgs(options);\n  const resolvedOptions =\n    (await getOptions(options, context, projectRoot, extraArgs)) ?? {};\n\n  const nxReporter = new NxReporter(resolvedOptions['watch']);\n  if (resolvedOptions['reporters'] === undefined) {\n    resolvedOptions['reporters'] = [];\n  } else if (typeof resolvedOptions['reporters'] === 'string') {\n    resolvedOptions['reporters'] = [resolvedOptions['reporters']];\n  }\n  resolvedOptions['reporters'].push(nxReporter);\n\n  const cliFilters = options.testFiles ?? [];\n\n  const ctx = await startVitest(\n    resolvedOptions['mode'] ?? 'test',\n    cliFilters,\n    resolvedOptions\n  );\n\n  let hasErrors = false;\n\n  const processExit = () => {\n    ctx.exit();\n    if (hasErrors) {\n      process.exit(1);\n    } else {\n      process.exit(0);\n    }\n  };\n\n  if (resolvedOptions['watch'] === true) {\n    process.on('SIGINT', processExit);\n    process.on('SIGTERM', processExit);\n    process.on('exit', processExit);\n  }\n\n  for await (const report of nxReporter) {\n    // vitest sets the exitCode = 1 when code coverage isn't met\n    hasErrors =\n      report.hasErrors || (process.exitCode && process.exitCode !== 0);\n  }\n\n  return {\n    success: !hasErrors,\n  };\n}\n\nexport default vitestExecutor;\n"],"names":["vitestExecutor","options","context","projectRoot","projectsConfigurations","projects","projectName","root","registerTsConfigPaths","resolve","workspaceRoot","process","env","VITE_CJS_IGNORE_WARNING","startVitest","Function","extraArgs","getExtraArgs","resolvedOptions","getOptions","nxReporter","NxReporter","undefined","push","cliFilters","testFiles","ctx","hasErrors","processExit","exit","on","report","exitCode","success"],"mappings":";;;;;;;;IAOuBA,cAAc;eAAdA;;IA+DvB,OAA8B;eAA9B;;;wBAtE+C;sBAEvB;0BACc;4BACX;uBACc;AAElC,gBAAgBA,eACrBC,OAA8B,EAC9BC,OAAwB;IAExB,MAAMC,cACJD,QAAQE,sBAAsB,CAACC,QAAQ,CAACH,QAAQI,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,+BAAqB,EAACC,IAAAA,aAAO,EAACC,qBAAa,EAAEP,aAAa;IAE1DQ,QAAQC,GAAG,CAACC,uBAAuB,GAAG;IACtC,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAE,GAAG,MAAOC,SAC7B;IAGF,MAAMC,YAAY,MAAMC,IAAAA,mBAAY,EAAChB;QAElC;IADH,MAAMiB,kBACJ,CAAC,OAAA,MAAMC,IAAAA,iBAAU,EAAClB,SAASC,SAASC,aAAaa,sBAAhD,OAA+D,CAAC;IAEnE,MAAMI,aAAa,IAAIC,sBAAU,CAACH,eAAe,CAAC,QAAQ;IAC1D,IAAIA,eAAe,CAAC,YAAY,KAAKI,WAAW;QAC9CJ,eAAe,CAAC,YAAY,GAAG,EAAE;IACnC,OAAO,IAAI,OAAOA,eAAe,CAAC,YAAY,KAAK,UAAU;QAC3DA,eAAe,CAAC,YAAY,GAAG;YAACA,eAAe,CAAC,YAAY;SAAC;IAC/D;IACAA,eAAe,CAAC,YAAY,CAACK,IAAI,CAACH;QAEfnB;IAAnB,MAAMuB,aAAavB,CAAAA,qBAAAA,QAAQwB,SAAS,YAAjBxB,qBAAqB,EAAE;QAGxCiB;IADF,MAAMQ,MAAM,MAAMZ,YAChBI,CAAAA,wBAAAA,eAAe,CAAC,OAAO,YAAvBA,wBAA2B,QAC3BM,YACAN;IAGF,IAAIS,YAAY;IAEhB,MAAMC,cAAc;QAClBF,IAAIG,IAAI;QACR,IAAIF,WAAW;YACbhB,QAAQkB,IAAI,CAAC;QACf,OAAO;YACLlB,QAAQkB,IAAI,CAAC;QACf;IACF;IAEA,IAAIX,eAAe,CAAC,QAAQ,KAAK,MAAM;QACrCP,QAAQmB,EAAE,CAAC,UAAUF;QACrBjB,QAAQmB,EAAE,CAAC,WAAWF;QACtBjB,QAAQmB,EAAE,CAAC,QAAQF;IACrB;IAEA,WAAW,MAAMG,UAAUX,WAAY;QACrC,4DAA4D;QAC5DO,YACEI,OAAOJ,SAAS,IAAKhB,QAAQqB,QAAQ,IAAIrB,QAAQqB,QAAQ,KAAK;IAClE;IAEA,OAAO;QACLC,SAAS,CAACN;IACZ;AACF;MAEA,WAAe3B"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/test/vitest.impl.ts"],"sourcesContent":["import { ExecutorContext, workspaceRoot } from '@nx/devkit';\nimport { VitestExecutorOptions } from './schema';\nimport { resolve } from 'path';\nimport { registerTsConfigPaths } from '@nx/js/src/internal';\nimport { NxReporter } from './lib/nx-reporter';\nimport { getOptions } from './lib/utils';\nimport { loadVitestDynamicImport } from '../../utils/executor-utils';\n\nexport async function* vitestExecutor(\n  options: VitestExecutorOptions,\n  context: ExecutorContext\n) {\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n\n  registerTsConfigPaths(resolve(workspaceRoot, projectRoot, 'tsconfig.json'));\n\n  process.env.VITE_CJS_IGNORE_WARNING = 'true';\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { startVitest } = await loadVitestDynamicImport();\n\n  const resolvedOptions =\n    (await getOptions(options, context, projectRoot)) ?? {};\n\n  const nxReporter = new NxReporter(resolvedOptions['watch']);\n  if (resolvedOptions['reporters'] === undefined) {\n    resolvedOptions['reporters'] = [];\n  } else if (typeof resolvedOptions['reporters'] === 'string') {\n    resolvedOptions['reporters'] = [resolvedOptions['reporters']];\n  }\n  resolvedOptions['reporters'].push(nxReporter);\n\n  const cliFilters = options.testFiles ?? [];\n\n  const ctx = await startVitest(\n    resolvedOptions['mode'] ?? 'test',\n    cliFilters,\n    resolvedOptions\n  );\n\n  let hasErrors = false;\n\n  const processExit = () => {\n    ctx.exit();\n    if (hasErrors) {\n      process.exit(1);\n    } else {\n      process.exit(0);\n    }\n  };\n\n  if (resolvedOptions['watch'] === true) {\n    process.on('SIGINT', processExit);\n    process.on('SIGTERM', processExit);\n    process.on('exit', processExit);\n  }\n\n  for await (const report of nxReporter) {\n    // vitest sets the exitCode = 1 when code coverage isn't met\n    hasErrors =\n      report.hasErrors || (process.exitCode && process.exitCode !== 0);\n  }\n\n  return {\n    success: !hasErrors,\n  };\n}\n\nexport default vitestExecutor;\n"],"names":["vitestExecutor","options","context","projectRoot","projectsConfigurations","projects","projectName","root","registerTsConfigPaths","resolve","workspaceRoot","process","env","VITE_CJS_IGNORE_WARNING","startVitest","loadVitestDynamicImport","resolvedOptions","getOptions","nxReporter","NxReporter","undefined","push","cliFilters","testFiles","ctx","hasErrors","processExit","exit","on","report","exitCode","success"],"mappings":";;;;;;;;IAQuBA,cAAc;eAAdA;;IA4DvB,OAA8B;eAA9B;;;wBApE+C;sBAEvB;0BACc;4BACX;uBACA;+BACa;AAEjC,gBAAgBA,eACrBC,OAA8B,EAC9BC,OAAwB;IAExB,MAAMC,cACJD,QAAQE,sBAAsB,CAACC,QAAQ,CAACH,QAAQI,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,+BAAqB,EAACC,IAAAA,aAAO,EAACC,qBAAa,EAAEP,aAAa;IAE1DQ,QAAQC,GAAG,CAACC,uBAAuB,GAAG;IACtC,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAE,GAAG,MAAMC,IAAAA,sCAAuB;QAGlD;IADH,MAAMC,kBACJ,CAAC,OAAA,MAAMC,IAAAA,iBAAU,EAAChB,SAASC,SAASC,wBAAnC,OAAoD,CAAC;IAExD,MAAMe,aAAa,IAAIC,sBAAU,CAACH,eAAe,CAAC,QAAQ;IAC1D,IAAIA,eAAe,CAAC,YAAY,KAAKI,WAAW;QAC9CJ,eAAe,CAAC,YAAY,GAAG,EAAE;IACnC,OAAO,IAAI,OAAOA,eAAe,CAAC,YAAY,KAAK,UAAU;QAC3DA,eAAe,CAAC,YAAY,GAAG;YAACA,eAAe,CAAC,YAAY;SAAC;IAC/D;IACAA,eAAe,CAAC,YAAY,CAACK,IAAI,CAACH;QAEfjB;IAAnB,MAAMqB,aAAarB,CAAAA,qBAAAA,QAAQsB,SAAS,YAAjBtB,qBAAqB,EAAE;QAGxCe;IADF,MAAMQ,MAAM,MAAMV,YAChBE,CAAAA,wBAAAA,eAAe,CAAC,OAAO,YAAvBA,wBAA2B,QAC3BM,YACAN;IAGF,IAAIS,YAAY;IAEhB,MAAMC,cAAc;QAClBF,IAAIG,IAAI;QACR,IAAIF,WAAW;YACbd,QAAQgB,IAAI,CAAC;QACf,OAAO;YACLhB,QAAQgB,IAAI,CAAC;QACf;IACF;IAEA,IAAIX,eAAe,CAAC,QAAQ,KAAK,MAAM;QACrCL,QAAQiB,EAAE,CAAC,UAAUF;QACrBf,QAAQiB,EAAE,CAAC,WAAWF;QACtBf,QAAQiB,EAAE,CAAC,QAAQF;IACrB;IAEA,WAAW,MAAMG,UAAUX,WAAY;QACrC,4DAA4D;QAC5DO,YACEI,OAAOJ,SAAS,IAAKd,QAAQmB,QAAQ,IAAInB,QAAQmB,QAAQ,KAAK;IAClE;IAEA,OAAO;QACLC,SAAS,CAACN;IACZ;AACF;MAEA,WAAezB"}

package/src/generators/configuration/configuration.js

@@ -35,8 +35,10 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
     // The @nx/js:lib generator specifically sets this to node to be more generic.
     _schema2;
     const tasks = [];
+    const nxJson = (0, _devkit.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' && nxJson.useInferencePlugins !== false;
     var _addPlugin;
-    (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = process.env.NX_ADD_PLUGINS !== 'false';
+    (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = addPluginDefault;
     const projectConfig = (0, _devkit.readProjectConfiguration)(tree, schema.project);
     const { targets, root: projectRoot } = projectConfig;
     var _projectConfig_projectType;
@@ -62,7 +64,6 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
     }));
     tasks.push(initTask);
     tasks.push((0, _ensuredependencies.ensureDependencies)(tree, schema));
-    const nxJson = (0, _devkit.readNxJson)(tree);
     const hasPlugin = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin');
     if (!hasPlugin) {
         if (!projectAlreadyHasViteTargets.build) {

package/src/generators/configuration/configuration.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"sourcesContent":["import {\n  formatFiles,\n  GeneratorCallback,\n  joinPathFragments,\n  readNxJson,\n  readProjectConfiguration,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n  addBuildTarget,\n  addServeTarget,\n  addPreviewTarget,\n  createOrEditViteConfig,\n  TargetFlags,\n} from '../../utils/generator-utils';\n\nimport initGenerator from '../init/init';\nimport vitestGenerator from '../vitest/vitest-generator';\nimport { ViteConfigurationGeneratorSchema } from './schema';\nimport { ensureDependencies } from '../../utils/ensure-dependencies';\nimport { convertNonVite } from './lib/convert-non-vite';\n\nexport function viteConfigurationGenerator(\n  host: Tree,\n  schema: ViteConfigurationGeneratorSchema\n) {\n  return viteConfigurationGeneratorInternal(host, {\n    addPlugin: false,\n    ...schema,\n  });\n}\n\nexport async function viteConfigurationGeneratorInternal(\n  tree: Tree,\n  schema: ViteConfigurationGeneratorSchema\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';\n\n  const projectConfig = readProjectConfiguration(tree, schema.project);\n  const { targets, root: projectRoot } = projectConfig;\n\n  const projectType = projectConfig.projectType ?? 'library';\n\n  schema.includeLib ??= projectType === 'library';\n\n  // Setting default to jsdom since it is the most common use case (React, Web).\n  // The @nx/js:lib generator specifically sets this to node to be more generic.\n  schema.testEnvironment ??= 'jsdom';\n\n  /**\n   * This is for when we are converting an existing project\n   * to use the vite executors.\n   */\n  let projectAlreadyHasViteTargets: TargetFlags = {};\n\n  if (!schema.newProject) {\n    await convertNonVite(tree, schema, projectRoot, projectType, targets);\n  }\n\n  const jsInitTask = await jsInitGenerator(tree, {\n    ...schema,\n    skipFormat: true,\n    tsConfigName: projectRoot === '.' ? 'tsconfig.json' : 'tsconfig.base.json',\n  });\n  tasks.push(jsInitTask);\n  const initTask = await initGenerator(tree, { ...schema, skipFormat: true });\n  tasks.push(initTask);\n  tasks.push(ensureDependencies(tree, schema));\n\n  const nxJson = readNxJson(tree);\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    if (!projectAlreadyHasViteTargets.build) {\n      addBuildTarget(tree, schema, 'build');\n    }\n\n    if (!schema.includeLib) {\n      if (!projectAlreadyHasViteTargets.serve) {\n        addServeTarget(tree, schema, 'serve');\n      }\n      if (!projectAlreadyHasViteTargets.preview) {\n        addPreviewTarget(tree, schema, 'preview');\n      }\n    }\n  }\n  if (projectType === 'library') {\n    // update tsconfig.lib.json to include vite/client\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.lib.json'),\n      (json) => {\n        if (!json.compilerOptions) {\n          json.compilerOptions = {};\n        }\n        if (!json.compilerOptions.types) {\n          json.compilerOptions.types = [];\n        }\n        if (!json.compilerOptions.types.includes('vite/client')) {\n          return {\n            ...json,\n            compilerOptions: {\n              ...json.compilerOptions,\n              types: [...json.compilerOptions.types, 'vite/client'],\n            },\n          };\n        }\n        return json;\n      }\n    );\n  }\n\n  if (!schema.newProject) {\n    // We are converting existing project to use Vite\n    if (schema.uiFramework === 'react') {\n      createOrEditViteConfig(\n        tree,\n        {\n          project: schema.project,\n          includeLib: schema.includeLib,\n          includeVitest: schema.includeVitest,\n          inSourceTests: schema.inSourceTests,\n          rollupOptionsExternal: [\n            \"'react'\",\n            \"'react-dom'\",\n            \"'react/jsx-runtime'\",\n          ],\n          imports: [\n            schema.compiler === 'swc'\n              ? `import react from '@vitejs/plugin-react-swc'`\n              : `import react from '@vitejs/plugin-react'`,\n          ],\n          plugins: ['react()'],\n        },\n        false,\n        undefined\n      );\n    } else {\n      createOrEditViteConfig(tree, schema, false, projectAlreadyHasViteTargets);\n    }\n  }\n\n  if (schema.includeVitest) {\n    const vitestTask = await vitestGenerator(tree, {\n      project: schema.project,\n      uiFramework: schema.uiFramework,\n      inSourceTests: schema.inSourceTests,\n      coverageProvider: 'v8',\n      skipViteConfig: true,\n      testTarget: 'test',\n      skipFormat: true,\n      addPlugin: schema.addPlugin,\n    });\n    tasks.push(vitestTask);\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default viteConfigurationGenerator;\n"],"names":["viteConfigurationGenerator","viteConfigurationGeneratorInternal","host","schema","addPlugin","tree","nxJson","tasks","process","env","NX_ADD_PLUGINS","projectConfig","readProjectConfiguration","project","targets","root","projectRoot","projectType","includeLib","testEnvironment","projectAlreadyHasViteTargets","newProject","convertNonVite","jsInitTask","jsInitGenerator","skipFormat","tsConfigName","push","initTask","initGenerator","ensureDependencies","readNxJson","hasPlugin","plugins","some","p","plugin","build","addBuildTarget","serve","addServeTarget","preview","addPreviewTarget","updateJson","joinPathFragments","json","compilerOptions","types","includes","uiFramework","createOrEditViteConfig","includeVitest","inSourceTests","rollupOptionsExternal","imports","compiler","undefined","vitestTask","vitestGenerator","coverageProvider","skipViteConfig","testTarget","formatFiles","runTasksInSerial"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/configuration/configuration.ts"],"sourcesContent":["import {\n  formatFiles,\n  GeneratorCallback,\n  joinPathFragments,\n  readNxJson,\n  readProjectConfiguration,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n  addBuildTarget,\n  addServeTarget,\n  addPreviewTarget,\n  createOrEditViteConfig,\n  TargetFlags,\n} from '../../utils/generator-utils';\n\nimport initGenerator from '../init/init';\nimport vitestGenerator from '../vitest/vitest-generator';\nimport { ViteConfigurationGeneratorSchema } from './schema';\nimport { ensureDependencies } from '../../utils/ensure-dependencies';\nimport { convertNonVite } from './lib/convert-non-vite';\n\nexport function viteConfigurationGenerator(\n  host: Tree,\n  schema: ViteConfigurationGeneratorSchema\n) {\n  return viteConfigurationGeneratorInternal(host, {\n    addPlugin: false,\n    ...schema,\n  });\n}\n\nexport async function viteConfigurationGeneratorInternal(\n  tree: Tree,\n  schema: ViteConfigurationGeneratorSchema\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const nxJson = readNxJson(tree);\n  const addPluginDefault =\n    process.env.NX_ADD_PLUGINS !== 'false' &&\n    nxJson.useInferencePlugins !== false;\n  schema.addPlugin ??= addPluginDefault;\n\n  const projectConfig = readProjectConfiguration(tree, schema.project);\n  const { targets, root: projectRoot } = projectConfig;\n\n  const projectType = projectConfig.projectType ?? 'library';\n\n  schema.includeLib ??= projectType === 'library';\n\n  // Setting default to jsdom since it is the most common use case (React, Web).\n  // The @nx/js:lib generator specifically sets this to node to be more generic.\n  schema.testEnvironment ??= 'jsdom';\n\n  /**\n   * This is for when we are converting an existing project\n   * to use the vite executors.\n   */\n  let projectAlreadyHasViteTargets: TargetFlags = {};\n\n  if (!schema.newProject) {\n    await convertNonVite(tree, schema, projectRoot, projectType, targets);\n  }\n\n  const jsInitTask = await jsInitGenerator(tree, {\n    ...schema,\n    skipFormat: true,\n    tsConfigName: projectRoot === '.' ? 'tsconfig.json' : 'tsconfig.base.json',\n  });\n  tasks.push(jsInitTask);\n  const initTask = await initGenerator(tree, { ...schema, skipFormat: true });\n  tasks.push(initTask);\n  tasks.push(ensureDependencies(tree, schema));\n\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    if (!projectAlreadyHasViteTargets.build) {\n      addBuildTarget(tree, schema, 'build');\n    }\n\n    if (!schema.includeLib) {\n      if (!projectAlreadyHasViteTargets.serve) {\n        addServeTarget(tree, schema, 'serve');\n      }\n      if (!projectAlreadyHasViteTargets.preview) {\n        addPreviewTarget(tree, schema, 'preview');\n      }\n    }\n  }\n  if (projectType === 'library') {\n    // update tsconfig.lib.json to include vite/client\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.lib.json'),\n      (json) => {\n        if (!json.compilerOptions) {\n          json.compilerOptions = {};\n        }\n        if (!json.compilerOptions.types) {\n          json.compilerOptions.types = [];\n        }\n        if (!json.compilerOptions.types.includes('vite/client')) {\n          return {\n            ...json,\n            compilerOptions: {\n              ...json.compilerOptions,\n              types: [...json.compilerOptions.types, 'vite/client'],\n            },\n          };\n        }\n        return json;\n      }\n    );\n  }\n\n  if (!schema.newProject) {\n    // We are converting existing project to use Vite\n    if (schema.uiFramework === 'react') {\n      createOrEditViteConfig(\n        tree,\n        {\n          project: schema.project,\n          includeLib: schema.includeLib,\n          includeVitest: schema.includeVitest,\n          inSourceTests: schema.inSourceTests,\n          rollupOptionsExternal: [\n            \"'react'\",\n            \"'react-dom'\",\n            \"'react/jsx-runtime'\",\n          ],\n          imports: [\n            schema.compiler === 'swc'\n              ? `import react from '@vitejs/plugin-react-swc'`\n              : `import react from '@vitejs/plugin-react'`,\n          ],\n          plugins: ['react()'],\n        },\n        false,\n        undefined\n      );\n    } else {\n      createOrEditViteConfig(tree, schema, false, projectAlreadyHasViteTargets);\n    }\n  }\n\n  if (schema.includeVitest) {\n    const vitestTask = await vitestGenerator(tree, {\n      project: schema.project,\n      uiFramework: schema.uiFramework,\n      inSourceTests: schema.inSourceTests,\n      coverageProvider: 'v8',\n      skipViteConfig: true,\n      testTarget: 'test',\n      skipFormat: true,\n      addPlugin: schema.addPlugin,\n    });\n    tasks.push(vitestTask);\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default viteConfigurationGenerator;\n"],"names":["viteConfigurationGenerator","viteConfigurationGeneratorInternal","host","schema","addPlugin","tree","nxJson","tasks","readNxJson","addPluginDefault","process","env","NX_ADD_PLUGINS","useInferencePlugins","projectConfig","readProjectConfiguration","project","targets","root","projectRoot","projectType","includeLib","testEnvironment","projectAlreadyHasViteTargets","newProject","convertNonVite","jsInitTask","jsInitGenerator","skipFormat","tsConfigName","push","initTask","initGenerator","ensureDependencies","hasPlugin","plugins","some","p","plugin","build","addBuildTarget","serve","addServeTarget","preview","addPreviewTarget","updateJson","joinPathFragments","json","compilerOptions","types","includes","uiFramework","createOrEditViteConfig","includeVitest","inSourceTests","rollupOptionsExternal","imports","compiler","undefined","vitestTask","vitestGenerator","coverageProvider","skipViteConfig","testTarget","formatFiles","runTasksInSerial"],"mappings":"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"}

package/src/generators/init/init.js

@@ -56,8 +56,10 @@ function initGenerator(tree, schema) {
 }
 async function initGeneratorInternal(tree, schema) {
     var _schema;
+    const nxJson = (0, _devkit.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' && nxJson.useInferencePlugins !== false;
     var _addPlugin;
-    (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = process.env.NX_ADD_PLUGINS !== 'false';
+    (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = addPluginDefault;
     if (schema.addPlugin) {
         (0, _utils.addPlugin)(tree);
     }

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  formatFiles,\n  GeneratorCallback,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateNxJson,\n} from '@nx/devkit';\nimport { updatePackageScripts } from '@nx/devkit/src/utils/update-package-scripts';\n\nimport { createNodes } from '../../plugins/plugin';\nimport { InitGeneratorSchema } from './schema';\nimport {\n  addPlugin,\n  checkDependenciesInstalled,\n  moveToDevDependencies,\n} from './lib/utils';\n\nexport function updateNxJsonSettings(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    nxJson.targetDefaults ??= {};\n    nxJson.targetDefaults['@nx/vite:test'] ??= {};\n    nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n    nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n      'default',\n      productionFileSet ? '^production' : '^default',\n    ];\n  }\n\n  updateNxJson(tree, nxJson);\n}\n\nexport function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  return initGeneratorInternal(tree, { addPlugin: false, ...schema });\n}\n\nexport async function initGeneratorInternal(\n  tree: Tree,\n  schema: InitGeneratorSchema\n) {\n  schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';\n  if (schema.addPlugin) {\n    addPlugin(tree);\n  }\n\n  updateNxJsonSettings(tree);\n\n  const tasks: GeneratorCallback[] = [];\n  if (!schema.skipPackageJson) {\n    tasks.push(moveToDevDependencies(tree));\n    tasks.push(checkDependenciesInstalled(tree, schema));\n  }\n\n  if (schema.updatePackageScripts) {\n    await updatePackageScripts(tree, createNodes);\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["updateNxJsonSettings","initGenerator","initGeneratorInternal","tree","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","hasPlugin","plugins","some","p","plugin","targetDefaults","cache","inputs","updateNxJson","schema","addPlugin","process","env","NX_ADD_PLUGINS","tasks","skipPackageJson","moveToDevDependencies","checkDependenciesInstalled","updatePackageScripts","createNodes","skipFormat","formatFiles","runTasksInSerial"],"mappings":";;;;;;;;IAkBgBA,oBAAoB;eAApBA;;IAgCAC,aAAa;eAAbA;;IAIMC,qBAAqB;eAArBA;;IA4BtB,OAA6B;eAA7B;;;;wBA3EO;sCAC8B;wBAET;uBAMrB;AAEA,SAASF,qBAAqBG,IAAU;QAGnBC,qBAURA;IAZlB,MAAMA,SAASC,IAAAA,kBAAU,EAACF;IAE1B,MAAMG,qBAAoBF,sBAAAA,OAAOG,WAAW,qBAAlBH,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD;IAEA,MAAMO,aAAYT,kBAAAA,OAAOU,OAAO,qBAAdV,gBAAgBW,IAAI,CAAC,CAACC,IACtC,OAAOA,MAAM,WACTA,MAAM,oBACNA,EAAEC,MAAM,KAAK;IAGnB,IAAI,CAACJ,WAAW;YACdT,SACAA,wBAAsB,aACtBA,mCACAA;;QAHAA,oBAAAA,UAAAA,QAAOc,4CAAPd,QAAOc,iBAAmB,CAAC;;QAC3Bd,MAAAA,yBAAAA,OAAOc,cAAc,CAAA,CAAC,cAAA,gBAAgB,gBAAtCd,sBAAqB,CAAC,YAAgB,GAAK,CAAC;;QAC5CA,WAAAA,oCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACC,0BAAvCf,kCAAuCe,QAAU;;QACjDf,YAAAA,qCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACE,4BAAvChB,mCAAuCgB,SAAW;YAChD;YACAd,oBAAoB,gBAAgB;SACrC;IACH;IAEAe,IAAAA,oBAAY,EAAClB,MAAMC;AACrB;AAEO,SAASH,cAAcE,IAAU,EAAEmB,MAA2B;IACnE,OAAOpB,sBAAsBC,MAAM;QAAEoB,WAAW;OAAUD;AAC5D;AAEO,eAAepB,sBACpBC,IAAU,EACVmB,MAA2B;QAE3BA;;IAAAA,eAAAA,UAAAA,QAAOC,kCAAPD,QAAOC,YAAcC,QAAQC,GAAG,CAACC,cAAc,KAAK;IACpD,IAAIJ,OAAOC,SAAS,EAAE;QACpBA,IAAAA,gBAAS,EAACpB;IACZ;IAEAH,qBAAqBG;IAErB,MAAMwB,QAA6B,EAAE;IACrC,IAAI,CAACL,OAAOM,eAAe,EAAE;QAC3BD,MAAMlB,IAAI,CAACoB,IAAAA,4BAAqB,EAAC1B;QACjCwB,MAAMlB,IAAI,CAACqB,IAAAA,iCAA0B,EAAC3B,MAAMmB;IAC9C;IAEA,IAAIA,OAAOS,oBAAoB,EAAE;QAC/B,MAAMA,IAAAA,0CAAoB,EAAC5B,MAAM6B,mBAAW;IAC9C;IAEA,IAAI,CAACV,OAAOW,UAAU,EAAE;QACtB,MAAMC,IAAAA,mBAAW,EAAC/B;IACpB;IAEA,OAAOgC,IAAAA,wBAAgB,KAAIR;AAC7B;MAEA,WAAe1B"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  formatFiles,\n  GeneratorCallback,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateNxJson,\n} from '@nx/devkit';\nimport { updatePackageScripts } from '@nx/devkit/src/utils/update-package-scripts';\n\nimport { createNodes } from '../../plugins/plugin';\nimport { InitGeneratorSchema } from './schema';\nimport {\n  addPlugin,\n  checkDependenciesInstalled,\n  moveToDevDependencies,\n} from './lib/utils';\n\nexport function updateNxJsonSettings(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    nxJson.targetDefaults ??= {};\n    nxJson.targetDefaults['@nx/vite:test'] ??= {};\n    nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n    nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n      'default',\n      productionFileSet ? '^production' : '^default',\n    ];\n  }\n\n  updateNxJson(tree, nxJson);\n}\n\nexport function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  return initGeneratorInternal(tree, { addPlugin: false, ...schema });\n}\n\nexport async function initGeneratorInternal(\n  tree: Tree,\n  schema: InitGeneratorSchema\n) {\n  const nxJson = readNxJson(tree);\n  const addPluginDefault =\n    process.env.NX_ADD_PLUGINS !== 'false' &&\n    nxJson.useInferencePlugins !== false;\n  schema.addPlugin ??= addPluginDefault;\n  if (schema.addPlugin) {\n    addPlugin(tree);\n  }\n\n  updateNxJsonSettings(tree);\n\n  const tasks: GeneratorCallback[] = [];\n  if (!schema.skipPackageJson) {\n    tasks.push(moveToDevDependencies(tree));\n    tasks.push(checkDependenciesInstalled(tree, schema));\n  }\n\n  if (schema.updatePackageScripts) {\n    await updatePackageScripts(tree, createNodes);\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["updateNxJsonSettings","initGenerator","initGeneratorInternal","tree","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","hasPlugin","plugins","some","p","plugin","targetDefaults","cache","inputs","updateNxJson","schema","addPlugin","addPluginDefault","process","env","NX_ADD_PLUGINS","useInferencePlugins","tasks","skipPackageJson","moveToDevDependencies","checkDependenciesInstalled","updatePackageScripts","createNodes","skipFormat","formatFiles","runTasksInSerial"],"mappings":";;;;;;;;IAkBgBA,oBAAoB;eAApBA;;IAgCAC,aAAa;eAAbA;;IAIMC,qBAAqB;eAArBA;;IAgCtB,OAA6B;eAA7B;;;;wBA/EO;sCAC8B;wBAET;uBAMrB;AAEA,SAASF,qBAAqBG,IAAU;QAGnBC,qBAURA;IAZlB,MAAMA,SAASC,IAAAA,kBAAU,EAACF;IAE1B,MAAMG,qBAAoBF,sBAAAA,OAAOG,WAAW,qBAAlBH,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD;IAEA,MAAMO,aAAYT,kBAAAA,OAAOU,OAAO,qBAAdV,gBAAgBW,IAAI,CAAC,CAACC,IACtC,OAAOA,MAAM,WACTA,MAAM,oBACNA,EAAEC,MAAM,KAAK;IAGnB,IAAI,CAACJ,WAAW;YACdT,SACAA,wBAAsB,aACtBA,mCACAA;;QAHAA,oBAAAA,UAAAA,QAAOc,4CAAPd,QAAOc,iBAAmB,CAAC;;QAC3Bd,MAAAA,yBAAAA,OAAOc,cAAc,CAAA,CAAC,cAAA,gBAAgB,gBAAtCd,sBAAqB,CAAC,YAAgB,GAAK,CAAC;;QAC5CA,WAAAA,oCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACC,0BAAvCf,kCAAuCe,QAAU;;QACjDf,YAAAA,qCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACE,4BAAvChB,mCAAuCgB,SAAW;YAChD;YACAd,oBAAoB,gBAAgB;SACrC;IACH;IAEAe,IAAAA,oBAAY,EAAClB,MAAMC;AACrB;AAEO,SAASH,cAAcE,IAAU,EAAEmB,MAA2B;IACnE,OAAOpB,sBAAsBC,MAAM;QAAEoB,WAAW;OAAUD;AAC5D;AAEO,eAAepB,sBACpBC,IAAU,EACVmB,MAA2B;QAM3BA;IAJA,MAAMlB,SAASC,IAAAA,kBAAU,EAACF;IAC1B,MAAMqB,mBACJC,QAAQC,GAAG,CAACC,cAAc,KAAK,WAC/BvB,OAAOwB,mBAAmB,KAAK;;IACjCN,eAAAA,UAAAA,QAAOC,kCAAPD,QAAOC,YAAcC;IACrB,IAAIF,OAAOC,SAAS,EAAE;QACpBA,IAAAA,gBAAS,EAACpB;IACZ;IAEAH,qBAAqBG;IAErB,MAAM0B,QAA6B,EAAE;IACrC,IAAI,CAACP,OAAOQ,eAAe,EAAE;QAC3BD,MAAMpB,IAAI,CAACsB,IAAAA,4BAAqB,EAAC5B;QACjC0B,MAAMpB,IAAI,CAACuB,IAAAA,iCAA0B,EAAC7B,MAAMmB;IAC9C;IAEA,IAAIA,OAAOW,oBAAoB,EAAE;QAC/B,MAAMA,IAAAA,0CAAoB,EAAC9B,MAAM+B,mBAAW;IAC9C;IAEA,IAAI,CAACZ,OAAOa,UAAU,EAAE;QACtB,MAAMC,IAAAA,mBAAW,EAACjC;IACpB;IAEA,OAAOkC,IAAAA,wBAAgB,KAAIR;AAC7B;MAEA,WAAe5B"}

package/src/generators/vitest/vitest-generator.js

@@ -32,7 +32,8 @@ function vitestGenerator(tree, schema, hasPlugin = false) {
 async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
     var _nxJson_plugins;
     const tasks = [];
-    const { targets, root, projectType } = (0, _devkit.readProjectConfiguration)(tree, schema.project);
+    const { root, projectType } = (0, _devkit.readProjectConfiguration)(tree, schema.project);
+    const isRootProject = root === '.';
     tasks.push(await (0, _js.initGenerator)(tree, _extends._({}, schema, {
         skipFormat: true
     })));
@@ -81,6 +82,10 @@ async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
     const coverageProviderDependency = getCoverageProviderDependency(schema.coverageProvider);
     const installCoverageProviderTask = (0, _devkit.addDependenciesToPackageJson)(tree, {}, coverageProviderDependency);
     tasks.push(installCoverageProviderTask);
+    // Setup workspace config file (https://vitest.dev/guide/workspace.html)
+    if (!isRootProject && !tree.exists(`vitest.workspace.ts`) && !tree.exists(`vitest.workspace.js`) && !tree.exists(`vitest.workspace.json`) && !tree.exists(`vitest.projects.ts`) && !tree.exists(`vitest.projects.js`) && !tree.exists(`vitest.projects.json`)) {
+        tree.write('vitest.workspace.ts', `export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];`);
+    }
     if (!schema.skipFormat) {
         await (0, _devkit.formatFiles)(tree);
     }

package/src/generators/vitest/vitest-generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  formatFiles,\n  generateFiles,\n  GeneratorCallback,\n  joinPathFragments,\n  offsetFromRoot,\n  readNxJson,\n  readProjectConfiguration,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n} from '@nx/devkit';\nimport {\n  addOrChangeTestTarget,\n  createOrEditViteConfig,\n} from '../../utils/generator-utils';\nimport { VitestGeneratorSchema } from './schema';\n\nimport initGenerator from '../init/init';\nimport {\n  vitestCoverageIstanbulVersion,\n  vitestCoverageV8Version,\n} from '../../utils/versions';\n\nimport { addTsLibDependencies, initGenerator as jsInitGenerator } from '@nx/js';\nimport { join } from 'path';\nimport { ensureDependencies } from '../../utils/ensure-dependencies';\n\nexport function vitestGenerator(\n  tree: Tree,\n  schema: VitestGeneratorSchema,\n  hasPlugin = false\n) {\n  return vitestGeneratorInternal(\n    tree,\n    { addPlugin: false, ...schema },\n    hasPlugin\n  );\n}\n\nexport async function vitestGeneratorInternal(\n  tree: Tree,\n  schema: VitestGeneratorSchema,\n  hasPlugin = false\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const { targets, root, projectType } = readProjectConfiguration(\n    tree,\n    schema.project\n  );\n\n  tasks.push(await jsInitGenerator(tree, { ...schema, skipFormat: true }));\n  const initTask = await initGenerator(tree, {\n    skipFormat: true,\n    addPlugin: schema.addPlugin,\n  });\n  tasks.push(initTask);\n  tasks.push(ensureDependencies(tree, schema));\n\n  const nxJson = readNxJson(tree);\n  const hasPluginCheck = nxJson.plugins?.some(\n    (p) =>\n      (typeof p === 'string'\n        ? p === '@nx/vite/plugin'\n        : p.plugin === '@nx/vite/plugin') || hasPlugin\n  );\n  if (!hasPluginCheck) {\n    const testTarget = schema.testTarget ?? 'test';\n    addOrChangeTestTarget(tree, schema, testTarget);\n  }\n\n  if (!schema.skipViteConfig) {\n    if (schema.uiFramework === 'react') {\n      createOrEditViteConfig(\n        tree,\n        {\n          project: schema.project,\n          includeLib: projectType === 'library',\n          includeVitest: true,\n          inSourceTests: schema.inSourceTests,\n          rollupOptionsExternal: [\n            \"'react'\",\n            \"'react-dom'\",\n            \"'react/jsx-runtime'\",\n          ],\n          imports: [`import react from '@vitejs/plugin-react'`],\n          plugins: ['react()'],\n          coverageProvider: schema.coverageProvider,\n        },\n        true\n      );\n    } else {\n      createOrEditViteConfig(\n        tree,\n        {\n          ...schema,\n          includeVitest: true,\n          includeLib: projectType === 'library',\n        },\n        true\n      );\n    }\n  }\n\n  createFiles(tree, schema, root);\n  updateTsConfig(tree, schema, root);\n\n  const coverageProviderDependency = getCoverageProviderDependency(\n    schema.coverageProvider\n  );\n\n  const installCoverageProviderTask = addDependenciesToPackageJson(\n    tree,\n    {},\n    coverageProviderDependency\n  );\n  tasks.push(installCoverageProviderTask);\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nfunction updateTsConfig(\n  tree: Tree,\n  options: VitestGeneratorSchema,\n  projectRoot: string\n) {\n  if (tree.exists(joinPathFragments(projectRoot, 'tsconfig.spec.json'))) {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.spec.json'),\n      (json) => {\n        if (!json.compilerOptions?.types?.includes('vitest')) {\n          if (json.compilerOptions?.types) {\n            json.compilerOptions.types.push('vitest');\n          } else {\n            json.compilerOptions ??= {};\n            json.compilerOptions.types = ['vitest'];\n          }\n        }\n        return json;\n      }\n    );\n\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (json) => {\n        if (\n          json.references &&\n          !json.references.some((r) => r.path === './tsconfig.spec.json')\n        ) {\n          json.references.push({\n            path: './tsconfig.spec.json',\n          });\n        }\n        return json;\n      }\n    );\n  } else {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (json) => {\n        if (!json.compilerOptions?.types?.includes('vitest')) {\n          if (json.compilerOptions?.types) {\n            json.compilerOptions.types.push('vitest');\n          } else {\n            json.compilerOptions ??= {};\n            json.compilerOptions.types = ['vitest'];\n          }\n        }\n        return json;\n      }\n    );\n  }\n\n  if (options.inSourceTests) {\n    const tsconfigLibPath = joinPathFragments(projectRoot, 'tsconfig.lib.json');\n    const tsconfigAppPath = joinPathFragments(projectRoot, 'tsconfig.app.json');\n    if (tree.exists(tsconfigLibPath)) {\n      updateJson(\n        tree,\n        joinPathFragments(projectRoot, 'tsconfig.lib.json'),\n        (json) => {\n          (json.compilerOptions.types ??= []).push('vitest/importMeta');\n          return json;\n        }\n      );\n    } else if (tree.exists(tsconfigAppPath)) {\n      updateJson(\n        tree,\n        joinPathFragments(projectRoot, 'tsconfig.app.json'),\n        (json) => {\n          (json.compilerOptions.types ??= []).push('vitest/importMeta');\n          return json;\n        }\n      );\n    }\n\n    addTsLibDependencies(tree);\n  }\n}\n\nfunction createFiles(\n  tree: Tree,\n  options: VitestGeneratorSchema,\n  projectRoot: string\n) {\n  generateFiles(tree, join(__dirname, 'files'), projectRoot, {\n    tmpl: '',\n    ...options,\n    projectRoot,\n    offsetFromRoot: offsetFromRoot(projectRoot),\n  });\n}\n\nfunction getCoverageProviderDependency(\n  coverageProvider: VitestGeneratorSchema['coverageProvider']\n) {\n  switch (coverageProvider) {\n    case 'v8':\n      return {\n        '@vitest/coverage-v8': vitestCoverageV8Version,\n      };\n    case 'istanbul':\n      return {\n        '@vitest/coverage-istanbul': vitestCoverageIstanbulVersion,\n      };\n    default:\n      return {\n        '@vitest/coverage-v8': vitestCoverageV8Version,\n      };\n  }\n}\n\nexport default vitestGenerator;\n"],"names":["vitestGenerator","vitestGeneratorInternal","tree","schema","hasPlugin","addPlugin","nxJson","tasks","targets","root","projectType","readProjectConfiguration","project","push","jsInitGenerator","skipFormat","initTask","initGenerator","ensureDependencies","readNxJson","hasPluginCheck","plugins","some","p","plugin","testTarget","addOrChangeTestTarget","skipViteConfig","uiFramework","createOrEditViteConfig","includeLib","includeVitest","inSourceTests","rollupOptionsExternal","imports","coverageProvider","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","installCoverageProviderTask","addDependenciesToPackageJson","formatFiles","runTasksInSerial","options","projectRoot","exists","joinPathFragments","updateJson","json","compilerOptions","types","includes","references","r","path","tsconfigLibPath","tsconfigAppPath","addTsLibDependencies","generateFiles","join","__dirname","tmpl","offsetFromRoot","vitestCoverageV8Version","vitestCoverageIstanbulVersion"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  formatFiles,\n  generateFiles,\n  GeneratorCallback,\n  joinPathFragments,\n  offsetFromRoot,\n  readNxJson,\n  readProjectConfiguration,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n} from '@nx/devkit';\nimport {\n  addOrChangeTestTarget,\n  createOrEditViteConfig,\n} from '../../utils/generator-utils';\nimport { VitestGeneratorSchema } from './schema';\n\nimport initGenerator from '../init/init';\nimport {\n  vitestCoverageIstanbulVersion,\n  vitestCoverageV8Version,\n} from '../../utils/versions';\n\nimport { addTsLibDependencies, initGenerator as jsInitGenerator } from '@nx/js';\nimport { join } from 'path';\nimport { ensureDependencies } from '../../utils/ensure-dependencies';\n\nexport function vitestGenerator(\n  tree: Tree,\n  schema: VitestGeneratorSchema,\n  hasPlugin = false\n) {\n  return vitestGeneratorInternal(\n    tree,\n    { addPlugin: false, ...schema },\n    hasPlugin\n  );\n}\n\nexport async function vitestGeneratorInternal(\n  tree: Tree,\n  schema: VitestGeneratorSchema,\n  hasPlugin = false\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const { root, projectType } = readProjectConfiguration(tree, schema.project);\n  const isRootProject = root === '.';\n\n  tasks.push(await jsInitGenerator(tree, { ...schema, skipFormat: true }));\n  const initTask = await initGenerator(tree, {\n    skipFormat: true,\n    addPlugin: schema.addPlugin,\n  });\n  tasks.push(initTask);\n  tasks.push(ensureDependencies(tree, schema));\n\n  const nxJson = readNxJson(tree);\n  const hasPluginCheck = nxJson.plugins?.some(\n    (p) =>\n      (typeof p === 'string'\n        ? p === '@nx/vite/plugin'\n        : p.plugin === '@nx/vite/plugin') || hasPlugin\n  );\n  if (!hasPluginCheck) {\n    const testTarget = schema.testTarget ?? 'test';\n    addOrChangeTestTarget(tree, schema, testTarget);\n  }\n\n  if (!schema.skipViteConfig) {\n    if (schema.uiFramework === 'react') {\n      createOrEditViteConfig(\n        tree,\n        {\n          project: schema.project,\n          includeLib: projectType === 'library',\n          includeVitest: true,\n          inSourceTests: schema.inSourceTests,\n          rollupOptionsExternal: [\n            \"'react'\",\n            \"'react-dom'\",\n            \"'react/jsx-runtime'\",\n          ],\n          imports: [`import react from '@vitejs/plugin-react'`],\n          plugins: ['react()'],\n          coverageProvider: schema.coverageProvider,\n        },\n        true\n      );\n    } else {\n      createOrEditViteConfig(\n        tree,\n        {\n          ...schema,\n          includeVitest: true,\n          includeLib: projectType === 'library',\n        },\n        true\n      );\n    }\n  }\n\n  createFiles(tree, schema, root);\n  updateTsConfig(tree, schema, root);\n\n  const coverageProviderDependency = getCoverageProviderDependency(\n    schema.coverageProvider\n  );\n\n  const installCoverageProviderTask = addDependenciesToPackageJson(\n    tree,\n    {},\n    coverageProviderDependency\n  );\n  tasks.push(installCoverageProviderTask);\n\n  // Setup workspace config file (https://vitest.dev/guide/workspace.html)\n  if (\n    !isRootProject &&\n    !tree.exists(`vitest.workspace.ts`) &&\n    !tree.exists(`vitest.workspace.js`) &&\n    !tree.exists(`vitest.workspace.json`) &&\n    !tree.exists(`vitest.projects.ts`) &&\n    !tree.exists(`vitest.projects.js`) &&\n    !tree.exists(`vitest.projects.json`)\n  ) {\n    tree.write(\n      'vitest.workspace.ts',\n      `export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];`\n    );\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nfunction updateTsConfig(\n  tree: Tree,\n  options: VitestGeneratorSchema,\n  projectRoot: string\n) {\n  if (tree.exists(joinPathFragments(projectRoot, 'tsconfig.spec.json'))) {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.spec.json'),\n      (json) => {\n        if (!json.compilerOptions?.types?.includes('vitest')) {\n          if (json.compilerOptions?.types) {\n            json.compilerOptions.types.push('vitest');\n          } else {\n            json.compilerOptions ??= {};\n            json.compilerOptions.types = ['vitest'];\n          }\n        }\n        return json;\n      }\n    );\n\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (json) => {\n        if (\n          json.references &&\n          !json.references.some((r) => r.path === './tsconfig.spec.json')\n        ) {\n          json.references.push({\n            path: './tsconfig.spec.json',\n          });\n        }\n        return json;\n      }\n    );\n  } else {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (json) => {\n        if (!json.compilerOptions?.types?.includes('vitest')) {\n          if (json.compilerOptions?.types) {\n            json.compilerOptions.types.push('vitest');\n          } else {\n            json.compilerOptions ??= {};\n            json.compilerOptions.types = ['vitest'];\n          }\n        }\n        return json;\n      }\n    );\n  }\n\n  if (options.inSourceTests) {\n    const tsconfigLibPath = joinPathFragments(projectRoot, 'tsconfig.lib.json');\n    const tsconfigAppPath = joinPathFragments(projectRoot, 'tsconfig.app.json');\n    if (tree.exists(tsconfigLibPath)) {\n      updateJson(\n        tree,\n        joinPathFragments(projectRoot, 'tsconfig.lib.json'),\n        (json) => {\n          (json.compilerOptions.types ??= []).push('vitest/importMeta');\n          return json;\n        }\n      );\n    } else if (tree.exists(tsconfigAppPath)) {\n      updateJson(\n        tree,\n        joinPathFragments(projectRoot, 'tsconfig.app.json'),\n        (json) => {\n          (json.compilerOptions.types ??= []).push('vitest/importMeta');\n          return json;\n        }\n      );\n    }\n\n    addTsLibDependencies(tree);\n  }\n}\n\nfunction createFiles(\n  tree: Tree,\n  options: VitestGeneratorSchema,\n  projectRoot: string\n) {\n  generateFiles(tree, join(__dirname, 'files'), projectRoot, {\n    tmpl: '',\n    ...options,\n    projectRoot,\n    offsetFromRoot: offsetFromRoot(projectRoot),\n  });\n}\n\nfunction getCoverageProviderDependency(\n  coverageProvider: VitestGeneratorSchema['coverageProvider']\n) {\n  switch (coverageProvider) {\n    case 'v8':\n      return {\n        '@vitest/coverage-v8': vitestCoverageV8Version,\n      };\n    case 'istanbul':\n      return {\n        '@vitest/coverage-istanbul': vitestCoverageIstanbulVersion,\n      };\n    default:\n      return {\n        '@vitest/coverage-v8': vitestCoverageV8Version,\n      };\n  }\n}\n\nexport default vitestGenerator;\n"],"names":["vitestGenerator","vitestGeneratorInternal","tree","schema","hasPlugin","addPlugin","nxJson","tasks","root","projectType","readProjectConfiguration","project","isRootProject","push","jsInitGenerator","skipFormat","initTask","initGenerator","ensureDependencies","readNxJson","hasPluginCheck","plugins","some","p","plugin","testTarget","addOrChangeTestTarget","skipViteConfig","uiFramework","createOrEditViteConfig","includeLib","includeVitest","inSourceTests","rollupOptionsExternal","imports","coverageProvider","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","installCoverageProviderTask","addDependenciesToPackageJson","exists","write","formatFiles","runTasksInSerial","options","projectRoot","joinPathFragments","updateJson","json","compilerOptions","types","includes","references","r","path","tsconfigLibPath","tsconfigAppPath","addTsLibDependencies","generateFiles","join","__dirname","tmpl","offsetFromRoot","vitestCoverageV8Version","vitestCoverageIstanbulVersion"],"mappings":"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"}

package/src/utils/executor-utils.d.ts

@@ -8,3 +8,4 @@ export declare function validateTypes(opts: {
 }): Promise<void>;
 export declare function createBuildableTsConfig(projectRoot: string, options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions, context: ExecutorContext): void;
 export declare function loadViteDynamicImport(): Promise<typeof import("vite")>;
+export declare function loadVitestDynamicImport(): Promise<typeof import("vitest/node")>;

package/src/utils/executor-utils.js

@@ -14,6 +14,9 @@ _export(exports, {
     },
     loadViteDynamicImport: function() {
         return loadViteDynamicImport;
+    },
+    loadVitestDynamicImport: function() {
+        return loadVitestDynamicImport;
     }
 });
 const _js = require("@nx/js");
@@ -49,5 +52,8 @@ function createBuildableTsConfig(projectRoot, options, context) {
 function loadViteDynamicImport() {
     return Function('return import("vite")')();
 }
+function loadVitestDynamicImport() {
+    return Function('return import("vitest/node")')();
+}
 
 //# sourceMappingURL=executor-utils.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join } from 'path';\nimport { ViteBuildExecutorOptions } from '../executors/build/schema';\nimport { ExecutorContext } from '@nx/devkit';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\nimport {\n  calculateProjectBuildableDependencies,\n  createTmpTsConfig,\n} from '@nx/js/src/utils/buildable-libs-utils';\nimport { getProjectTsConfigPath } from './options-utils';\n\nexport async function validateTypes(opts: {\n  workspaceRoot: string;\n  projectRoot: string;\n  tsconfig: string;\n}): Promise<void> {\n  const result = await runTypeCheck({\n    workspaceRoot: opts.workspaceRoot,\n    tsConfigPath: join(opts.workspaceRoot, opts.tsconfig),\n    mode: 'noEmit',\n  });\n\n  await printDiagnostics(result.errors, result.warnings);\n\n  if (result.errors.length > 0) {\n    throw new Error('Found type errors. See above.');\n  }\n}\n\nexport function createBuildableTsConfig(\n  projectRoot: string,\n  options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions,\n  context: ExecutorContext\n) {\n  const tsConfig = getProjectTsConfigPath(projectRoot);\n  options['buildLibsFromSource'] ??= true;\n\n  if (!options['buildLibsFromSource']) {\n    const { dependencies } = calculateProjectBuildableDependencies(\n      context.taskGraph,\n      context.projectGraph,\n      context.root,\n      context.projectName,\n      // When using incremental building and the serve target is called\n      // we need to get the deps for the 'build' target instead.\n      context.targetName === 'serve' ? 'build' : context.targetName,\n      context.configurationName\n    );\n    // This tsconfig is used via the Vite ts paths plugin.\n    // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).\n    const tmpTsConfigPath = createTmpTsConfig(\n      tsConfig,\n      context.root,\n      projectRoot,\n      dependencies\n    );\n    process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;\n  }\n}\n\nexport function loadViteDynamicImport() {\n  return Function('return import(\"vite\")')() as Promise<typeof import('vite')>;\n}\n"],"names":["validateTypes","createBuildableTsConfig","loadViteDynamicImport","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","getProjectTsConfigPath","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","tmpTsConfigPath","createTmpTsConfig","process","env","NX_TSCONFIG_PATH","Function"],"mappings":";;;;;;;;IAWsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;IA+BAC,qBAAqB;eAArBA;;;oBA5D+B;sBAC1B;oCAOd;8BACgC;AAEhC,eAAeF,cAAcG,IAInC;IACC,MAAMC,SAAS,MAAMC,IAAAA,gBAAY,EAAC;QAChCC,eAAeH,KAAKG,aAAa;QACjCC,cAAcC,IAAAA,UAAI,EAACL,KAAKG,aAAa,EAAEH,KAAKM,QAAQ;QACpDC,MAAM;IACR;IAEA,MAAMC,IAAAA,oBAAgB,EAACP,OAAOQ,MAAM,EAAER,OAAOS,QAAQ;IAErD,IAAIT,OAAOQ,MAAM,CAACE,MAAM,GAAG,GAAG;QAC5B,MAAM,IAAIC,MAAM;IAClB;AACF;AAEO,SAASd,wBACde,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB;QAGxBD,UAAQ;IADR,MAAME,WAAWC,IAAAA,oCAAsB,EAACJ;;IACxCC,MAAAA,WAAAA,QAAO,CAAC,uBAAA,sBAAsB,gBAA9BA,QAAO,CAAC,qBAAsB,GAAK;IAEnC,IAAI,CAACA,OAAO,CAAC,sBAAsB,EAAE;QACnC,MAAM,EAAEI,YAAY,EAAE,GAAGC,IAAAA,yDAAqC,EAC5DJ,QAAQK,SAAS,EACjBL,QAAQM,YAAY,EACpBN,QAAQO,IAAI,EACZP,QAAQQ,WAAW,EACnB,iEAAiE;QACjE,0DAA0D;QAC1DR,QAAQS,UAAU,KAAK,UAAU,UAAUT,QAAQS,UAAU,EAC7DT,QAAQU,iBAAiB;QAE3B,sDAAsD;QACtD,qGAAqG;QACrG,MAAMC,kBAAkBC,IAAAA,qCAAiB,EACvCX,UACAD,QAAQO,IAAI,EACZT,aACAK;QAEFU,QAAQC,GAAG,CAACC,gBAAgB,GAAGJ;IACjC;AACF;AAEO,SAAS3B;IACd,OAAOgC,SAAS;AAClB"}
+{"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join } from 'path';\nimport { ViteBuildExecutorOptions } from '../executors/build/schema';\nimport { ExecutorContext } from '@nx/devkit';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\nimport {\n  calculateProjectBuildableDependencies,\n  createTmpTsConfig,\n} from '@nx/js/src/utils/buildable-libs-utils';\nimport { getProjectTsConfigPath } from './options-utils';\n\nexport async function validateTypes(opts: {\n  workspaceRoot: string;\n  projectRoot: string;\n  tsconfig: string;\n}): Promise<void> {\n  const result = await runTypeCheck({\n    workspaceRoot: opts.workspaceRoot,\n    tsConfigPath: join(opts.workspaceRoot, opts.tsconfig),\n    mode: 'noEmit',\n  });\n\n  await printDiagnostics(result.errors, result.warnings);\n\n  if (result.errors.length > 0) {\n    throw new Error('Found type errors. See above.');\n  }\n}\n\nexport function createBuildableTsConfig(\n  projectRoot: string,\n  options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions,\n  context: ExecutorContext\n) {\n  const tsConfig = getProjectTsConfigPath(projectRoot);\n  options['buildLibsFromSource'] ??= true;\n\n  if (!options['buildLibsFromSource']) {\n    const { dependencies } = calculateProjectBuildableDependencies(\n      context.taskGraph,\n      context.projectGraph,\n      context.root,\n      context.projectName,\n      // When using incremental building and the serve target is called\n      // we need to get the deps for the 'build' target instead.\n      context.targetName === 'serve' ? 'build' : context.targetName,\n      context.configurationName\n    );\n    // This tsconfig is used via the Vite ts paths plugin.\n    // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).\n    const tmpTsConfigPath = createTmpTsConfig(\n      tsConfig,\n      context.root,\n      projectRoot,\n      dependencies\n    );\n    process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;\n  }\n}\n\nexport function loadViteDynamicImport() {\n  return Function('return import(\"vite\")')() as Promise<typeof import('vite')>;\n}\n\nexport function loadVitestDynamicImport() {\n  return Function('return import(\"vitest/node\")')() as Promise<\n    typeof import('vitest/node')\n  >;\n}\n"],"names":["validateTypes","createBuildableTsConfig","loadViteDynamicImport","loadVitestDynamicImport","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","getProjectTsConfigPath","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","tmpTsConfigPath","createTmpTsConfig","process","env","NX_TSCONFIG_PATH","Function"],"mappings":";;;;;;;;IAWsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;IA+BAC,qBAAqB;eAArBA;;IAIAC,uBAAuB;eAAvBA;;;oBAhE+B;sBAC1B;oCAOd;8BACgC;AAEhC,eAAeH,cAAcI,IAInC;IACC,MAAMC,SAAS,MAAMC,IAAAA,gBAAY,EAAC;QAChCC,eAAeH,KAAKG,aAAa;QACjCC,cAAcC,IAAAA,UAAI,EAACL,KAAKG,aAAa,EAAEH,KAAKM,QAAQ;QACpDC,MAAM;IACR;IAEA,MAAMC,IAAAA,oBAAgB,EAACP,OAAOQ,MAAM,EAAER,OAAOS,QAAQ;IAErD,IAAIT,OAAOQ,MAAM,CAACE,MAAM,GAAG,GAAG;QAC5B,MAAM,IAAIC,MAAM;IAClB;AACF;AAEO,SAASf,wBACdgB,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB;QAGxBD,UAAQ;IADR,MAAME,WAAWC,IAAAA,oCAAsB,EAACJ;;IACxCC,MAAAA,WAAAA,QAAO,CAAC,uBAAA,sBAAsB,gBAA9BA,QAAO,CAAC,qBAAsB,GAAK;IAEnC,IAAI,CAACA,OAAO,CAAC,sBAAsB,EAAE;QACnC,MAAM,EAAEI,YAAY,EAAE,GAAGC,IAAAA,yDAAqC,EAC5DJ,QAAQK,SAAS,EACjBL,QAAQM,YAAY,EACpBN,QAAQO,IAAI,EACZP,QAAQQ,WAAW,EACnB,iEAAiE;QACjE,0DAA0D;QAC1DR,QAAQS,UAAU,KAAK,UAAU,UAAUT,QAAQS,UAAU,EAC7DT,QAAQU,iBAAiB;QAE3B,sDAAsD;QACtD,qGAAqG;QACrG,MAAMC,kBAAkBC,IAAAA,qCAAiB,EACvCX,UACAD,QAAQO,IAAI,EACZT,aACAK;QAEFU,QAAQC,GAAG,CAACC,gBAAgB,GAAGJ;IACjC;AACF;AAEO,SAAS5B;IACd,OAAOiC,SAAS;AAClB;AAEO,SAAShC;IACd,OAAOgC,SAAS;AAGlB"}

package/src/utils/test-utils.d.ts

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 export declare function mockViteReactAppGenerator(tree: Tree): Tree;
-export declare function mockReactAppGenerator(tree: Tree): Tree;
+export declare function mockReactAppGenerator(tree: Tree, userAppName?: string): Tree;
 export declare function mockReactMixedAppGenerator(tree: Tree): Tree;
 export declare function mockWebAppGenerator(tree: Tree): Tree;
 export declare function mockAngularAppGenerator(tree: Tree): Tree;

package/src/utils/test-utils.js

@@ -145,8 +145,8 @@ function mockViteReactAppGenerator(tree) {
     }));
     return tree;
 }
-function mockReactAppGenerator(tree) {
-    const appName = 'my-test-react-app';
+function mockReactAppGenerator(tree, userAppName) {
+    const appName = userAppName != null ? userAppName : 'my-test-react-app';
     tree.write(`apps/${appName}/src/main.tsx`, `import ReactDOM from 'react-dom';\n`);
     tree.write(`apps/${appName}/webpack.config.ts`, ``);
     tree.write(`apps/${appName}/tsconfig.json`, `{

package/src/utils/test-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/vite/src/utils/test-utils.ts"],"sourcesContent":["import { Tree, writeJson } from '@nx/devkit';\nimport * as reactViteConfig from './test-files/react-vite-project.config.json';\nimport * as angularAppConfig from './test-files/angular-project.config.json';\nimport * as randomAppConfig from './test-files/unknown-project.config.json';\nimport * as mixedAppConfig from './test-files/react-mixed-project.config.json';\nimport * as reactLibNBJest from './test-files/react-lib-non-buildable-jest.json';\nimport * as reactLibNBVitest from './test-files/react-lib-non-buildable-vitest.json';\n\nexport function mockViteReactAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-react-vite-app';\n\n  tree.write(\n    `apps/${appName}/src/main.tsx`,\n    `import ReactDOM from 'react-dom';\\n`\n  );\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n      \"compilerOptions\": {\n        \"jsx\": \"react-jsx\",\n        \"allowJs\": false,\n        \"esModuleInterop\": false,\n        \"allowSyntheticDefaultImports\": true,\n        \"strict\": true,\n        \"types\": [\"vite/client\"]\n      },\n      \"files\": [],\n      \"include\": [],\n      \"references\": [\n        {\n          \"path\": \"./tsconfig.app.json\"\n        },\n        {\n          \"path\": \"./tsconfig.spec.json\"\n        }\n      ],\n      \"extends\": \"../../tsconfig.base.json\"\n      }\n      `\n  );\n  tree.write(\n    `apps/${appName}/tsconfig.app.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\",\n        \"types\": [\"node\"]\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"src/**/*.spec.ts\",\n        \"src/**/*.test.ts\",\n        \"src/**/*.spec.tsx\",\n        \"src/**/*.test.tsx\",\n        \"src/**/*.spec.js\",\n        \"src/**/*.test.js\",\n        \"src/**/*.spec.jsx\",\n        \"src/**/*.test.jsx\"\n      ],\n      \"include\": [\"src/**/*.js\", \"src/**/*.jsx\", \"src/**/*.ts\", \"src/**/*.tsx\"]\n    }   \n      `\n  );\n\n  tree.write(\n    `apps/${appName}/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>Rv1</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"/favicon.ico\" />\n        <link rel=\"stylesheet\" href=\"/src/styles.css\" />\n      </head>\n      <body>\n        <div id=\"root\"></div>\n        <script type=\"module\" src=\"/src/main.tsx\"></script>\n      </body>\n    </html>`\n  );\n\n  tree.write(\n    `apps/${appName}/vite.config.ts`,\n    `    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import tsconfigPaths from 'vite-tsconfig-paths';\n    \n    export default defineConfig({\n      server: {\n        port: 4200,\n        host: 'localhost',\n      },\n      plugins: [\n        react(),\n        tsconfigPaths({\n          root: '../../',\n          projects: ['tsconfig.base.json'],\n        }),\n      ],\n    \n      test: {\n        globals: true,\n        cache: {\n          dir: '../../node_modules/.vitest',\n        },\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n    });\n    `\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-react-vite-app': {\n        ...reactViteConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...reactViteConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockReactAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-react-app';\n\n  tree.write(\n    `apps/${appName}/src/main.tsx`,\n    `import ReactDOM from 'react-dom';\\n`\n  );\n\n  tree.write(`apps/${appName}/webpack.config.ts`, ``);\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n        \"extends\": \"../../tsconfig.base.json\",\n        \"compilerOptions\": {\n          \"jsx\": \"react-jsx\",\n          \"allowJs\": true,\n          \"esModuleInterop\": true,\n          \"allowSyntheticDefaultImports\": true,\n          \"forceConsistentCasingInFileNames\": true,\n          \"strict\": true,\n          \"noImplicitOverride\": true,\n          \"noPropertyAccessFromIndexSignature\": true,\n          \"noImplicitReturns\": true,\n          \"noFallthroughCasesInSwitch\": true\n        },\n        \"files\": [],\n        \"include\": [],\n        \"references\": [\n          {\n            \"path\": \"./tsconfig.app.json\"\n          },\n          {\n            \"path\": \"./tsconfig.spec.json\"\n          }\n        ]\n      }\n      `\n  );\n  tree.write(\n    `apps/${appName}/tsconfig.app.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\"\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"jest.config.ts\",\n        \"**/*.spec.ts\",\n        \"**/*.test.ts\",\n        \"**/*.spec.tsx\",\n        \"**/*.test.tsx\",\n        \"**/*.spec.js\",\n        \"**/*.test.js\",\n        \"**/*.spec.jsx\",\n        \"**/*.test.jsx\"\n      ],\n      \"include\": [\"**/*.js\", \"**/*.jsx\", \"**/*.ts\", \"**/*.tsx\"]\n    }   \n      `\n  );\n\n  tree.write(\n    `apps/${appName}/src/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>My Test React App</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"favicon.ico\" />\n      </head>\n      <body>\n        <div id=\"root\"></div>\n      </body>\n    </html>`\n  );\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\nexport function mockReactMixedAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-mixed-react-app';\n\n  tree.write(\n    `apps/${appName}/src/main.tsx`,\n    `import ReactDOM from 'react-dom';\\n`\n  );\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n        \"extends\": \"../../tsconfig.base.json\",\n        \"compilerOptions\": {\n          \"jsx\": \"react-jsx\",\n          \"allowJs\": true,\n          \"esModuleInterop\": true,\n          \"allowSyntheticDefaultImports\": true,\n          \"forceConsistentCasingInFileNames\": true,\n          \"strict\": true,\n          \"noImplicitOverride\": true,\n          \"noPropertyAccessFromIndexSignature\": true,\n          \"noImplicitReturns\": true,\n          \"noFallthroughCasesInSwitch\": true\n        },\n        \"files\": [],\n        \"include\": [],\n        \"references\": [\n          {\n            \"path\": \"./tsconfig.app.json\"\n          },\n          {\n            \"path\": \"./tsconfig.spec.json\"\n          }\n        ]\n      }\n      `\n  );\n  tree.write(\n    `apps/${appName}/tsconfig.app.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\"\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"jest.config.ts\",\n        \"**/*.spec.ts\",\n        \"**/*.test.ts\",\n        \"**/*.spec.tsx\",\n        \"**/*.test.tsx\",\n        \"**/*.spec.js\",\n        \"**/*.test.js\",\n        \"**/*.spec.jsx\",\n        \"**/*.test.jsx\"\n      ],\n      \"include\": [\"**/*.js\", \"**/*.jsx\", \"**/*.ts\", \"**/*.tsx\"]\n    }   \n      `\n  );\n\n  tree.write(\n    `apps/${appName}/src/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>My Test React App</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"favicon.ico\" />\n      </head>\n      <body>\n        <div id=\"root\"></div>\n      </body>\n    </html>`\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-mixed-react-app': {\n        ...mixedAppConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...mixedAppConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockWebAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-web-app';\n\n  tree.write(`apps/${appName}/src/main.ts`, `import './app/app.element.ts';`);\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n        \"extends\": \"../../tsconfig.base.json\",\n        \"files\": [],\n        \"include\": [],\n        \"references\": [\n          {\n            \"path\": \"./tsconfig.app.json\"\n          },\n          {\n            \"path\": \"./tsconfig.spec.json\"\n          }\n        ]\n      }      \n        `\n  );\n\n  tree.write(`apps/${appName}/webpack.config.ts`, ``);\n\n  tree.write(\n    `apps/${appName}/src/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>WebappPure</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"favicon.ico\" />\n      </head>\n      <body>\n        <workspace-root></workspace-root>\n      </body>\n    </html>\n    `\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-web-app': {\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n  return tree;\n}\n\nexport function mockAngularAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-angular-app';\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-angular-app': {\n        ...angularAppConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...angularAppConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockUnknownAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-random-app';\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-random-app': {\n        ...randomAppConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...randomAppConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockReactLibNonBuildableJestTestRunnerGenerator(\n  tree: Tree\n): Tree {\n  const libName = 'react-lib-nonb-jest';\n\n  tree.write(`libs/${libName}/src/index.ts`, ``);\n\n  tree.write(\n    `libs/${libName}/tsconfig.json`,\n    `{\n      \"compilerOptions\": {\n        \"jsx\": \"react-jsx\",\n        \"allowJs\": false,\n        \"esModuleInterop\": false,\n        \"allowSyntheticDefaultImports\": true,\n        \"strict\": true\n      },\n      \"files\": [],\n      \"include\": [],\n      \"references\": [\n        {\n          \"path\": \"./tsconfig.lib.json\"\n        },\n        {\n          \"path\": \"./tsconfig.spec.json\"\n        }\n      ],\n      \"extends\": \"../../tsconfig.base.json\"\n    }`\n  );\n  tree.write(\n    `libs/${libName}/tsconfig.lib.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\",\n        \"types\": [\"node\"]\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"jest.config.ts\",\n        \"src/**/*.spec.ts\",\n        \"src/**/*.test.ts\",\n        \"src/**/*.spec.tsx\",\n        \"src/**/*.test.tsx\",\n        \"src/**/*.spec.js\",\n        \"src/**/*.test.js\",\n        \"src/**/*.spec.jsx\",\n        \"src/**/*.test.jsx\"\n      ],\n      \"include\": [\"src/**/*.js\", \"src/**/*.jsx\", \"src/**/*.ts\", \"src/**/*.tsx\"]\n    }`\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      [`${libName}`]: {\n        ...reactLibNBJest,\n        root: `libs/${libName}`,\n        projectType: 'library',\n      },\n    },\n  });\n\n  writeJson(tree, `libs/${libName}/project.json`, {\n    ...reactLibNBJest,\n    root: `libs/${libName}`,\n    projectType: 'library',\n  });\n\n  return tree;\n}\n\nexport function mockReactLibNonBuildableVitestRunnerGenerator(\n  tree: Tree\n): Tree {\n  const libName = 'react-lib-nonb-vitest';\n\n  tree.write(`libs/${libName}/src/index.ts`, ``);\n\n  tree.write(\n    `libs/${libName}/vite.config.ts`,\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      plugins: [\n        nxViteTsPaths(),\n        react(),\n      ],\n\n      test: {\n        globals: true,\n        cache: {\n          dir: '../../node_modules/.vitest',\n        },\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n    });\n  `\n  );\n\n  tree.write(\n    `libs/${libName}/tsconfig.json`,\n    `{\n      \"compilerOptions\": {\n        \"jsx\": \"react-jsx\",\n        \"allowJs\": false,\n        \"esModuleInterop\": false,\n        \"allowSyntheticDefaultImports\": true,\n        \"strict\": true\n      },\n      \"files\": [],\n      \"include\": [],\n      \"references\": [\n        {\n          \"path\": \"./tsconfig.lib.json\"\n        },\n        {\n          \"path\": \"./tsconfig.spec.json\"\n        }\n      ],\n      \"extends\": \"../../tsconfig.base.json\"\n    }`\n  );\n  tree.write(\n    `libs/${libName}/tsconfig.lib.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\",\n        \"types\": [\"node\"]\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"**/*.spec.ts\",\n        \"**/*.test.ts\",\n        \"**/*.spec.tsx\",\n        \"**/*.test.tsx\",\n        \"**/*.spec.js\",\n        \"**/*.test.js\",\n        \"**/*.spec.jsx\",\n        \"**/*.test.jsx\"\n      ],\n      \"include\": [\"**/*.js\", \"**/*.jsx\", \"**/*.ts\", \"**/*.tsx\"]\n    }`\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      [`${libName}`]: {\n        ...reactLibNBVitest,\n        root: `libs/${libName}`,\n        projectType: 'library',\n      },\n    },\n  });\n\n  writeJson(tree, `libs/${libName}/project.json`, {\n    ...reactLibNBVitest,\n    root: `libs/${libName}`,\n    projectType: 'library',\n  });\n\n  return tree;\n}\n"],"names":["mockViteReactAppGenerator","mockReactAppGenerator","mockReactMixedAppGenerator","mockWebAppGenerator","mockAngularAppGenerator","mockUnknownAppGenerator","mockReactLibNonBuildableJestTestRunnerGenerator","mockReactLibNonBuildableVitestRunnerGenerator","tree","appName","write","writeJson","projects","reactViteConfig","root","projectType","mixedAppConfig","angularAppConfig","randomAppConfig","libName","reactLibNBJest","reactLibNBVitest"],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/vite/src/utils/test-utils.ts"],"sourcesContent":["import { Tree, writeJson } from '@nx/devkit';\nimport * as reactViteConfig from './test-files/react-vite-project.config.json';\nimport * as angularAppConfig from './test-files/angular-project.config.json';\nimport * as randomAppConfig from './test-files/unknown-project.config.json';\nimport * as mixedAppConfig from './test-files/react-mixed-project.config.json';\nimport * as reactLibNBJest from './test-files/react-lib-non-buildable-jest.json';\nimport * as reactLibNBVitest from './test-files/react-lib-non-buildable-vitest.json';\n\nexport function mockViteReactAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-react-vite-app';\n\n  tree.write(\n    `apps/${appName}/src/main.tsx`,\n    `import ReactDOM from 'react-dom';\\n`\n  );\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n      \"compilerOptions\": {\n        \"jsx\": \"react-jsx\",\n        \"allowJs\": false,\n        \"esModuleInterop\": false,\n        \"allowSyntheticDefaultImports\": true,\n        \"strict\": true,\n        \"types\": [\"vite/client\"]\n      },\n      \"files\": [],\n      \"include\": [],\n      \"references\": [\n        {\n          \"path\": \"./tsconfig.app.json\"\n        },\n        {\n          \"path\": \"./tsconfig.spec.json\"\n        }\n      ],\n      \"extends\": \"../../tsconfig.base.json\"\n      }\n      `\n  );\n  tree.write(\n    `apps/${appName}/tsconfig.app.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\",\n        \"types\": [\"node\"]\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"src/**/*.spec.ts\",\n        \"src/**/*.test.ts\",\n        \"src/**/*.spec.tsx\",\n        \"src/**/*.test.tsx\",\n        \"src/**/*.spec.js\",\n        \"src/**/*.test.js\",\n        \"src/**/*.spec.jsx\",\n        \"src/**/*.test.jsx\"\n      ],\n      \"include\": [\"src/**/*.js\", \"src/**/*.jsx\", \"src/**/*.ts\", \"src/**/*.tsx\"]\n    }   \n      `\n  );\n\n  tree.write(\n    `apps/${appName}/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>Rv1</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"/favicon.ico\" />\n        <link rel=\"stylesheet\" href=\"/src/styles.css\" />\n      </head>\n      <body>\n        <div id=\"root\"></div>\n        <script type=\"module\" src=\"/src/main.tsx\"></script>\n      </body>\n    </html>`\n  );\n\n  tree.write(\n    `apps/${appName}/vite.config.ts`,\n    `    /// <reference types=\"vitest\" />\n    import { defineConfig } from 'vite';\n    import react from '@vitejs/plugin-react';\n    import tsconfigPaths from 'vite-tsconfig-paths';\n    \n    export default defineConfig({\n      server: {\n        port: 4200,\n        host: 'localhost',\n      },\n      plugins: [\n        react(),\n        tsconfigPaths({\n          root: '../../',\n          projects: ['tsconfig.base.json'],\n        }),\n      ],\n    \n      test: {\n        globals: true,\n        cache: {\n          dir: '../../node_modules/.vitest',\n        },\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n    });\n    `\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-react-vite-app': {\n        ...reactViteConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...reactViteConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockReactAppGenerator(tree: Tree, userAppName?: string): Tree {\n  const appName = userAppName ?? 'my-test-react-app';\n\n  tree.write(\n    `apps/${appName}/src/main.tsx`,\n    `import ReactDOM from 'react-dom';\\n`\n  );\n\n  tree.write(`apps/${appName}/webpack.config.ts`, ``);\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n        \"extends\": \"../../tsconfig.base.json\",\n        \"compilerOptions\": {\n          \"jsx\": \"react-jsx\",\n          \"allowJs\": true,\n          \"esModuleInterop\": true,\n          \"allowSyntheticDefaultImports\": true,\n          \"forceConsistentCasingInFileNames\": true,\n          \"strict\": true,\n          \"noImplicitOverride\": true,\n          \"noPropertyAccessFromIndexSignature\": true,\n          \"noImplicitReturns\": true,\n          \"noFallthroughCasesInSwitch\": true\n        },\n        \"files\": [],\n        \"include\": [],\n        \"references\": [\n          {\n            \"path\": \"./tsconfig.app.json\"\n          },\n          {\n            \"path\": \"./tsconfig.spec.json\"\n          }\n        ]\n      }\n      `\n  );\n  tree.write(\n    `apps/${appName}/tsconfig.app.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\"\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"jest.config.ts\",\n        \"**/*.spec.ts\",\n        \"**/*.test.ts\",\n        \"**/*.spec.tsx\",\n        \"**/*.test.tsx\",\n        \"**/*.spec.js\",\n        \"**/*.test.js\",\n        \"**/*.spec.jsx\",\n        \"**/*.test.jsx\"\n      ],\n      \"include\": [\"**/*.js\", \"**/*.jsx\", \"**/*.ts\", \"**/*.tsx\"]\n    }   \n      `\n  );\n\n  tree.write(\n    `apps/${appName}/src/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>My Test React App</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"favicon.ico\" />\n      </head>\n      <body>\n        <div id=\"root\"></div>\n      </body>\n    </html>`\n  );\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\nexport function mockReactMixedAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-mixed-react-app';\n\n  tree.write(\n    `apps/${appName}/src/main.tsx`,\n    `import ReactDOM from 'react-dom';\\n`\n  );\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n        \"extends\": \"../../tsconfig.base.json\",\n        \"compilerOptions\": {\n          \"jsx\": \"react-jsx\",\n          \"allowJs\": true,\n          \"esModuleInterop\": true,\n          \"allowSyntheticDefaultImports\": true,\n          \"forceConsistentCasingInFileNames\": true,\n          \"strict\": true,\n          \"noImplicitOverride\": true,\n          \"noPropertyAccessFromIndexSignature\": true,\n          \"noImplicitReturns\": true,\n          \"noFallthroughCasesInSwitch\": true\n        },\n        \"files\": [],\n        \"include\": [],\n        \"references\": [\n          {\n            \"path\": \"./tsconfig.app.json\"\n          },\n          {\n            \"path\": \"./tsconfig.spec.json\"\n          }\n        ]\n      }\n      `\n  );\n  tree.write(\n    `apps/${appName}/tsconfig.app.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\"\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"jest.config.ts\",\n        \"**/*.spec.ts\",\n        \"**/*.test.ts\",\n        \"**/*.spec.tsx\",\n        \"**/*.test.tsx\",\n        \"**/*.spec.js\",\n        \"**/*.test.js\",\n        \"**/*.spec.jsx\",\n        \"**/*.test.jsx\"\n      ],\n      \"include\": [\"**/*.js\", \"**/*.jsx\", \"**/*.ts\", \"**/*.tsx\"]\n    }   \n      `\n  );\n\n  tree.write(\n    `apps/${appName}/src/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>My Test React App</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"favicon.ico\" />\n      </head>\n      <body>\n        <div id=\"root\"></div>\n      </body>\n    </html>`\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-mixed-react-app': {\n        ...mixedAppConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...mixedAppConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockWebAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-web-app';\n\n  tree.write(`apps/${appName}/src/main.ts`, `import './app/app.element.ts';`);\n\n  tree.write(\n    `apps/${appName}/tsconfig.json`,\n    `{\n        \"extends\": \"../../tsconfig.base.json\",\n        \"files\": [],\n        \"include\": [],\n        \"references\": [\n          {\n            \"path\": \"./tsconfig.app.json\"\n          },\n          {\n            \"path\": \"./tsconfig.spec.json\"\n          }\n        ]\n      }      \n        `\n  );\n\n  tree.write(`apps/${appName}/webpack.config.ts`, ``);\n\n  tree.write(\n    `apps/${appName}/src/index.html`,\n    `<!DOCTYPE html>\n    <html lang=\"en\">\n      <head>\n        <meta charset=\"utf-8\" />\n        <title>WebappPure</title>\n        <base href=\"/\" />\n    \n        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n        <link rel=\"icon\" type=\"image/x-icon\" href=\"favicon.ico\" />\n      </head>\n      <body>\n        <workspace-root></workspace-root>\n      </body>\n    </html>\n    `\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-web-app': {\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n  return tree;\n}\n\nexport function mockAngularAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-angular-app';\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-angular-app': {\n        ...angularAppConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...angularAppConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockUnknownAppGenerator(tree: Tree): Tree {\n  const appName = 'my-test-random-app';\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      'my-test-random-app': {\n        ...randomAppConfig,\n        root: `apps/${appName}`,\n        projectType: 'application',\n      },\n    },\n  });\n\n  writeJson(tree, `apps/${appName}/project.json`, {\n    ...randomAppConfig,\n    root: `apps/${appName}`,\n    projectType: 'application',\n  });\n\n  return tree;\n}\n\nexport function mockReactLibNonBuildableJestTestRunnerGenerator(\n  tree: Tree\n): Tree {\n  const libName = 'react-lib-nonb-jest';\n\n  tree.write(`libs/${libName}/src/index.ts`, ``);\n\n  tree.write(\n    `libs/${libName}/tsconfig.json`,\n    `{\n      \"compilerOptions\": {\n        \"jsx\": \"react-jsx\",\n        \"allowJs\": false,\n        \"esModuleInterop\": false,\n        \"allowSyntheticDefaultImports\": true,\n        \"strict\": true\n      },\n      \"files\": [],\n      \"include\": [],\n      \"references\": [\n        {\n          \"path\": \"./tsconfig.lib.json\"\n        },\n        {\n          \"path\": \"./tsconfig.spec.json\"\n        }\n      ],\n      \"extends\": \"../../tsconfig.base.json\"\n    }`\n  );\n  tree.write(\n    `libs/${libName}/tsconfig.lib.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\",\n        \"types\": [\"node\"]\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"jest.config.ts\",\n        \"src/**/*.spec.ts\",\n        \"src/**/*.test.ts\",\n        \"src/**/*.spec.tsx\",\n        \"src/**/*.test.tsx\",\n        \"src/**/*.spec.js\",\n        \"src/**/*.test.js\",\n        \"src/**/*.spec.jsx\",\n        \"src/**/*.test.jsx\"\n      ],\n      \"include\": [\"src/**/*.js\", \"src/**/*.jsx\", \"src/**/*.ts\", \"src/**/*.tsx\"]\n    }`\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      [`${libName}`]: {\n        ...reactLibNBJest,\n        root: `libs/${libName}`,\n        projectType: 'library',\n      },\n    },\n  });\n\n  writeJson(tree, `libs/${libName}/project.json`, {\n    ...reactLibNBJest,\n    root: `libs/${libName}`,\n    projectType: 'library',\n  });\n\n  return tree;\n}\n\nexport function mockReactLibNonBuildableVitestRunnerGenerator(\n  tree: Tree\n): Tree {\n  const libName = 'react-lib-nonb-vitest';\n\n  tree.write(`libs/${libName}/src/index.ts`, ``);\n\n  tree.write(\n    `libs/${libName}/vite.config.ts`,\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      plugins: [\n        nxViteTsPaths(),\n        react(),\n      ],\n\n      test: {\n        globals: true,\n        cache: {\n          dir: '../../node_modules/.vitest',\n        },\n        environment: 'jsdom',\n        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n      },\n    });\n  `\n  );\n\n  tree.write(\n    `libs/${libName}/tsconfig.json`,\n    `{\n      \"compilerOptions\": {\n        \"jsx\": \"react-jsx\",\n        \"allowJs\": false,\n        \"esModuleInterop\": false,\n        \"allowSyntheticDefaultImports\": true,\n        \"strict\": true\n      },\n      \"files\": [],\n      \"include\": [],\n      \"references\": [\n        {\n          \"path\": \"./tsconfig.lib.json\"\n        },\n        {\n          \"path\": \"./tsconfig.spec.json\"\n        }\n      ],\n      \"extends\": \"../../tsconfig.base.json\"\n    }`\n  );\n  tree.write(\n    `libs/${libName}/tsconfig.lib.json`,\n    `{\n      \"extends\": \"./tsconfig.json\",\n      \"compilerOptions\": {\n        \"outDir\": \"../../dist/out-tsc\",\n        \"types\": [\"node\"]\n      },\n      \"files\": [\n        \"../../node_modules/@nx/react/typings/cssmodule.d.ts\",\n        \"../../node_modules/@nx/react/typings/image.d.ts\"\n      ],\n      \"exclude\": [\n        \"**/*.spec.ts\",\n        \"**/*.test.ts\",\n        \"**/*.spec.tsx\",\n        \"**/*.test.tsx\",\n        \"**/*.spec.js\",\n        \"**/*.test.js\",\n        \"**/*.spec.jsx\",\n        \"**/*.test.jsx\"\n      ],\n      \"include\": [\"**/*.js\", \"**/*.jsx\", \"**/*.ts\", \"**/*.tsx\"]\n    }`\n  );\n\n  writeJson(tree, 'workspace.json', {\n    projects: {\n      [`${libName}`]: {\n        ...reactLibNBVitest,\n        root: `libs/${libName}`,\n        projectType: 'library',\n      },\n    },\n  });\n\n  writeJson(tree, `libs/${libName}/project.json`, {\n    ...reactLibNBVitest,\n    root: `libs/${libName}`,\n    projectType: 'library',\n  });\n\n  return tree;\n}\n"],"names":["mockViteReactAppGenerator","mockReactAppGenerator","mockReactMixedAppGenerator","mockWebAppGenerator","mockAngularAppGenerator","mockUnknownAppGenerator","mockReactLibNonBuildableJestTestRunnerGenerator","mockReactLibNonBuildableVitestRunnerGenerator","tree","appName","write","writeJson","projects","reactViteConfig","root","projectType","userAppName","mixedAppConfig","angularAppConfig","randomAppConfig","libName","reactLibNBJest","reactLibNBVitest"],"mappings":"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"}

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
 export declare const viteVersion = "~5.0.0";
-export declare const vitestVersion = "^1.0.4";
+export declare const vitestVersion = "^1.3.1";
 export declare const vitePluginReactVersion = "^4.2.0";
 export declare const vitePluginReactSwcVersion = "^3.5.0";
 export declare const jsdomVersion = "~22.1.0";

package/src/utils/versions.js

@@ -42,7 +42,7 @@ _export(exports, {
 });
 const nxVersion = require('../../package.json').version;
 const viteVersion = '~5.0.0';
-const vitestVersion = '^1.0.4';
+const vitestVersion = '^1.3.1';
 const vitePluginReactVersion = '^4.2.0';
 const vitePluginReactSwcVersion = '^3.5.0';
 const jsdomVersion = '~22.1.0';

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/vite/src/utils/versions.ts"],"sourcesContent":["export const nxVersion = require('../../package.json').version;\nexport const viteVersion = '~5.0.0';\nexport const vitestVersion = '^1.0.4';\nexport const vitePluginReactVersion = '^4.2.0';\nexport const vitePluginReactSwcVersion = '^3.5.0';\nexport const jsdomVersion = '~22.1.0';\nexport const vitePluginDtsVersion = '~2.3.0';\nexport const happyDomVersion = '~9.20.3';\nexport const edgeRuntimeVmVersion = '~3.0.2';\n\n// Coverage providers\nexport const vitestCoverageV8Version = '^1.0.4';\nexport const vitestCoverageIstanbulVersion = '^1.0.4';\n"],"names":["nxVersion","viteVersion","vitestVersion","vitePluginReactVersion","vitePluginReactSwcVersion","jsdomVersion","vitePluginDtsVersion","happyDomVersion","edgeRuntimeVmVersion","vitestCoverageV8Version","vitestCoverageIstanbulVersion","require","version"],"mappings":";;;;;;;;IAAaA,SAAS;eAATA;;IACAC,WAAW;eAAXA;;IACAC,aAAa;eAAbA;;IACAC,sBAAsB;eAAtBA;;IACAC,yBAAyB;eAAzBA;;IACAC,YAAY;eAAZA;;IACAC,oBAAoB;eAApBA;;IACAC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IAGAC,uBAAuB;eAAvBA;;IACAC,6BAA6B;eAA7BA;;;AAZN,MAAMV,YAAYW,QAAQ,sBAAsBC,OAAO;AACvD,MAAMX,cAAc;AACpB,MAAMC,gBAAgB;AACtB,MAAMC,yBAAyB;AAC/B,MAAMC,4BAA4B;AAClC,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAC7B,MAAMC,kBAAkB;AACxB,MAAMC,uBAAuB;AAG7B,MAAMC,0BAA0B;AAChC,MAAMC,gCAAgC"}
+{"version":3,"sources":["../../../../../packages/vite/src/utils/versions.ts"],"sourcesContent":["export const nxVersion = require('../../package.json').version;\nexport const viteVersion = '~5.0.0';\nexport const vitestVersion = '^1.3.1';\nexport const vitePluginReactVersion = '^4.2.0';\nexport const vitePluginReactSwcVersion = '^3.5.0';\nexport const jsdomVersion = '~22.1.0';\nexport const vitePluginDtsVersion = '~2.3.0';\nexport const happyDomVersion = '~9.20.3';\nexport const edgeRuntimeVmVersion = '~3.0.2';\n\n// Coverage providers\nexport const vitestCoverageV8Version = '^1.0.4';\nexport const vitestCoverageIstanbulVersion = '^1.0.4';\n"],"names":["nxVersion","viteVersion","vitestVersion","vitePluginReactVersion","vitePluginReactSwcVersion","jsdomVersion","vitePluginDtsVersion","happyDomVersion","edgeRuntimeVmVersion","vitestCoverageV8Version","vitestCoverageIstanbulVersion","require","version"],"mappings":";;;;;;;;IAAaA,SAAS;eAATA;;IACAC,WAAW;eAAXA;;IACAC,aAAa;eAAbA;;IACAC,sBAAsB;eAAtBA;;IACAC,yBAAyB;eAAzBA;;IACAC,YAAY;eAAZA;;IACAC,oBAAoB;eAApBA;;IACAC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IAGAC,uBAAuB;eAAvBA;;IACAC,6BAA6B;eAA7BA;;;AAZN,MAAMV,YAAYW,QAAQ,sBAAsBC,OAAO;AACvD,MAAMX,cAAc;AACpB,MAAMC,gBAAgB;AACtB,MAAMC,yBAAyB;AAC/B,MAAMC,4BAA4B;AAClC,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAC7B,MAAMC,kBAAkB;AACxB,MAAMC,uBAAuB;AAG7B,MAAMC,0BAA0B;AAChC,MAAMC,gCAAgC"}