@nx/vite 18.0.4 → 18.0.5

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.0.4",
+  "version": "18.0.5",
   "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.0.4",
+    "@nx/devkit": "18.0.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/js": "18.0.4",
+    "@nx/js": "18.0.5",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "18.0.4"
+    "@nrwl/vite": "18.0.5"
   },
   "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,8 +45,13 @@ async function getOptions(options, context, projectRoot, extraArgs) {
         `);
     }
     const root = projectRoot === '.' ? process.cwd() : (0, _path.relative)(context.cwd, (0, _devkit.joinPathFragments)(context.root, projectRoot));
+    const { parseCLI } = await (0, _executorutils.loadVitestDynamicImport)();
+    const normalizedExtraArgs = parseCLI([
+        'vitest',
+        ...getOptionsAsArgv(options)
+    ]);
     var _resolved_config_root;
-    const settings = _extends._({}, extraArgs, {
+    const settings = _extends._({}, normalizedExtraArgs, {
         // This should not be needed as it's going to be set in vite.config.ts
         // but leaving it here in case someone did not migrate correctly
         root: (_resolved_config_root = resolved.config.root) != null ? _resolved_config_root : root,
@@ -55,13 +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;
+    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 settings = {\n    ...extraArgs,\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"],"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","settings","key","Object","keys"],"mappings":";;;;;;;;IAWsBA,UAAU;eAAVA;;IA6DAC,YAAY;eAAZA;;;;wBAnEf;8BAEqC;sBACnB;+BACa;AAE/B,eAAeD,WACpBE,OAA8B,EAC9BC,OAAwB,EACxBC,WAAmB,EACnBC,SAA8B;QA+BNC,kBAuBLA;IApDnB,yFAAyF;IACzF,MAAM,EAAEC,kBAAkB,EAAEC,WAAW,EAAE,GAAG,MAAMC,IAAAA,oCAAqB;IAEvE,MAAMC,iBAAiBC,IAAAA,yCAA2B,EAChDR,QAAQS,IAAI,EACZR,aACAF,QAAQW,UAAU;IAGpB,IAAI,CAACH,gBAAgB;QACnB,MAAM,IAAII,MACRC,IAAAA,oBAAY,CAAA,CAAC;oDACiC,EAAEL,eAAe;;;;;QAK7D,CAAC;IAEP;QAIUL;IAFV,MAAMC,WAAW,MAAMC,mBACrB;QACES,MAAMX,CAAAA,kBAAAA,6BAAAA,UAAWW,IAAI,YAAfX,kBAAmB;QACzBY,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,EAC9CP,QAAQmB,WAAW,CACpB;QACK,CAAC;IACP;IACA,MAAMV,OACJR,gBAAgB,MACZmB,QAAQC,GAAG,KACXC,IAAAA,cAAQ,EAACtB,QAAQqB,GAAG,EAAEE,IAAAA,yBAAiB,EAACvB,QAAQS,IAAI,EAAER;QAMpDE;IAJR,MAAMqB,WAAW,eACZtB;QACH,sEAAsE;QACtE,gEAAgE;QAChEO,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,GAAGqB;AACvD;AAEO,eAAe1B,aACpBC,OAA8B;IAE9B,yCAAyC;IACzC,MAAMG,YAAiC,CAAC;IACxC,KAAK,MAAMuB,OAAOC,OAAOC,IAAI,CAAC5B,SAAU;QACtCG,SAAS,CAACuB,IAAI,GAAG1B,OAAO,CAAC0B,IAAI;IAC/B;IAEA,OAAOvB;AACT"}
+{"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

@@ -23,6 +23,7 @@ const _generatorutils = require("../../utils/generator-utils");
 const _init = require("../init/init");
 const _vitestgenerator = require("../vitest/vitest-generator");
 const _ensuredependencies = require("../../utils/ensure-dependencies");
+const _convertnonvite = require("./lib/convert-non-vite");
 function viteConfigurationGenerator(host, schema) {
     return viteConfigurationGeneratorInternal(host, _extends._({
         addPlugin: false
@@ -40,9 +41,6 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
     const { targets, root: projectRoot } = projectConfig;
     var _projectConfig_projectType;
     const projectType = (_projectConfig_projectType = projectConfig.projectType) != null ? _projectConfig_projectType : 'library';
-    let buildTargetName = 'build';
-    let serveTargetName = 'serve';
-    let testTargetName = 'test';
     var _includeLib;
     (_includeLib = (_schema1 = schema).includeLib) != null ? _includeLib : _schema1.includeLib = projectType === 'library';
     var _testEnvironment;
@@ -52,67 +50,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
    * to use the vite executors.
    */ let projectAlreadyHasViteTargets = {};
     if (!schema.newProject) {
-        var _targets_buildTargetName_options, _targets_buildTargetName;
-        const userProvidedTargetName = {
-            build: schema.buildTarget,
-            serve: schema.serveTarget,
-            test: schema.testTarget
-        };
-        const { validFoundTargetName, projectContainsUnsupportedExecutor, userProvidedTargetIsUnsupported, alreadyHasNxViteTargets } = (0, _generatorutils.findExistingTargetsInProject)(targets, userProvidedTargetName);
-        projectAlreadyHasViteTargets = alreadyHasNxViteTargets;
-        /**
-     * This means that we only found unsupported build targets in that project.
-     * The only way that buildTarget is defined, means that it is supported.
-     *
-     * If the `unsupported` flag was false, it would mean that we did not find
-     * a build target at all, so we can create a new one.
-     *
-     * So we only throw if we found a target, but it is unsupported.
-     */ if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {
-            throw new Error(`The project ${schema.project} cannot be converted to use the @nx/vite executors.`);
-        }
-        if (alreadyHasNxViteTargets.build && (alreadyHasNxViteTargets.serve || projectType === 'library') && alreadyHasNxViteTargets.test) {
-            throw new Error(`The project ${schema.project} is already configured to use the @nx/vite executors.
-        Please try a different project, or remove the existing targets 
-        and re-run this generator to reset the existing Vite Configuration.
-        `);
-        }
-        /**
-     * This means that we did not find any supported executors
-     * so we don't have any valid target names.
-     *
-     * However, the executors that we may have found are not in the
-     * list of the specifically unsupported executors either.
-     *
-     * So, we should warn the user about it.
-     */ if (!projectContainsUnsupportedExecutor && !validFoundTargetName.build && !validFoundTargetName.serve && !validFoundTargetName.test) {
-            await (0, _generatorutils.handleUnknownExecutors)(schema.project);
-        }
-        /**
-     * There is a possibility at this stage that the user has provided
-     * targets with unsupported executors.
-     * We keep track here of which of the targets that the user provided
-     * are unsupported.
-     * We do this with the `userProvidedTargetIsUnsupported` object,
-     * which contains flags for each target (whether it is supported or not).
-     *
-     * We also keep track of the targets that we found in the project,
-     * through the findExistingTargetsInProject function, which returns
-     * targets for build/serve/test that use supported executors, and
-     * can be converted to use the vite executors. These are the
-     * kept in the validFoundTargetName object.
-     */ await (0, _generatorutils.handleUnsupportedUserProvidedTargets)(userProvidedTargetIsUnsupported, userProvidedTargetName, validFoundTargetName);
-        var _validFoundTargetName_build;
-        /**
-     * Once the user is at this stage, then they can go ahead and convert.
-     */ buildTargetName = (_validFoundTargetName_build = validFoundTargetName.build) != null ? _validFoundTargetName_build : buildTargetName;
-        var _validFoundTargetName_serve;
-        serveTargetName = (_validFoundTargetName_serve = validFoundTargetName.serve) != null ? _validFoundTargetName_serve : serveTargetName;
-        if (projectType === 'application') {
-            (0, _generatorutils.moveAndEditIndexHtml)(tree, schema, buildTargetName);
-        }
-        (0, _generatorutils.deleteWebpackConfig)(tree, projectRoot, targets == null ? void 0 : (_targets_buildTargetName = targets[buildTargetName]) == null ? void 0 : (_targets_buildTargetName_options = _targets_buildTargetName.options) == null ? void 0 : _targets_buildTargetName_options.webpackConfig);
-        (0, _generatorutils.editTsConfig)(tree, schema);
+        await (0, _convertnonvite.convertNonVite)(tree, schema, projectRoot, projectType, targets);
     }
     const jsInitTask = await (0, _js.initGenerator)(tree, _extends._({}, schema, {
         skipFormat: true,
@@ -128,14 +66,14 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
     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) {
-            (0, _generatorutils.addOrChangeBuildTarget)(tree, schema, buildTargetName);
+            (0, _generatorutils.addBuildTarget)(tree, schema, 'build');
         }
         if (!schema.includeLib) {
             if (!projectAlreadyHasViteTargets.serve) {
-                (0, _generatorutils.addOrChangeServeTarget)(tree, schema, serveTargetName);
+                (0, _generatorutils.addServeTarget)(tree, schema, 'serve');
             }
             if (!projectAlreadyHasViteTargets.preview) {
-                (0, _generatorutils.addPreviewTarget)(tree, schema, serveTargetName);
+                (0, _generatorutils.addPreviewTarget)(tree, schema, 'preview');
             }
         }
     }
@@ -192,7 +130,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
             inSourceTests: schema.inSourceTests,
             coverageProvider: 'v8',
             skipViteConfig: true,
-            testTarget: testTargetName,
+            testTarget: 'test',
             skipFormat: true,
             addPlugin: schema.addPlugin
         });

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  addOrChangeBuildTarget,\n  addOrChangeServeTarget,\n  addPreviewTarget,\n  createOrEditViteConfig,\n  deleteWebpackConfig,\n  editTsConfig,\n  findExistingTargetsInProject,\n  handleUnknownExecutors,\n  handleUnsupportedUserProvidedTargets,\n  moveAndEditIndexHtml,\n  TargetFlags,\n  UserProvidedTargetName,\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';\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 {\n    targets,\n\n    root: projectRoot,\n  } = projectConfig;\n\n  const projectType = projectConfig.projectType ?? 'library';\n  let buildTargetName = 'build';\n  let serveTargetName = 'serve';\n  let testTargetName = 'test';\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    const userProvidedTargetName: UserProvidedTargetName = {\n      build: schema.buildTarget,\n      serve: schema.serveTarget,\n      test: schema.testTarget,\n    };\n\n    const {\n      validFoundTargetName,\n      projectContainsUnsupportedExecutor,\n      userProvidedTargetIsUnsupported,\n      alreadyHasNxViteTargets,\n    } = findExistingTargetsInProject(targets, userProvidedTargetName);\n    projectAlreadyHasViteTargets = alreadyHasNxViteTargets;\n    /**\n     * This means that we only found unsupported build targets in that project.\n     * The only way that buildTarget is defined, means that it is supported.\n     *\n     * If the `unsupported` flag was false, it would mean that we did not find\n     * a build target at all, so we can create a new one.\n     *\n     * So we only throw if we found a target, but it is unsupported.\n     */\n    if (!validFoundTargetName.build && projectContainsUnsupportedExecutor) {\n      throw new Error(\n        `The project ${schema.project} cannot be converted to use the @nx/vite executors.`\n      );\n    }\n\n    if (\n      alreadyHasNxViteTargets.build &&\n      (alreadyHasNxViteTargets.serve || projectType === 'library') &&\n      alreadyHasNxViteTargets.test\n    ) {\n      throw new Error(\n        `The project ${schema.project} is already configured to use the @nx/vite executors.\n        Please try a different project, or remove the existing targets \n        and re-run this generator to reset the existing Vite Configuration.\n        `\n      );\n    }\n\n    /**\n     * This means that we did not find any supported executors\n     * so we don't have any valid target names.\n     *\n     * However, the executors that we may have found are not in the\n     * list of the specifically unsupported executors either.\n     *\n     * So, we should warn the user about it.\n     */\n\n    if (\n      !projectContainsUnsupportedExecutor &&\n      !validFoundTargetName.build &&\n      !validFoundTargetName.serve &&\n      !validFoundTargetName.test\n    ) {\n      await handleUnknownExecutors(schema.project);\n    }\n\n    /**\n     * There is a possibility at this stage that the user has provided\n     * targets with unsupported executors.\n     * We keep track here of which of the targets that the user provided\n     * are unsupported.\n     * We do this with the `userProvidedTargetIsUnsupported` object,\n     * which contains flags for each target (whether it is supported or not).\n     *\n     * We also keep track of the targets that we found in the project,\n     * through the findExistingTargetsInProject function, which returns\n     * targets for build/serve/test that use supported executors, and\n     * can be converted to use the vite executors. These are the\n     * kept in the validFoundTargetName object.\n     */\n    await handleUnsupportedUserProvidedTargets(\n      userProvidedTargetIsUnsupported,\n      userProvidedTargetName,\n      validFoundTargetName\n    );\n\n    /**\n     * Once the user is at this stage, then they can go ahead and convert.\n     */\n\n    buildTargetName = validFoundTargetName.build ?? buildTargetName;\n    serveTargetName = validFoundTargetName.serve ?? serveTargetName;\n\n    if (projectType === 'application') {\n      moveAndEditIndexHtml(tree, schema, buildTargetName);\n    }\n\n    deleteWebpackConfig(\n      tree,\n      projectRoot,\n      targets?.[buildTargetName]?.options?.webpackConfig\n    );\n\n    editTsConfig(tree, schema);\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      addOrChangeBuildTarget(tree, schema, buildTargetName);\n    }\n\n    if (!schema.includeLib) {\n      if (!projectAlreadyHasViteTargets.serve) {\n        addOrChangeServeTarget(tree, schema, serveTargetName);\n      }\n      if (!projectAlreadyHasViteTargets.preview) {\n        addPreviewTarget(tree, schema, serveTargetName);\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: testTargetName,\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","buildTargetName","serveTargetName","testTargetName","includeLib","testEnvironment","projectAlreadyHasViteTargets","newProject","userProvidedTargetName","build","buildTarget","serve","serveTarget","test","testTarget","validFoundTargetName","projectContainsUnsupportedExecutor","userProvidedTargetIsUnsupported","alreadyHasNxViteTargets","findExistingTargetsInProject","Error","handleUnknownExecutors","handleUnsupportedUserProvidedTargets","moveAndEditIndexHtml","deleteWebpackConfig","options","webpackConfig","editTsConfig","jsInitTask","jsInitGenerator","skipFormat","tsConfigName","push","initTask","initGenerator","ensureDependencies","readNxJson","hasPlugin","plugins","some","p","plugin","addOrChangeBuildTarget","addOrChangeServeTarget","preview","addPreviewTarget","updateJson","joinPathFragments","json","compilerOptions","types","includes","uiFramework","createOrEditViteConfig","includeVitest","inSourceTests","rollupOptionsExternal","imports","compiler","undefined","vitestTask","vitestGenerator","coverageProvider","skipViteConfig","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  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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"}

package/src/generators/configuration/lib/convert-non-vite.d.ts

@@ -0,0 +1,5 @@
+import { TargetConfiguration, Tree } from '@nx/devkit';
+import { ViteConfigurationGeneratorSchema } from '../schema';
+export declare function convertNonVite(tree: Tree, schema: ViteConfigurationGeneratorSchema, projectRoot: string, projectType: string, targets: {
+    [targetName: string]: TargetConfiguration<any>;
+}): Promise<void>;

package/src/generators/configuration/lib/convert-non-vite.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "convertNonVite", {
+    enumerable: true,
+    get: function() {
+        return convertNonVite;
+    }
+});
+const _devkit = require("@nx/devkit");
+const _findviteconfig = require("../../../utils/find-vite-config");
+const _generatorutils = require("../../../utils/generator-utils");
+async function convertNonVite(tree, schema, projectRoot, projectType, targets) {
+    // Check if it has vite
+    const hasViteConfig = (0, _findviteconfig.findViteConfig)(tree, projectRoot);
+    const hasIndexHtmlAtRoot = tree.exists((0, _devkit.joinPathFragments)(projectRoot, 'index.html'));
+    // Check if it has webpack
+    const hasWebpackConfig = (0, _findviteconfig.findWebpackConfig)(tree, projectRoot);
+    if (hasWebpackConfig) {
+        if (projectType === 'application') {
+            (0, _generatorutils.moveAndEditIndexHtml)(tree, schema);
+        }
+        (0, _generatorutils.deleteWebpackConfig)(tree, projectRoot, hasWebpackConfig);
+        (0, _generatorutils.editTsConfig)(tree, schema);
+        return;
+    }
+    if (projectType === 'application' && hasViteConfig && hasIndexHtmlAtRoot && !hasWebpackConfig) {
+        throw new Error(`The project ${schema.project} is already configured to use Vite.`);
+        return;
+    }
+    if (projectType === 'library' && hasViteConfig) {
+        // continue anyway - it could need to be updated - only update vite.config.ts in any case
+        (0, _generatorutils.editTsConfig)(tree, schema);
+        return;
+    }
+    // Does the project have js executors?
+    const { supported: jsTargetName, unsupported } = (0, _generatorutils.findExistingJsBuildTargetInProject)(targets);
+    if (jsTargetName) {
+        (0, _generatorutils.editTsConfig)(tree, schema);
+        return;
+    }
+    if (unsupported) {
+        throw new Error(`
+      Nx cannot convert your project to use vite.
+      Please try again with a different project.
+    `);
+    }
+    // If it's a library, it's most possible it's non-buildable
+    // So fix the tsconfig and return, to continue with the rest of the setup
+    if (projectType === 'library' && !hasViteConfig && !hasWebpackConfig && !jsTargetName) {
+        (0, _generatorutils.editTsConfig)(tree, schema);
+        return;
+    }
+    /**
+   * The project is an app.
+   * The project has no js executors, no webpack config, no vite config.
+   * We did not find any configuration that hints the project can
+   * definitely be converted.
+   * So, we should warn the user about it.
+   * They can choose whether to convert it or not
+   */ await (0, _generatorutils.handleUnknownConfiguration)(schema.project);
+}
+
+//# sourceMappingURL=convert-non-vite.js.map

package/src/generators/configuration/lib/convert-non-vite.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/vite/src/generators/configuration/lib/convert-non-vite.ts"],"sourcesContent":["import {\n  TargetConfiguration,\n  Tree,\n  joinPathFragments,\n  logger,\n} from '@nx/devkit';\nimport {\n  findViteConfig,\n  findWebpackConfig,\n} from '../../../utils/find-vite-config';\nimport { ViteConfigurationGeneratorSchema } from '../schema';\nimport {\n  deleteWebpackConfig,\n  editTsConfig,\n  findExistingJsBuildTargetInProject,\n  handleUnknownConfiguration,\n  moveAndEditIndexHtml,\n} from '../../../utils/generator-utils';\n\nexport async function convertNonVite(\n  tree: Tree,\n  schema: ViteConfigurationGeneratorSchema,\n  projectRoot: string,\n  projectType: string,\n  targets: {\n    [targetName: string]: TargetConfiguration<any>;\n  }\n) {\n  // Check if it has vite\n  const hasViteConfig = findViteConfig(tree, projectRoot);\n  const hasIndexHtmlAtRoot = tree.exists(\n    joinPathFragments(projectRoot, 'index.html')\n  );\n\n  // Check if it has webpack\n  const hasWebpackConfig = findWebpackConfig(tree, projectRoot);\n  if (hasWebpackConfig) {\n    if (projectType === 'application') {\n      moveAndEditIndexHtml(tree, schema);\n    }\n    deleteWebpackConfig(tree, projectRoot, hasWebpackConfig);\n    editTsConfig(tree, schema);\n    return;\n  }\n\n  if (\n    projectType === 'application' &&\n    hasViteConfig &&\n    hasIndexHtmlAtRoot &&\n    !hasWebpackConfig\n  ) {\n    throw new Error(\n      `The project ${schema.project} is already configured to use Vite.`\n    );\n    return;\n  }\n\n  if (projectType === 'library' && hasViteConfig) {\n    // continue anyway - it could need to be updated - only update vite.config.ts in any case\n    editTsConfig(tree, schema);\n    return;\n  }\n\n  // Does the project have js executors?\n  const { supported: jsTargetName, unsupported } =\n    findExistingJsBuildTargetInProject(targets);\n  if (jsTargetName) {\n    editTsConfig(tree, schema);\n    return;\n  }\n\n  if (unsupported) {\n    throw new Error(`\n      Nx cannot convert your project to use vite.\n      Please try again with a different project.\n    `);\n  }\n\n  // If it's a library, it's most possible it's non-buildable\n  // So fix the tsconfig and return, to continue with the rest of the setup\n  if (\n    projectType === 'library' &&\n    !hasViteConfig &&\n    !hasWebpackConfig &&\n    !jsTargetName\n  ) {\n    editTsConfig(tree, schema);\n    return;\n  }\n\n  /**\n   * The project is an app.\n   * The project has no js executors, no webpack config, no vite config.\n   * We did not find any configuration that hints the project can\n   * definitely be converted.\n   * So, we should warn the user about it.\n   * They can choose whether to convert it or not\n   */\n  await handleUnknownConfiguration(schema.project);\n}\n"],"names":["convertNonVite","tree","schema","projectRoot","projectType","targets","hasViteConfig","findViteConfig","hasIndexHtmlAtRoot","exists","joinPathFragments","hasWebpackConfig","findWebpackConfig","moveAndEditIndexHtml","deleteWebpackConfig","editTsConfig","Error","project","supported","jsTargetName","unsupported","findExistingJsBuildTargetInProject","handleUnknownConfiguration"],"mappings":";+BAmBsBA;;;eAAAA;;;wBAdf;gCAIA;gCAQA;AAEA,eAAeA,eACpBC,IAAU,EACVC,MAAwC,EACxCC,WAAmB,EACnBC,WAAmB,EACnBC,OAEC;IAED,uBAAuB;IACvB,MAAMC,gBAAgBC,IAAAA,8BAAc,EAACN,MAAME;IAC3C,MAAMK,qBAAqBP,KAAKQ,MAAM,CACpCC,IAAAA,yBAAiB,EAACP,aAAa;IAGjC,0BAA0B;IAC1B,MAAMQ,mBAAmBC,IAAAA,iCAAiB,EAACX,MAAME;IACjD,IAAIQ,kBAAkB;QACpB,IAAIP,gBAAgB,eAAe;YACjCS,IAAAA,oCAAoB,EAACZ,MAAMC;QAC7B;QACAY,IAAAA,mCAAmB,EAACb,MAAME,aAAaQ;QACvCI,IAAAA,4BAAY,EAACd,MAAMC;QACnB;IACF;IAEA,IACEE,gBAAgB,iBAChBE,iBACAE,sBACA,CAACG,kBACD;QACA,MAAM,IAAIK,MACR,CAAC,YAAY,EAAEd,OAAOe,OAAO,CAAC,mCAAmC,CAAC;QAEpE;IACF;IAEA,IAAIb,gBAAgB,aAAaE,eAAe;QAC9C,yFAAyF;QACzFS,IAAAA,4BAAY,EAACd,MAAMC;QACnB;IACF;IAEA,sCAAsC;IACtC,MAAM,EAAEgB,WAAWC,YAAY,EAAEC,WAAW,EAAE,GAC5CC,IAAAA,kDAAkC,EAAChB;IACrC,IAAIc,cAAc;QAChBJ,IAAAA,4BAAY,EAACd,MAAMC;QACnB;IACF;IAEA,IAAIkB,aAAa;QACf,MAAM,IAAIJ,MAAM,CAAC;;;IAGjB,CAAC;IACH;IAEA,2DAA2D;IAC3D,yEAAyE;IACzE,IACEZ,gBAAgB,aAChB,CAACE,iBACD,CAACK,oBACD,CAACQ,cACD;QACAJ,IAAAA,4BAAY,EAACd,MAAMC;QACnB;IACF;IAEA;;;;;;;GAOC,GACD,MAAMoB,IAAAA,0CAA0B,EAACpB,OAAOe,OAAO;AACjD"}

package/src/generators/configuration/schema.d.ts

@@ -6,9 +6,6 @@ export interface ViteConfigurationGeneratorSchema {
   includeVitest?: boolean;
   inSourceTests?: boolean;
   includeLib?: boolean;
-  buildTarget?: string;
-  serveTarget?: string;
-  testTarget?: string;
   skipFormat?: boolean;
   testEnvironment?: 'node' | 'jsdom' | 'happy-dom' | 'edge-runtime' | string;
   addPlugin?: boolean;

package/src/generators/configuration/schema.json

@@ -44,18 +44,6 @@
       "default": false,
       "hidden": true
     },
-    "buildTarget": {
-      "type": "string",
-      "description": "The build target of the project to be transformed to use the @nx/vite:build executor."
-    },
-    "serveTarget": {
-      "type": "string",
-      "description": "The serve target of the project to be transformed to use the @nx/vite:dev-server and @nx/vite:preview-server executors."
-    },
-    "testTarget": {
-      "type": "string",
-      "description": "The test target of the project to be transformed to use the @nx/vite:test executor."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

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

@@ -45,8 +45,8 @@ async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
     const nxJson = (0, _devkit.readNxJson)(tree);
     const hasPluginCheck = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>(typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin') || hasPlugin);
     if (!hasPluginCheck) {
-        var _schema_testTarget, _ref;
-        const testTarget = (_ref = (_schema_testTarget = schema.testTarget) != null ? _schema_testTarget : (0, _generatorutils.findExistingTargetsInProject)(targets).validFoundTargetName.test) != null ? _ref : 'test';
+        var _schema_testTarget;
+        const testTarget = (_schema_testTarget = schema.testTarget) != null ? _schema_testTarget : 'test';
         (0, _generatorutils.addOrChangeTestTarget)(tree, schema, testTarget);
     }
     if (!schema.skipViteConfig) {

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  findExistingTargetsInProject,\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 =\n      schema.testTarget ??\n      findExistingTargetsInProject(targets).validFoundTargetName.test ??\n      '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","findExistingTargetsInProject","validFoundTargetName","test","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 { 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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"}