@nx/vite 17.1.1 → 17.2.0-beta.0

package/migrations.json

@@ -43,6 +43,24 @@
     }
   },
   "packageJsonUpdates": {
+    "17.2.0": {
+      "vitest": {
+        "version": "~0.34.6",
+        "alwaysAddToPackageJson": false
+      },
+      "@vitest/coverage-v8": {
+        "version": "~0.34.6",
+        "alwaysAddToPackageJson": false
+      },
+      "@vitest/ui": {
+        "version": "~0.34.6",
+        "alwaysAddToPackageJson": false
+      },
+      "@vitest/coverage-istanbul": {
+        "version": "~0.34.6",
+        "alwaysAddToPackageJson": false
+      }
+    },
     "16.4.0-beta.7": {
       "version": "16.4.0-beta.7",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "17.1.1",
+  "version": "17.2.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -32,10 +32,10 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/devkit": "17.1.1",
-    "@nx/js": "17.1.1",
+    "@nx/devkit": "17.2.0-beta.0",
+    "@nx/js": "17.2.0-beta.0",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "17.1.1"
+    "@nrwl/vite": "17.2.0-beta.0"
   },
   "peerDependencies": {
     "vite": "^4.3.4",

package/src/executors/dev-server/dev-server.impl.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import { ExecutorContext } from '@nx/devkit';\nimport type { InlineConfig, ViteDevServer } from 'vite';\n\nimport {\n  getNxTargetOptions,\n  getViteBuildOptions,\n  getViteServerOptions,\n  getViteSharedConfig,\n} from '../../utils/options-utils';\n\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { createBuildableTsConfig } from '../../utils/executor-utils';\n\nexport async function* viteDevServerExecutor(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): AsyncGenerator<{ success: boolean; baseUrl: string }> {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { mergeConfig, createServer } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n\n  createBuildableTsConfig(projectRoot, options, context);\n\n  // Retrieve the option for the configured buildTarget.\n  const buildTargetOptions: ViteBuildExecutorOptions = getNxTargetOptions(\n    options.buildTarget,\n    context\n  );\n\n  // Merge the options from the build and dev-serve targets.\n  // The latter takes precedence.\n  const mergedOptions = {\n    ...buildTargetOptions,\n    ...options,\n  };\n\n  // Add the server specific configuration.\n  const serverConfig: InlineConfig = mergeConfig(\n    getViteSharedConfig(mergedOptions, options.clearScreen, context),\n    {\n      build: getViteBuildOptions(mergedOptions, context),\n      server: await getViteServerOptions(mergedOptions, context),\n    }\n  );\n\n  try {\n    const server = await createServer(serverConfig);\n    await runViteDevServer(server);\n    const resolvedUrls = [\n      ...server.resolvedUrls.local,\n      ...server.resolvedUrls.network,\n    ];\n\n    yield {\n      success: true,\n      baseUrl: resolvedUrls[0] ?? '',\n    };\n  } catch (e) {\n    console.error(e);\n    yield {\n      success: false,\n      baseUrl: '',\n    };\n  }\n\n  await new Promise<void>((resolve) => {\n    process.once('SIGINT', () => resolve());\n    process.once('SIGTERM', () => resolve());\n    process.once('exit', () => resolve());\n  });\n}\n\nasync function runViteDevServer(server: ViteDevServer): Promise<void> {\n  await server.listen();\n  server.printUrls();\n\n  const processOnExit = async () => {\n    await server.close();\n  };\n\n  process.once('SIGINT', processOnExit);\n  process.once('SIGTERM', processOnExit);\n  process.once('exit', processOnExit);\n}\n\nexport default viteDevServerExecutor;\n"],"names":["viteDevServerExecutor","options","context","mergeConfig","createServer","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","mergedOptions","serverConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","server","getViteServerOptions","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","resolve","process","once","listen","printUrls","processOnExit","close"],"mappings":";;;;;;;;IAcuBA,qBAAqB;eAArBA;;IA4EvB,OAAqC;eAArC;;;;8BAlFO;+BAIiC;AAEjC,gBAAgBA,sBACrBC,OAAqC,EACrCC,OAAwB;IAExB,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAEC,YAAY,EAAE,GAAG,MAAOC,SAC3C;IAGF,MAAMC,cACJJ,QAAQK,sBAAsB,CAACC,QAAQ,CAACN,QAAQO,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,sCAAuB,EAACL,aAAaL,SAASC;IAE9C,sDAAsD;IACtD,MAAMU,qBAA+CC,IAAAA,gCAAkB,EACrEZ,QAAQa,WAAW,EACnBZ;IAGF,0DAA0D;IAC1D,+BAA+B;IAC/B,MAAMa,gBAAgB,eACjBH,oBACAX;IAGL,yCAAyC;IACzC,MAAMe,eAA6Bb,YACjCc,IAAAA,iCAAmB,EAACF,eAAed,QAAQiB,WAAW,EAAEhB,UACxD;QACEiB,OAAOC,IAAAA,iCAAmB,EAACL,eAAeb;QAC1CmB,QAAQ,MAAMC,IAAAA,kCAAoB,EAACP,eAAeb;IACpD;IAGF,IAAI;QACF,MAAMmB,SAAS,MAAMjB,aAAaY;QAClC,MAAMO,iBAAiBF;QACvB,MAAMG,eAAe;eAChBH,OAAOG,YAAY,CAACC,KAAK;eACzBJ,OAAOG,YAAY,CAACE,OAAO;SAC/B;YAIUF;QAFX,MAAM;YACJG,SAAS;YACTC,SAASJ,CAAAA,iBAAAA,YAAY,CAAC,EAAE,YAAfA,iBAAmB;QAC9B;IACF,EAAE,OAAOK,GAAG;QACVC,QAAQC,KAAK,CAACF;QACd,MAAM;YACJF,SAAS;YACTC,SAAS;QACX;IACF;IAEA,MAAM,IAAII,QAAc,CAACC;QACvBC,QAAQC,IAAI,CAAC,UAAU,IAAMF;QAC7BC,QAAQC,IAAI,CAAC,WAAW,IAAMF;QAC9BC,QAAQC,IAAI,CAAC,QAAQ,IAAMF;IAC7B;AACF;AAEA,eAAeV,iBAAiBF,MAAqB;IACnD,MAAMA,OAAOe,MAAM;IACnBf,OAAOgB,SAAS;IAEhB,MAAMC,gBAAgB;QACpB,MAAMjB,OAAOkB,KAAK;IACpB;IAEAL,QAAQC,IAAI,CAAC,UAAUG;IACvBJ,QAAQC,IAAI,CAAC,WAAWG;IACxBJ,QAAQC,IAAI,CAAC,QAAQG;AACvB;MAEA,WAAetC"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import { ExecutorContext } from '@nx/devkit';\nimport type { InlineConfig, ViteDevServer } from 'vite';\n\nimport {\n  getNxTargetOptions,\n  getViteBuildOptions,\n  getViteServerOptions,\n  getViteSharedConfig,\n} from '../../utils/options-utils';\n\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { createBuildableTsConfig } from '../../utils/executor-utils';\n\nexport async function* viteDevServerExecutor(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): AsyncGenerator<{ success: boolean; baseUrl: string }> {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { mergeConfig, createServer } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n\n  createBuildableTsConfig(projectRoot, options, context);\n\n  // Retrieve the option for the configured buildTarget.\n  const buildTargetOptions: ViteBuildExecutorOptions = getNxTargetOptions(\n    options.buildTarget,\n    context\n  );\n\n  // Merge the options from the build and dev-serve targets.\n  // The latter takes precedence.\n  const mergedOptions = {\n    ...buildTargetOptions,\n    ...options,\n  };\n\n  // Add the server specific configuration.\n  const serverConfig: InlineConfig = mergeConfig(\n    getViteSharedConfig(mergedOptions, options.clearScreen, context),\n    {\n      build: getViteBuildOptions(mergedOptions, context),\n      server: await getViteServerOptions(mergedOptions, context),\n    }\n  );\n\n  try {\n    const server = await createServer(serverConfig);\n    await runViteDevServer(server);\n    const resolvedUrls = [\n      ...server.resolvedUrls.local,\n      ...server.resolvedUrls.network,\n    ];\n\n    yield {\n      success: true,\n      baseUrl: resolvedUrls[0] ?? '',\n    };\n  } catch (e) {\n    console.error(e);\n    yield {\n      success: false,\n      baseUrl: '',\n    };\n  }\n\n  await new Promise<void>((resolve) => {\n    process.once('SIGINT', () => resolve());\n    process.once('SIGTERM', () => resolve());\n    process.once('exit', () => resolve());\n  });\n}\n\nasync function runViteDevServer(server: ViteDevServer): Promise<void> {\n  await server.listen();\n\n  server.printUrls();\n\n  const processOnExit = async () => {\n    await server.close();\n  };\n\n  process.once('SIGINT', processOnExit);\n  process.once('SIGTERM', processOnExit);\n  process.once('exit', processOnExit);\n}\n\nexport default viteDevServerExecutor;\n"],"names":["viteDevServerExecutor","options","context","mergeConfig","createServer","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","mergedOptions","serverConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","server","getViteServerOptions","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","resolve","process","once","listen","printUrls","processOnExit","close"],"mappings":";;;;;;;;IAcuBA,qBAAqB;eAArBA;;IA6EvB,OAAqC;eAArC;;;;8BAnFO;+BAIiC;AAEjC,gBAAgBA,sBACrBC,OAAqC,EACrCC,OAAwB;IAExB,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAEC,YAAY,EAAE,GAAG,MAAOC,SAC3C;IAGF,MAAMC,cACJJ,QAAQK,sBAAsB,CAACC,QAAQ,CAACN,QAAQO,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,sCAAuB,EAACL,aAAaL,SAASC;IAE9C,sDAAsD;IACtD,MAAMU,qBAA+CC,IAAAA,gCAAkB,EACrEZ,QAAQa,WAAW,EACnBZ;IAGF,0DAA0D;IAC1D,+BAA+B;IAC/B,MAAMa,gBAAgB,eACjBH,oBACAX;IAGL,yCAAyC;IACzC,MAAMe,eAA6Bb,YACjCc,IAAAA,iCAAmB,EAACF,eAAed,QAAQiB,WAAW,EAAEhB,UACxD;QACEiB,OAAOC,IAAAA,iCAAmB,EAACL,eAAeb;QAC1CmB,QAAQ,MAAMC,IAAAA,kCAAoB,EAACP,eAAeb;IACpD;IAGF,IAAI;QACF,MAAMmB,SAAS,MAAMjB,aAAaY;QAClC,MAAMO,iBAAiBF;QACvB,MAAMG,eAAe;eAChBH,OAAOG,YAAY,CAACC,KAAK;eACzBJ,OAAOG,YAAY,CAACE,OAAO;SAC/B;YAIUF;QAFX,MAAM;YACJG,SAAS;YACTC,SAASJ,CAAAA,iBAAAA,YAAY,CAAC,EAAE,YAAfA,iBAAmB;QAC9B;IACF,EAAE,OAAOK,GAAG;QACVC,QAAQC,KAAK,CAACF;QACd,MAAM;YACJF,SAAS;YACTC,SAAS;QACX;IACF;IAEA,MAAM,IAAII,QAAc,CAACC;QACvBC,QAAQC,IAAI,CAAC,UAAU,IAAMF;QAC7BC,QAAQC,IAAI,CAAC,WAAW,IAAMF;QAC9BC,QAAQC,IAAI,CAAC,QAAQ,IAAMF;IAC7B;AACF;AAEA,eAAeV,iBAAiBF,MAAqB;IACnD,MAAMA,OAAOe,MAAM;IAEnBf,OAAOgB,SAAS;IAEhB,MAAMC,gBAAgB;QACpB,MAAMjB,OAAOkB,KAAK;IACpB;IAEAL,QAAQC,IAAI,CAAC,UAAUG;IACvBJ,QAAQC,IAAI,CAAC,WAAWG;IACxBJ,QAAQC,IAAI,CAAC,QAAQG;AACvB;MAEA,WAAetC"}

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

@@ -87,9 +87,11 @@ async function getSettings(options, context, projectRoot) {
     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';
+    let provider;
+    if ((packageJson == null ? void 0 : (_packageJson_dependencies = packageJson.dependencies) == null ? void 0 : _packageJson_dependencies['@vitest/coverage-istanbul']) || (packageJson == null ? void 0 : (_packageJson_devDependencies = packageJson.devDependencies) == null ? void 0 : _packageJson_devDependencies['@vitest/coverage-istanbul'])) {
+        provider = 'istanbul';
+    } else {
+        provider = 'v8';
     }
     const offset = (0, _path.relative)(_devkit.workspaceRoot, context.cwd);
     // if reportsDirectory is not provided vitest will remove all files in the project root

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

@@ -1 +1 @@
-{"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":"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"}
+{"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' | 'istanbul' | 'custom';\n  if (\n    packageJson?.dependencies?.['@vitest/coverage-istanbul'] ||\n    packageJson?.devDependencies?.['@vitest/coverage-istanbul']\n  ) {\n    provider = 'istanbul';\n  } else {\n    provider = 'v8';\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":"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"}

package/src/generators/configuration/configuration.js

@@ -168,7 +168,7 @@ async function viteConfigurationGenerator(tree, schema) {
             project: schema.project,
             uiFramework: schema.uiFramework,
             inSourceTests: schema.inSourceTests,
-            coverageProvider: 'c8',
+            coverageProvider: 'v8',
             skipViteConfig: true,
             testTarget: testTargetName,
             skipFormat: true

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  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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"}
+{"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: 'v8',\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/init/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  logger,\n  readJson,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n  updateNxJson,\n} from '@nx/devkit';\n\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n  edgeRuntimeVmVersion,\n  happyDomVersion,\n  jsdomVersion,\n  nxVersion,\n  vitePluginDtsVersion,\n  vitePluginReactSwcVersion,\n  vitePluginReactVersion,\n  vitestUiVersion,\n  vitestVersion,\n  viteVersion,\n} from '../../utils/versions';\nimport { InitGeneratorSchema } from './schema';\n\nfunction checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema) {\n  const packageJson = readJson(host, 'package.json');\n  const devDependencies = {};\n  const dependencies = {};\n  packageJson.dependencies = packageJson.dependencies || {};\n  packageJson.devDependencies = packageJson.devDependencies || {};\n\n  // base deps\n  devDependencies['@nx/vite'] = nxVersion;\n  devDependencies['vite'] = viteVersion;\n\n  // Do not install latest version if vitest already exists\n  // because version 0.32 and newer versions break nuxt-vitest\n  // https://github.com/vitest-dev/vitest/issues/3540\n  // https://github.com/danielroe/nuxt-vitest/issues/213#issuecomment-1588728111\n  if (\n    !packageJson.dependencies['vitest'] &&\n    !packageJson.devDependencies['vitest']\n  ) {\n    devDependencies['vitest'] = vitestVersion;\n  }\n  if (\n    !packageJson.dependencies['@vitest/ui'] &&\n    !packageJson.devDependencies['@vitest/ui']\n  ) {\n    devDependencies['@vitest/ui'] = vitestVersion;\n  }\n\n  if (schema.testEnvironment === 'jsdom') {\n    devDependencies['jsdom'] = jsdomVersion;\n  } else if (schema.testEnvironment === 'happy-dom') {\n    devDependencies['happy-dom'] = happyDomVersion;\n  } else if (schema.testEnvironment === 'edge-runtime') {\n    devDependencies['@edge-runtime/vm'] = edgeRuntimeVmVersion;\n  } else if (schema.testEnvironment !== 'node' && schema.testEnvironment) {\n    logger.info(\n      `A custom environment was provided: ${schema.testEnvironment}. You need to install it manually.`\n    );\n  }\n\n  if (schema.uiFramework === 'react') {\n    if (schema.compiler === 'swc') {\n      devDependencies['@vitejs/plugin-react-swc'] = vitePluginReactSwcVersion;\n    } else {\n      devDependencies['@vitejs/plugin-react'] = vitePluginReactVersion;\n    }\n  }\n\n  if (schema.includeLib) {\n    devDependencies['vite-plugin-dts'] = vitePluginDtsVersion;\n  }\n\n  return addDependenciesToPackageJson(host, dependencies, devDependencies);\n}\n\nfunction moveToDevDependencies(tree: Tree) {\n  updateJson(tree, 'package.json', (packageJson) => {\n    packageJson.dependencies = packageJson.dependencies || {};\n    packageJson.devDependencies = packageJson.devDependencies || {};\n\n    if (packageJson.dependencies['@nx/vite']) {\n      packageJson.devDependencies['@nx/vite'] =\n        packageJson.dependencies['@nx/vite'];\n      delete packageJson.dependencies['@nx/vite'];\n    }\n    return packageJson;\n  });\n}\n\nexport function createVitestConfig(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  nxJson.targetDefaults ??= {};\n  nxJson.targetDefaults['@nx/vite:test'] ??= {};\n  nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n  nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n    'default',\n    productionFileSet ? '^production' : '^default',\n  ];\n\n  updateNxJson(tree, nxJson);\n}\n\nexport async function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  moveToDevDependencies(tree);\n  createVitestConfig(tree);\n  const tasks = [];\n\n  tasks.push(\n    await jsInitGenerator(tree, {\n      ...schema,\n      skipFormat: true,\n      tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',\n    })\n  );\n\n  tasks.push(checkDependenciesInstalled(tree, schema));\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["createVitestConfig","initGenerator","checkDependenciesInstalled","host","schema","packageJson","readJson","devDependencies","dependencies","nxVersion","viteVersion","vitestVersion","testEnvironment","jsdomVersion","happyDomVersion","edgeRuntimeVmVersion","logger","info","uiFramework","compiler","vitePluginReactSwcVersion","vitePluginReactVersion","includeLib","vitePluginDtsVersion","addDependenciesToPackageJson","moveToDevDependencies","tree","updateJson","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","targetDefaults","cache","inputs","updateNxJson","tasks","jsInitGenerator","skipFormat","tsConfigName","rootProject","runTasksInSerial"],"mappings":";;;;;;;;IAgGgBA,kBAAkB;eAAlBA;;IAwBMC,aAAa;eAAbA;;IAiBtB,OAA6B;eAA7B;;;;wBAhIO;oBAE0C;0BAa1C;AAGP,SAASC,2BAA2BC,IAAU,EAAEC,MAA2B;IACzE,MAAMC,cAAcC,IAAAA,gBAAQ,EAACH,MAAM;IACnC,MAAMI,kBAAkB,CAAC;IACzB,MAAMC,eAAe,CAAC;IACtBH,YAAYG,YAAY,GAAGH,YAAYG,YAAY,IAAI,CAAC;IACxDH,YAAYE,eAAe,GAAGF,YAAYE,eAAe,IAAI,CAAC;IAE9D,YAAY;IACZA,eAAe,CAAC,WAAW,GAAGE,mBAAS;IACvCF,eAAe,CAAC,OAAO,GAAGG,qBAAW;IAErC,yDAAyD;IACzD,4DAA4D;IAC5D,mDAAmD;IACnD,8EAA8E;IAC9E,IACE,CAACL,YAAYG,YAAY,CAAC,SAAS,IACnC,CAACH,YAAYE,eAAe,CAAC,SAAS,EACtC;QACAA,eAAe,CAAC,SAAS,GAAGI,uBAAa;IAC3C;IACA,IACE,CAACN,YAAYG,YAAY,CAAC,aAAa,IACvC,CAACH,YAAYE,eAAe,CAAC,aAAa,EAC1C;QACAA,eAAe,CAAC,aAAa,GAAGI,uBAAa;IAC/C;IAEA,IAAIP,OAAOQ,eAAe,KAAK,SAAS;QACtCL,eAAe,CAAC,QAAQ,GAAGM,sBAAY;IACzC,OAAO,IAAIT,OAAOQ,eAAe,KAAK,aAAa;QACjDL,eAAe,CAAC,YAAY,GAAGO,yBAAe;IAChD,OAAO,IAAIV,OAAOQ,eAAe,KAAK,gBAAgB;QACpDL,eAAe,CAAC,mBAAmB,GAAGQ,8BAAoB;IAC5D,OAAO,IAAIX,OAAOQ,eAAe,KAAK,UAAUR,OAAOQ,eAAe,EAAE;QACtEI,cAAM,CAACC,IAAI,CACT,CAAC,mCAAmC,EAAEb,OAAOQ,eAAe,CAAC,kCAAkC,CAAC;IAEpG;IAEA,IAAIR,OAAOc,WAAW,KAAK,SAAS;QAClC,IAAId,OAAOe,QAAQ,KAAK,OAAO;YAC7BZ,eAAe,CAAC,2BAA2B,GAAGa,mCAAyB;QACzE,OAAO;YACLb,eAAe,CAAC,uBAAuB,GAAGc,gCAAsB;QAClE;IACF;IAEA,IAAIjB,OAAOkB,UAAU,EAAE;QACrBf,eAAe,CAAC,kBAAkB,GAAGgB,8BAAoB;IAC3D;IAEA,OAAOC,IAAAA,oCAA4B,EAACrB,MAAMK,cAAcD;AAC1D;AAEA,SAASkB,sBAAsBC,IAAU;IACvCC,IAAAA,kBAAU,EAACD,MAAM,gBAAgB,CAACrB;QAChCA,YAAYG,YAAY,GAAGH,YAAYG,YAAY,IAAI,CAAC;QACxDH,YAAYE,eAAe,GAAGF,YAAYE,eAAe,IAAI,CAAC;QAE9D,IAAIF,YAAYG,YAAY,CAAC,WAAW,EAAE;YACxCH,YAAYE,eAAe,CAAC,WAAW,GACrCF,YAAYG,YAAY,CAAC,WAAW;YACtC,OAAOH,YAAYG,YAAY,CAAC,WAAW;QAC7C;QACA,OAAOH;IACT;AACF;AAEO,SAASL,mBAAmB0B,IAAU;QAGjBE;QAU1BA,SACAA,wBAAsB,aACtBA,mCACAA;IAfA,MAAMA,SAASC,IAAAA,kBAAU,EAACH;IAE1B,MAAMI,qBAAoBF,sBAAAA,OAAOG,WAAW,qBAAlBH,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD;;IAEAF,oBAAAA,UAAAA,QAAOS,4CAAPT,QAAOS,iBAAmB,CAAC;;IAC3BT,MAAAA,yBAAAA,OAAOS,cAAc,CAAA,CAAC,cAAA,gBAAgB,gBAAtCT,sBAAqB,CAAC,YAAgB,GAAK,CAAC;;IAC5CA,WAAAA,oCAAAA,OAAOS,cAAc,CAAC,gBAAgB,EAACC,0BAAvCV,kCAAuCU,QAAU;;IACjDV,YAAAA,qCAAAA,OAAOS,cAAc,CAAC,gBAAgB,EAACE,4BAAvCX,mCAAuCW,SAAW;QAChD;QACAT,oBAAoB,gBAAgB;KACrC;IAEDU,IAAAA,oBAAY,EAACd,MAAME;AACrB;AAEO,eAAe3B,cAAcyB,IAAU,EAAEtB,MAA2B;IACzEqB,sBAAsBC;IACtB1B,mBAAmB0B;IACnB,MAAMe,QAAQ,EAAE;IAEhBA,MAAMR,IAAI,CACR,MAAMS,IAAAA,iBAAe,EAAChB,MAAM,eACvBtB;QACHuC,YAAY;QACZC,cAAcxC,OAAOyC,WAAW,GAAG,kBAAkB;;IAIzDJ,MAAMR,IAAI,CAAC/B,2BAA2BwB,MAAMtB;IAC5C,OAAO0C,IAAAA,wBAAgB,KAAIL;AAC7B;MAEA,WAAexC"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  logger,\n  readJson,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n  updateNxJson,\n} from '@nx/devkit';\n\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n  edgeRuntimeVmVersion,\n  happyDomVersion,\n  jsdomVersion,\n  nxVersion,\n  vitePluginDtsVersion,\n  vitePluginReactSwcVersion,\n  vitePluginReactVersion,\n  vitestVersion,\n  viteVersion,\n} from '../../utils/versions';\nimport { InitGeneratorSchema } from './schema';\n\nfunction checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema) {\n  const packageJson = readJson(host, 'package.json');\n  const devDependencies = {};\n  const dependencies = {};\n  packageJson.dependencies = packageJson.dependencies || {};\n  packageJson.devDependencies = packageJson.devDependencies || {};\n\n  // base deps\n  devDependencies['@nx/vite'] = nxVersion;\n  devDependencies['vite'] = viteVersion;\n\n  // Do not install latest version if vitest already exists\n  // because version 0.32 and newer versions break nuxt-vitest\n  // https://github.com/vitest-dev/vitest/issues/3540\n  // https://github.com/danielroe/nuxt-vitest/issues/213#issuecomment-1588728111\n  if (\n    !packageJson.dependencies['vitest'] &&\n    !packageJson.devDependencies['vitest']\n  ) {\n    devDependencies['vitest'] = vitestVersion;\n  }\n  if (\n    !packageJson.dependencies['@vitest/ui'] &&\n    !packageJson.devDependencies['@vitest/ui']\n  ) {\n    devDependencies['@vitest/ui'] = vitestVersion;\n  }\n\n  if (schema.testEnvironment === 'jsdom') {\n    devDependencies['jsdom'] = jsdomVersion;\n  } else if (schema.testEnvironment === 'happy-dom') {\n    devDependencies['happy-dom'] = happyDomVersion;\n  } else if (schema.testEnvironment === 'edge-runtime') {\n    devDependencies['@edge-runtime/vm'] = edgeRuntimeVmVersion;\n  } else if (schema.testEnvironment !== 'node' && schema.testEnvironment) {\n    logger.info(\n      `A custom environment was provided: ${schema.testEnvironment}. You need to install it manually.`\n    );\n  }\n\n  if (schema.uiFramework === 'react') {\n    if (schema.compiler === 'swc') {\n      devDependencies['@vitejs/plugin-react-swc'] = vitePluginReactSwcVersion;\n    } else {\n      devDependencies['@vitejs/plugin-react'] = vitePluginReactVersion;\n    }\n  }\n\n  if (schema.includeLib) {\n    devDependencies['vite-plugin-dts'] = vitePluginDtsVersion;\n  }\n\n  return addDependenciesToPackageJson(host, dependencies, devDependencies);\n}\n\nfunction moveToDevDependencies(tree: Tree) {\n  updateJson(tree, 'package.json', (packageJson) => {\n    packageJson.dependencies = packageJson.dependencies || {};\n    packageJson.devDependencies = packageJson.devDependencies || {};\n\n    if (packageJson.dependencies['@nx/vite']) {\n      packageJson.devDependencies['@nx/vite'] =\n        packageJson.dependencies['@nx/vite'];\n      delete packageJson.dependencies['@nx/vite'];\n    }\n    return packageJson;\n  });\n}\n\nexport function createVitestConfig(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  nxJson.targetDefaults ??= {};\n  nxJson.targetDefaults['@nx/vite:test'] ??= {};\n  nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n  nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n    'default',\n    productionFileSet ? '^production' : '^default',\n  ];\n\n  updateNxJson(tree, nxJson);\n}\n\nexport async function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  moveToDevDependencies(tree);\n  createVitestConfig(tree);\n  const tasks = [];\n\n  tasks.push(\n    await jsInitGenerator(tree, {\n      ...schema,\n      skipFormat: true,\n      tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',\n    })\n  );\n\n  tasks.push(checkDependenciesInstalled(tree, schema));\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["createVitestConfig","initGenerator","checkDependenciesInstalled","host","schema","packageJson","readJson","devDependencies","dependencies","nxVersion","viteVersion","vitestVersion","testEnvironment","jsdomVersion","happyDomVersion","edgeRuntimeVmVersion","logger","info","uiFramework","compiler","vitePluginReactSwcVersion","vitePluginReactVersion","includeLib","vitePluginDtsVersion","addDependenciesToPackageJson","moveToDevDependencies","tree","updateJson","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","targetDefaults","cache","inputs","updateNxJson","tasks","jsInitGenerator","skipFormat","tsConfigName","rootProject","runTasksInSerial"],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 export interface VitestGeneratorSchema {
   project: string;
   uiFramework: 'react' | 'none';
-  coverageProvider: 'v8' | 'c8' | 'istanbul';
+  coverageProvider: 'v8' | 'istanbul' | 'custom';
   inSourceTests?: boolean;
   skipViteConfig?: boolean;
   testTarget?: string;

package/src/generators/vitest/schema.json

@@ -31,7 +31,7 @@
     },
     "coverageProvider": {
       "type": "string",
-      "enum": ["v8", "c8", "istanbul"],
+      "enum": ["v8", "istanbul", "custom"],
       "default": "v8",
       "description": "Coverage provider to use."
     },

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

@@ -144,9 +144,9 @@ function createFiles(tree, options, projectRoot) {
 }
 function getCoverageProviderDependency(coverageProvider) {
     switch(coverageProvider){
-        case 'c8':
+        case 'v8':
             return {
-                '@vitest/coverage-c8': _versions.vitestCoverageC8Version
+                '@vitest/coverage-v8': _versions.vitestCoverageV8Version
             };
         case 'istanbul':
             return {

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  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  vitestCoverageC8Version,\n  vitestCoverageIstanbulVersion,\n  vitestCoverageV8Version,\n} from '../../utils/versions';\n\nimport { addTsLibDependencies } from '@nx/js';\nimport { join } from 'path';\n\nexport async function vitestGenerator(\n  tree: Tree,\n  schema: VitestGeneratorSchema\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const { targets, root, projectType } = readProjectConfiguration(\n    tree,\n    schema.project\n  );\n  let testTarget =\n    schema.testTarget ??\n    findExistingTargetsInProject(targets).validFoundTargetName.test ??\n    'test';\n\n  addOrChangeTestTarget(tree, schema, testTarget);\n\n  const initTask = await initGenerator(tree, {\n    uiFramework: schema.uiFramework,\n    testEnvironment: schema.testEnvironment,\n  });\n  tasks.push(initTask);\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        },\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 'c8':\n      return {\n        '@vitest/coverage-c8': vitestCoverageC8Version,\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","tree","schema","tasks","targets","root","projectType","readProjectConfiguration","project","testTarget","findExistingTargetsInProject","validFoundTargetName","test","addOrChangeTestTarget","initTask","initGenerator","uiFramework","testEnvironment","push","skipViteConfig","createOrEditViteConfig","includeLib","includeVitest","inSourceTests","rollupOptionsExternal","imports","plugins","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","coverageProvider","installCoverageProviderTask","addDependenciesToPackageJson","skipFormat","formatFiles","runTasksInSerial","options","projectRoot","exists","joinPathFragments","updateJson","json","compilerOptions","types","includes","references","some","r","path","tsconfigLibPath","tsconfigAppPath","addTsLibDependencies","generateFiles","join","__dirname","tmpl","offsetFromRoot","vitestCoverageC8Version","vitestCoverageIstanbulVersion","vitestCoverageV8Version"],"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  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 } from '@nx/js';\nimport { join } from 'path';\n\nexport async function vitestGenerator(\n  tree: Tree,\n  schema: VitestGeneratorSchema\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const { targets, root, projectType } = readProjectConfiguration(\n    tree,\n    schema.project\n  );\n  let testTarget =\n    schema.testTarget ??\n    findExistingTargetsInProject(targets).validFoundTargetName.test ??\n    'test';\n\n  addOrChangeTestTarget(tree, schema, testTarget);\n\n  const initTask = await initGenerator(tree, {\n    uiFramework: schema.uiFramework,\n    testEnvironment: schema.testEnvironment,\n  });\n  tasks.push(initTask);\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        },\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","tree","schema","tasks","targets","root","projectType","readProjectConfiguration","project","testTarget","findExistingTargetsInProject","validFoundTargetName","test","addOrChangeTestTarget","initTask","initGenerator","uiFramework","testEnvironment","push","skipViteConfig","createOrEditViteConfig","includeLib","includeVitest","inSourceTests","rollupOptionsExternal","imports","plugins","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","coverageProvider","installCoverageProviderTask","addDependenciesToPackageJson","skipFormat","formatFiles","runTasksInSerial","options","projectRoot","exists","joinPathFragments","updateJson","json","compilerOptions","types","includes","references","some","r","path","tsconfigLibPath","tsconfigAppPath","addTsLibDependencies","generateFiles","join","__dirname","tmpl","offsetFromRoot","vitestCoverageV8Version","vitestCoverageIstanbulVersion"],"mappings":"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"}

package/src/utils/versions.d.ts

@@ -1,13 +1,11 @@
 export declare const nxVersion: any;
 export declare const viteVersion = "~4.3.9";
-export declare const vitestVersion = "~0.32.0";
-export declare const vitestUiVersion = "~0.32.0";
+export declare const vitestVersion = "~0.34.6";
 export declare const vitePluginReactVersion = "~4.0.0";
 export declare const vitePluginReactSwcVersion = "~3.3.2";
 export declare const jsdomVersion = "~22.1.0";
 export declare const vitePluginDtsVersion = "~2.3.0";
 export declare const happyDomVersion = "~9.20.3";
 export declare const edgeRuntimeVmVersion = "~3.0.2";
-export declare const vitestCoverageC8Version = "~0.32.0";
-export declare const vitestCoverageV8Version = "~0.32.0";
-export declare const vitestCoverageIstanbulVersion = "~0.32.0";
+export declare const vitestCoverageV8Version = "~0.34.6";
+export declare const vitestCoverageIstanbulVersion = "~0.34.6";

package/src/utils/versions.js

@@ -15,9 +15,6 @@ _export(exports, {
     vitestVersion: function() {
         return vitestVersion;
     },
-    vitestUiVersion: function() {
-        return vitestUiVersion;
-    },
     vitePluginReactVersion: function() {
         return vitePluginReactVersion;
     },
@@ -36,9 +33,6 @@ _export(exports, {
     edgeRuntimeVmVersion: function() {
         return edgeRuntimeVmVersion;
     },
-    vitestCoverageC8Version: function() {
-        return vitestCoverageC8Version;
-    },
     vitestCoverageV8Version: function() {
         return vitestCoverageV8Version;
     },
@@ -48,16 +42,14 @@ _export(exports, {
 });
 const nxVersion = require('../../package.json').version;
 const viteVersion = '~4.3.9';
-const vitestVersion = '~0.32.0';
-const vitestUiVersion = '~0.32.0';
+const vitestVersion = '~0.34.6';
 const vitePluginReactVersion = '~4.0.0';
 const vitePluginReactSwcVersion = '~3.3.2';
 const jsdomVersion = '~22.1.0';
 const vitePluginDtsVersion = '~2.3.0';
 const happyDomVersion = '~9.20.3';
 const edgeRuntimeVmVersion = '~3.0.2';
-const vitestCoverageC8Version = '~0.32.0';
-const vitestCoverageV8Version = '~0.32.0';
-const vitestCoverageIstanbulVersion = '~0.32.0';
+const vitestCoverageV8Version = '~0.34.6';
+const vitestCoverageIstanbulVersion = '~0.34.6';
 
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

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