@nx/vite 17.0.4 → 17.0.6

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

@@ -1,7 +1,12 @@
 export interface VitestExecutorOptions {
-  configFile?: string;
+  config?: string;
+  passWithNoTests?: boolean;
+  testNamePattern?: string;
+  mode?: 'test' | 'benchmark' | 'typecheck';
+  reporters?: string[];
+  watch?: boolean;
+  update?: boolean;
   reportsDirectory?: string;
+  coverage?: boolean;
   testFiles?: string[];
-  watch?: boolean;
-  mode?: string;
 }

package/src/executors/test/schema.json

@@ -1,34 +1,66 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "version": 2,
   "cli": "nx",
   "title": "Vitest executor",
   "description": "Test using Vitest.",
   "type": "object",
   "properties": {
-    "configFile": {
+    "config": {
       "type": "string",
       "description": "The path to the local vitest config",
       "x-completion-type": "file",
-      "x-completion-glob": "@(vitest|vite).config@(.js|.ts)",
-      "aliases": ["config"]
+      "x-completion-glob": "@(vitest|vite).config@(.js|.ts)"
     },
-    "reportsDirectory": {
+    "passWithNoTests": {
+      "type": "boolean",
+      "default": true,
+      "description": "Pass the test even if no tests are found"
+    },
+    "testNamePattern": {
       "type": "string",
-      "description": "Directory to write coverage report to."
+      "description": "Run tests with full names matching the pattern"
     },
     "mode": {
       "type": "string",
-      "description": "Mode for Vite."
+      "enum": ["test", "benchmark", "typecheck"],
+      "default": "test",
+      "description": "The mode that vitest will run on",
+      "x-priority": "important"
+    },
+    "watch": {
+      "type": "boolean",
+      "default": false,
+      "description": "Enable watch mode"
+    },
+    "reporters": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "An array of reporters to pass to vitest"
+    },
+    "update": {
+      "type": "boolean",
+      "default": false,
+      "alias": "u",
+      "description": "Update snapshots",
+      "x-priority": "important"
+    },
+    "coverage": {
+      "type": "boolean",
+      "default": false,
+      "description": "Enable coverage report",
+      "x-priority": "important"
+    },
+    "reportsDirectory": {
+      "type": "string",
+      "description": "Directory to write coverage report to."
     },
     "testFiles": {
       "aliases": ["testFile"],
       "type": "array",
       "items": { "type": "string" }
-    },
-    "watch": {
-      "description": "Watch files for changes and rerun tests related to changed files.",
-      "type": "boolean"
     }
   },
   "required": [],

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

@@ -13,33 +13,52 @@ _export(exports, {
         return _default;
     }
 });
+const _extends = require("@swc/helpers/_/_extends");
 const _devkit = require("@nx/devkit");
 const _path = require("path");
+const _fs = require("fs");
 const _internal = require("@nx/js/src/internal");
-const _nxreporter = require("./lib/nx-reporter");
-const _utils = require("./lib/utils");
-const _executorutils = require("../../utils/executor-utils");
+let NxReporter = class NxReporter {
+    async *[Symbol.asyncIterator]() {
+        do {
+            const hasErrors = await this.deferred.promise;
+            yield {
+                hasErrors
+            };
+            this.setupDeferred();
+        }while (this.watch)
+    }
+    setupDeferred() {
+        let resolve;
+        this.deferred = {
+            promise: new Promise((res)=>{
+                resolve = res;
+            }),
+            resolve
+        };
+    }
+    onFinished(files, errors) {
+        const hasErrors = files.some((f)=>{
+            var _f_result;
+            return ((_f_result = f.result) == null ? void 0 : _f_result.state) === 'fail';
+        }) || (errors == null ? void 0 : errors.length) > 0;
+        this.deferred.resolve(hasErrors);
+    }
+    constructor(watch){
+        this.watch = watch;
+        this.setupDeferred();
+    }
+};
 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 (0, _executorutils.loadVitestDynamicImport)();
-    var _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'] = [];
-    } else if (typeof resolvedOptions['reporters'] === 'string') {
-        resolvedOptions['reporters'] = [
-            resolvedOptions['reporters']
-        ];
-    }
-    resolvedOptions['reporters'].push(nxReporter);
+    const { startVitest } = await Function('return import("vitest/node")')();
+    const nxReporter = new NxReporter(options.watch);
+    const settings = await getSettings(options, context, projectRoot);
+    settings.reporters.push(nxReporter);
     var _options_testFiles;
     const cliFilters = (_options_testFiles = options.testFiles) != null ? _options_testFiles : [];
-    var _resolvedOptions_mode;
-    const ctx = await startVitest((_resolvedOptions_mode = resolvedOptions['mode']) != null ? _resolvedOptions_mode : 'test', cliFilters, resolvedOptions);
+    const ctx = await startVitest(options.mode, cliFilters, settings);
     let hasErrors = false;
     const processExit = ()=>{
         ctx.exit();
@@ -49,7 +68,7 @@ async function* vitestExecutor(options, context) {
             process.exit(0);
         }
     };
-    if (resolvedOptions['watch'] === true) {
+    if (options.watch) {
         process.on('SIGINT', processExit);
         process.on('SIGTERM', processExit);
         process.on('exit', processExit);
@@ -62,6 +81,79 @@ async function* vitestExecutor(options, context) {
         success: !hasErrors
     };
 }
+async function getSettings(options, context, projectRoot) {
+    var _packageJson_dependencies, _packageJson_devDependencies, _resolved_config, _resolved_config_test, _resolved_config1, _resolved_config_test1, _resolved_config2;
+    // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
+    const { loadConfigFromFile } = await Function('return import("vite")')();
+    const packageJsonPath = (0, _path.join)(_devkit.workspaceRoot, 'package.json');
+    const packageJson = (0, _fs.existsSync)(packageJsonPath) ? (0, _devkit.readJsonFile)(packageJsonPath) : undefined;
+    let provider = 'v8';
+    if ((packageJson == null ? void 0 : (_packageJson_dependencies = packageJson.dependencies) == null ? void 0 : _packageJson_dependencies['@vitest/coverage-c8']) || (packageJson == null ? void 0 : (_packageJson_devDependencies = packageJson.devDependencies) == null ? void 0 : _packageJson_devDependencies['@vitest/coverage-c8'])) {
+        provider = 'c8';
+    }
+    const offset = (0, _path.relative)(_devkit.workspaceRoot, context.cwd);
+    // if reportsDirectory is not provided vitest will remove all files in the project root
+    // when coverage is enabled in the vite.config.ts
+    const coverage = options.reportsDirectory ? {
+        enabled: options.coverage,
+        reportsDirectory: options.reportsDirectory,
+        provider
+    } : {};
+    const viteConfigPath = options.config ? options.config // config is expected to be from the workspace root
+     : findViteConfig((0, _devkit.joinPathFragments)(context.root, projectRoot));
+    if (!viteConfigPath) {
+        throw new Error((0, _devkit.stripIndents)`
+      Unable to load test config from config file ${viteConfigPath}.
+      
+      Please make sure that vitest is configured correctly, 
+      or use the @nx/vite:vitest generator to configure it for you.
+      You can read more here: https://nx.dev/nx-api/vite/generators/vitest
+      `);
+    }
+    const resolvedProjectRoot = (0, _path.resolve)(_devkit.workspaceRoot, projectRoot);
+    const resolvedViteConfigPath = (0, _path.resolve)(_devkit.workspaceRoot, projectRoot, (0, _path.relative)(resolvedProjectRoot, viteConfigPath));
+    const resolved = await loadConfigFromFile({
+        mode: options.mode,
+        command: 'serve'
+    }, resolvedViteConfigPath, resolvedProjectRoot);
+    if (!viteConfigPath || !(resolved == null ? void 0 : (_resolved_config = resolved.config) == null ? void 0 : _resolved_config['test'])) {
+        var _resolved_path;
+        _devkit.logger.warn((0, _devkit.stripIndents)`Unable to load test config from config file ${(_resolved_path = resolved == null ? void 0 : resolved.path) != null ? _resolved_path : viteConfigPath}
+Some settings may not be applied as expected.
+You can manually set the config in the project, ${context.projectName}, configuration.
+      `);
+    }
+    var _options_reporters, _ref;
+    const settings = _extends._({}, options, {
+        // when running nx from the project root, the root will get appended to the cwd.
+        // creating an invalid path and no tests will be found.
+        // instead if we are not at the root, let the cwd be root.
+        root: offset === '' ? resolvedProjectRoot : _devkit.workspaceRoot,
+        config: resolvedViteConfigPath,
+        reporters: [
+            ...(_options_reporters = options.reporters) != null ? _options_reporters : [],
+            ...(_ref = resolved == null ? void 0 : (_resolved_config1 = resolved.config) == null ? void 0 : (_resolved_config_test = _resolved_config1['test']) == null ? void 0 : _resolved_config_test.reporters) != null ? _ref : [],
+            'default'
+        ],
+        coverage: _extends._({}, coverage, resolved == null ? void 0 : (_resolved_config2 = resolved.config) == null ? void 0 : (_resolved_config_test1 = _resolved_config2['test']) == null ? void 0 : _resolved_config_test1.coverage)
+    });
+    return settings;
+}
+function findViteConfig(projectRootFullPath) {
+    const allowsExt = [
+        'js',
+        'mjs',
+        'ts',
+        'cjs',
+        'mts',
+        'cts'
+    ];
+    for (const ext of allowsExt){
+        if ((0, _fs.existsSync)((0, _devkit.joinPathFragments)(projectRootFullPath, `vite.config.${ext}`))) {
+            return (0, _devkit.joinPathFragments)(projectRootFullPath, `vite.config.${ext}`);
+        }
+    }
+}
 const _default = vitestExecutor;
 
 //# sourceMappingURL=vitest.impl.js.map

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 { 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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/test/vitest.impl.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  readJsonFile,\n  stripIndents,\n  workspaceRoot,\n} from '@nx/devkit';\nimport type { CoverageOptions, File, Reporter } from 'vitest';\nimport { VitestExecutorOptions } from './schema';\nimport { join, relative, resolve } from 'path';\nimport { existsSync } from 'fs';\nimport { registerTsConfigPaths } from '@nx/js/src/internal';\n\nclass NxReporter implements Reporter {\n  deferred: {\n    promise: Promise<boolean>;\n    resolve: (val: boolean) => void;\n  };\n\n  constructor(private watch: boolean) {\n    this.setupDeferred();\n  }\n\n  async *[Symbol.asyncIterator]() {\n    do {\n      const hasErrors = await this.deferred.promise;\n      yield { hasErrors };\n      this.setupDeferred();\n    } while (this.watch);\n  }\n\n  private setupDeferred() {\n    let resolve: (val: boolean) => void;\n    this.deferred = {\n      promise: new Promise((res) => {\n        resolve = res;\n      }),\n      resolve,\n    };\n  }\n\n  onFinished(files: File[], errors?: unknown[]) {\n    const hasErrors =\n      files.some((f) => f.result?.state === 'fail') || errors?.length > 0;\n    this.deferred.resolve(hasErrors);\n  }\n}\n\nexport async function* vitestExecutor(\n  options: VitestExecutorOptions,\n  context: ExecutorContext\n) {\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  registerTsConfigPaths(resolve(workspaceRoot, projectRoot, 'tsconfig.json'));\n\n  const { startVitest } = await (Function(\n    'return import(\"vitest/node\")'\n  )() as Promise<typeof import('vitest/node')>);\n\n  const nxReporter = new NxReporter(options.watch);\n  const settings = await getSettings(options, context, projectRoot);\n  settings.reporters.push(nxReporter);\n  const cliFilters = options.testFiles ?? [];\n\n  const ctx = await startVitest(options.mode, cliFilters, settings);\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 (options.watch) {\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\nasync function getSettings(\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 } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\n  const packageJsonPath = join(workspaceRoot, 'package.json');\n  const packageJson = existsSync(packageJsonPath)\n    ? readJsonFile(packageJsonPath)\n    : undefined;\n  let provider: 'v8' | 'c8' = 'v8';\n  if (\n    packageJson?.dependencies?.['@vitest/coverage-c8'] ||\n    packageJson?.devDependencies?.['@vitest/coverage-c8']\n  ) {\n    provider = 'c8';\n  }\n  const offset = relative(workspaceRoot, context.cwd);\n  // if reportsDirectory is not provided vitest will remove all files in the project root\n  // when coverage is enabled in the vite.config.ts\n  const coverage: CoverageOptions = options.reportsDirectory\n    ? {\n        enabled: options.coverage,\n        reportsDirectory: options.reportsDirectory,\n        provider,\n      }\n    : ({} as CoverageOptions);\n\n  const viteConfigPath = options.config\n    ? options.config // config is expected to be from the workspace root\n    : findViteConfig(joinPathFragments(context.root, projectRoot));\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 resolvedProjectRoot = resolve(workspaceRoot, projectRoot);\n  const resolvedViteConfigPath = resolve(\n    workspaceRoot,\n    projectRoot,\n    relative(resolvedProjectRoot, viteConfigPath)\n  );\n\n  const resolved = await loadConfigFromFile(\n    {\n      mode: options.mode,\n      command: 'serve',\n    },\n    resolvedViteConfigPath,\n    resolvedProjectRoot\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    }\nSome settings may not be applied as expected.\nYou can manually set the config in the project, ${\n      context.projectName\n    }, configuration.\n      `);\n  }\n\n  const settings = {\n    ...options,\n    // when running nx from the project root, the root will get appended to the cwd.\n    // creating an invalid path and no tests will be found.\n    // instead if we are not at the root, let the cwd be root.\n    root: offset === '' ? resolvedProjectRoot : workspaceRoot,\n    config: resolvedViteConfigPath,\n    reporters: [\n      ...(options.reporters ?? []),\n      ...((resolved?.config?.['test']?.reporters as string[]) ?? []),\n      'default',\n    ] as (string | Reporter)[],\n    coverage: { ...coverage, ...resolved?.config?.['test']?.coverage },\n  };\n\n  return settings;\n}\n\nfunction findViteConfig(projectRootFullPath: string): string {\n  const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];\n\n  for (const ext of allowsExt) {\n    if (\n      existsSync(joinPathFragments(projectRootFullPath, `vite.config.${ext}`))\n    ) {\n      return joinPathFragments(projectRootFullPath, `vite.config.${ext}`);\n    }\n  }\n}\n\nexport default vitestExecutor;\n"],"names":["vitestExecutor","NxReporter","Symbol","asyncIterator","hasErrors","deferred","promise","setupDeferred","watch","resolve","Promise","res","onFinished","files","errors","some","f","result","state","length","constructor","options","context","projectRoot","projectsConfigurations","projects","projectName","root","registerTsConfigPaths","workspaceRoot","startVitest","Function","nxReporter","settings","getSettings","reporters","push","cliFilters","testFiles","ctx","mode","processExit","exit","process","on","report","exitCode","success","packageJson","resolved","loadConfigFromFile","packageJsonPath","join","existsSync","readJsonFile","undefined","provider","dependencies","devDependencies","offset","relative","cwd","coverage","reportsDirectory","enabled","viteConfigPath","config","findViteConfig","joinPathFragments","Error","stripIndents","resolvedProjectRoot","resolvedViteConfigPath","command","logger","warn","path","projectRootFullPath","allowsExt","ext"],"mappings":";;;;;;;;IAiDuBA,cAAc;eAAdA;;IAwJvB,OAA8B;eAA9B;;;;wBAlMO;sBAGiC;oBACb;0BACW;AAEtC,IAAA,AAAMC,aAAN,MAAMA;IAUJ,OAAO,CAACC,OAAOC,aAAa,CAAC,GAAG;QAC9B,GAAG;YACD,MAAMC,YAAY,MAAM,IAAI,CAACC,QAAQ,CAACC,OAAO;YAC7C,MAAM;gBAAEF;YAAU;YAClB,IAAI,CAACG,aAAa;QACpB,QAAS,IAAI,CAACC,KAAK,CAAE;IACvB;IAEQD,gBAAgB;QACtB,IAAIE;QACJ,IAAI,CAACJ,QAAQ,GAAG;YACdC,SAAS,IAAII,QAAQ,CAACC;gBACpBF,UAAUE;YACZ;YACAF;QACF;IACF;IAEAG,WAAWC,KAAa,EAAEC,MAAkB,EAAE;QAC5C,MAAMV,YACJS,MAAME,IAAI,CAAC,CAACC;gBAAMA;mBAAAA,EAAAA,YAAAA,EAAEC,MAAM,qBAARD,UAAUE,KAAK,MAAK;cAAWJ,CAAAA,0BAAAA,OAAQK,MAAM,IAAG;QACpE,IAAI,CAACd,QAAQ,CAACI,OAAO,CAACL;IACxB;IA1BAgB,YAAoBZ,MAAgB;qBAAhBA;QAClB,IAAI,CAACD,aAAa;IACpB;AAyBF;AAEO,gBAAgBP,eACrBqB,OAA8B,EAC9BC,OAAwB;IAExB,MAAMC,cACJD,QAAQE,sBAAsB,CAACC,QAAQ,CAACH,QAAQI,WAAW,CAAC,CAACC,IAAI;IACnEC,IAAAA,+BAAqB,EAACnB,IAAAA,aAAO,EAACoB,qBAAa,EAAEN,aAAa;IAE1D,MAAM,EAAEO,WAAW,EAAE,GAAG,MAAOC,SAC7B;IAGF,MAAMC,aAAa,IAAI/B,WAAWoB,QAAQb,KAAK;IAC/C,MAAMyB,WAAW,MAAMC,YAAYb,SAASC,SAASC;IACrDU,SAASE,SAAS,CAACC,IAAI,CAACJ;QACLX;IAAnB,MAAMgB,aAAahB,CAAAA,qBAAAA,QAAQiB,SAAS,YAAjBjB,qBAAqB,EAAE;IAE1C,MAAMkB,MAAM,MAAMT,YAAYT,QAAQmB,IAAI,EAAEH,YAAYJ;IAExD,IAAI7B,YAAY;IAEhB,MAAMqC,cAAc;QAClBF,IAAIG,IAAI;QACR,IAAItC,WAAW;YACbuC,QAAQD,IAAI,CAAC;QACf,OAAO;YACLC,QAAQD,IAAI,CAAC;QACf;IACF;IAEA,IAAIrB,QAAQb,KAAK,EAAE;QACjBmC,QAAQC,EAAE,CAAC,UAAUH;QACrBE,QAAQC,EAAE,CAAC,WAAWH;QACtBE,QAAQC,EAAE,CAAC,QAAQH;IACrB;IAEA,WAAW,MAAMI,UAAUb,WAAY;QACrC,4DAA4D;QAC5D5B,YACEyC,OAAOzC,SAAS,IAAKuC,QAAQG,QAAQ,IAAIH,QAAQG,QAAQ,KAAK;IAClE;IAEA,OAAO;QACLC,SAAS,CAAC3C;IACZ;AACF;AAEA,eAAe8B,YACbb,OAA8B,EAC9BC,OAAwB,EACxBC,WAAmB;QAajByB,2BACAA,8BA+CsBC,kBAoBfA,uBAAAA,mBAGqBA,wBAAAA;IAlF9B,yFAAyF;IACzF,MAAM,EAAEC,kBAAkB,EAAE,GAAG,MAAOnB,SACpC;IAGF,MAAMoB,kBAAkBC,IAAAA,UAAI,EAACvB,qBAAa,EAAE;IAC5C,MAAMmB,cAAcK,IAAAA,cAAU,EAACF,mBAC3BG,IAAAA,oBAAY,EAACH,mBACbI;IACJ,IAAIC,WAAwB;IAC5B,IACER,CAAAA,gCAAAA,4BAAAA,YAAaS,YAAY,qBAAzBT,yBAA2B,CAAC,sBAAsB,MAClDA,gCAAAA,+BAAAA,YAAaU,eAAe,qBAA5BV,4BAA8B,CAAC,sBAAsB,GACrD;QACAQ,WAAW;IACb;IACA,MAAMG,SAASC,IAAAA,cAAQ,EAAC/B,qBAAa,EAAEP,QAAQuC,GAAG;IAClD,uFAAuF;IACvF,iDAAiD;IACjD,MAAMC,WAA4BzC,QAAQ0C,gBAAgB,GACtD;QACEC,SAAS3C,QAAQyC,QAAQ;QACzBC,kBAAkB1C,QAAQ0C,gBAAgB;QAC1CP;IACF,IACC,CAAC;IAEN,MAAMS,iBAAiB5C,QAAQ6C,MAAM,GACjC7C,QAAQ6C,MAAM,CAAC,mDAAmD;OAClEC,eAAeC,IAAAA,yBAAiB,EAAC9C,QAAQK,IAAI,EAAEJ;IAEnD,IAAI,CAAC0C,gBAAgB;QACnB,MAAM,IAAII,MACRC,IAAAA,oBAAY,CAAA,CAAC;kDAC+B,EAAEL,eAAe;;;;;MAK7D,CAAC;IAEL;IAEA,MAAMM,sBAAsB9D,IAAAA,aAAO,EAACoB,qBAAa,EAAEN;IACnD,MAAMiD,yBAAyB/D,IAAAA,aAAO,EACpCoB,qBAAa,EACbN,aACAqC,IAAAA,cAAQ,EAACW,qBAAqBN;IAGhC,MAAMhB,WAAW,MAAMC,mBACrB;QACEV,MAAMnB,QAAQmB,IAAI;QAClBiC,SAAS;IACX,GACAD,wBACAD;IAGF,IAAI,CAACN,kBAAkB,EAAChB,6BAAAA,mBAAAA,SAAUiB,MAAM,qBAAhBjB,gBAAkB,CAAC,OAAO,GAAE;YAEhDA;QADFyB,cAAM,CAACC,IAAI,CAACL,IAAAA,oBAAY,CAAA,CAAC,4CAA4C,EACnErB,CAAAA,iBAAAA,4BAAAA,SAAU2B,IAAI,YAAd3B,iBAAkBgB,eACnB;;gDAE2C,EAC1C3C,QAAQI,WAAW,CACpB;MACC,CAAC;IACL;QAUQL,oBACA;IATR,MAAMY,WAAW,eACZZ;QACH,gFAAgF;QAChF,uDAAuD;QACvD,0DAA0D;QAC1DM,MAAMgC,WAAW,KAAKY,sBAAsB1C,qBAAa;QACzDqC,QAAQM;QACRrC,WAAW;eACLd,CAAAA,qBAAAA,QAAQc,SAAS,YAAjBd,qBAAqB,EAAE;eACvB,CAAA,OAAC4B,4BAAD,CAACA,oBAAAA,SAAUiB,MAAM,AAAiC,sBAAjDjB,wBAAAA,iBAAkB,CAAC,OAAO,qBAA1BA,sBAA4Bd,SAAS,YAAtC,OAAuD,EAAE;YAC7D;SACD;QACD2B,UAAU,eAAKA,UAAab,6BAAAA,oBAAAA,SAAUiB,MAAM,sBAAhBjB,yBAAAA,iBAAkB,CAAC,OAAO,qBAA1BA,uBAA4Ba,QAAQ;;IAGlE,OAAO7B;AACT;AAEA,SAASkC,eAAeU,mBAA2B;IACjD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IACEzB,IAAAA,cAAU,EAACe,IAAAA,yBAAiB,EAACS,qBAAqB,CAAC,YAAY,EAAEE,IAAI,CAAC,IACtE;YACA,OAAOX,IAAAA,yBAAiB,EAACS,qBAAqB,CAAC,YAAY,EAAEE,IAAI,CAAC;QACpE;IACF;AACF;MAEA,WAAe/E"}

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

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { ViteConfigurationGeneratorSchema } from './schema';
-export declare function viteConfigurationGenerator(host: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
-export declare function viteConfigurationGeneratorInternal(tree: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
+export declare function viteConfigurationGenerator(tree: Tree, schema: ViteConfigurationGeneratorSchema): Promise<GeneratorCallback>;
 export default viteConfigurationGenerator;

package/src/generators/configuration/configuration.js

@@ -9,36 +9,24 @@ _export(exports, {
     viteConfigurationGenerator: function() {
         return viteConfigurationGenerator;
     },
-    viteConfigurationGeneratorInternal: function() {
-        return viteConfigurationGeneratorInternal;
-    },
     default: function() {
         return _default;
     }
 });
 const _extends = require("@swc/helpers/_/_extends");
 const _devkit = require("@nx/devkit");
-const _js = require("@nx/js");
 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
-    }, schema));
-}
-async function viteConfigurationGeneratorInternal(tree, schema) {
-    var _nxJson_plugins;
+async function viteConfigurationGenerator(tree, schema) {
     var _schema, // Setting default to jsdom since it is the most common use case (React, Web).
     // The @nx/js:lib generator specifically sets this to node to be more generic.
-    _schema1, _schema2;
+    _schema1;
     const tasks = [];
-    const projectConfig = (0, _devkit.readProjectConfiguration)(tree, schema.project);
-    const { targets, root: projectRoot } = projectConfig;
-    var _projectConfig_projectType;
-    const projectType = (_projectConfig_projectType = projectConfig.projectType) != null ? _projectConfig_projectType : 'library';
+    const { targets, projectType, root } = (0, _devkit.readProjectConfiguration)(tree, schema.project);
+    let buildTargetName = 'build';
+    let serveTargetName = 'serve';
+    let testTargetName = 'test';
     var _includeLib;
     (_includeLib = (_schema = schema).includeLib) != null ? _includeLib : _schema.includeLib = projectType === 'library';
     var _testEnvironment;
@@ -48,39 +36,90 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
    * to use the vite executors.
    */ let projectAlreadyHasViteTargets = {};
     if (!schema.newProject) {
-        await (0, _convertnonvite.convertNonVite)(tree, schema, projectRoot, projectType, targets);
+        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, root, 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);
     }
-    const jsInitTask = await (0, _js.initGenerator)(tree, _extends._({}, schema, {
-        skipFormat: true,
-        tsConfigName: projectRoot === '.' ? 'tsconfig.json' : 'tsconfig.base.json'
-    }));
-    tasks.push(jsInitTask);
-    const initTask = await (0, _init.default)(tree, _extends._({}, schema, {
-        skipFormat: true
-    }));
+    const initTask = await (0, _init.default)(tree, {
+        uiFramework: schema.uiFramework,
+        includeLib: schema.includeLib,
+        compiler: schema.compiler,
+        testEnvironment: schema.testEnvironment,
+        rootProject: root === '.'
+    });
     tasks.push(initTask);
-    tasks.push((0, _ensuredependencies.ensureDependencies)(tree, schema));
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' && nxJson.useInferencePlugins !== false;
-    var _addPlugin;
-    (_addPlugin = (_schema2 = schema).addPlugin) != null ? _addPlugin : _schema2.addPlugin = addPluginDefault;
-    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.addBuildTarget)(tree, schema, 'build');
+    if (!projectAlreadyHasViteTargets.build) {
+        (0, _generatorutils.addOrChangeBuildTarget)(tree, schema, buildTargetName);
+    }
+    if (!schema.includeLib) {
+        if (!projectAlreadyHasViteTargets.serve) {
+            (0, _generatorutils.addOrChangeServeTarget)(tree, schema, serveTargetName);
         }
-        if (!schema.includeLib) {
-            if (!projectAlreadyHasViteTargets.serve) {
-                (0, _generatorutils.addServeTarget)(tree, schema, 'serve');
-            }
-            if (!projectAlreadyHasViteTargets.preview) {
-                (0, _generatorutils.addPreviewTarget)(tree, schema, 'preview');
-            }
+        if (!projectAlreadyHasViteTargets.preview) {
+            (0, _generatorutils.addPreviewTarget)(tree, schema, serveTargetName);
         }
     }
     if (projectType === 'library') {
         // update tsconfig.lib.json to include vite/client
-        (0, _devkit.updateJson)(tree, (0, _devkit.joinPathFragments)(projectRoot, 'tsconfig.lib.json'), (json)=>{
+        (0, _devkit.updateJson)(tree, (0, _devkit.joinPathFragments)(root, 'tsconfig.lib.json'), (json)=>{
             if (!json.compilerOptions) {
                 json.compilerOptions = {};
             }
@@ -119,7 +158,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
                 plugins: [
                     'react()'
                 ]
-            }, false, undefined);
+            }, false);
         } else {
             (0, _generatorutils.createOrEditViteConfig)(tree, schema, false, projectAlreadyHasViteTargets);
         }
@@ -129,11 +168,10 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
             project: schema.project,
             uiFramework: schema.uiFramework,
             inSourceTests: schema.inSourceTests,
-            coverageProvider: 'v8',
+            coverageProvider: 'c8',
             skipViteConfig: true,
-            testTarget: 'test',
-            skipFormat: true,
-            addPlugin: schema.addPlugin
+            testTarget: testTargetName,
+            skipFormat: true
         });
         tasks.push(vitestTask);
     }

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  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 addPluginDefault =\n    process.env.NX_ADD_PLUGINS !== 'false' &&\n    nxJson.useInferencePlugins !== false;\n  schema.addPlugin ??= addPluginDefault;\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","projectConfig","readProjectConfiguration","project","targets","root","projectRoot","projectType","includeLib","testEnvironment","projectAlreadyHasViteTargets","newProject","convertNonVite","jsInitTask","jsInitGenerator","skipFormat","tsConfigName","push","initTask","initGenerator","ensureDependencies","readNxJson","addPluginDefault","process","env","NX_ADD_PLUGINS","useInferencePlugins","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  readProjectConfiguration,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n} from '@nx/devkit';\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';\n\nexport async function viteConfigurationGenerator(\n  tree: Tree,\n  schema: ViteConfigurationGeneratorSchema\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const { targets, projectType, root } = readProjectConfiguration(\n    tree,\n    schema.project\n  );\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      root,\n      targets?.[buildTargetName]?.options?.webpackConfig\n    );\n\n    editTsConfig(tree, schema);\n  }\n\n  const initTask = await initGenerator(tree, {\n    uiFramework: schema.uiFramework,\n    includeLib: schema.includeLib,\n    compiler: schema.compiler,\n    testEnvironment: schema.testEnvironment,\n    rootProject: root === '.',\n  });\n  tasks.push(initTask);\n\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(tree, joinPathFragments(root, 'tsconfig.lib.json'), (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  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      );\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: 'c8',\n      skipViteConfig: true,\n      testTarget: testTargetName,\n      skipFormat: true,\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","tree","schema","tasks","targets","projectType","root","readProjectConfiguration","project","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","initTask","initGenerator","uiFramework","compiler","rootProject","push","addOrChangeBuildTarget","addOrChangeServeTarget","preview","addPreviewTarget","updateJson","joinPathFragments","json","compilerOptions","types","includes","createOrEditViteConfig","includeVitest","inSourceTests","rollupOptionsExternal","imports","plugins","vitestTask","vitestGenerator","coverageProvider","skipViteConfig","skipFormat","formatFiles","runTasksInSerial"],"mappings":"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"}

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

@@ -6,7 +6,9 @@ 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,6 +44,18 @@
       "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/init/init.d.ts

@@ -1,6 +1,5 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { InitGeneratorSchema } from './schema';
-export declare function updateNxJsonSettings(tree: Tree): void;
-export declare function initGenerator(tree: Tree, schema: InitGeneratorSchema): Promise<GeneratorCallback>;
-export declare function initGeneratorInternal(tree: Tree, schema: InitGeneratorSchema): Promise<GeneratorCallback>;
+export declare function createVitestConfig(tree: Tree): void;
+export declare function initGenerator(tree: Tree, schema: InitGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default initGenerator;