@nx/vite 17.2.5 → 17.3.0-beta.1

package/migrations.json

@@ -46,10 +46,10 @@
       "description": "Update vite config.",
       "implementation": "./src/migrations/update-17-2-0/update-vite-config"
     },
-    "vitest-coverage-threshold": {
+    "vitest-coverage-and-reporters": {
       "version": "17.3.0-beta.0",
-      "description": "Move the vitest coverage thresholds in their own object if exists.",
-      "implementation": "./src/migrations/update-17-3-0/vitest-coverage-threshold"
+      "description": "Move the vitest coverage thresholds in their own object if exists and add reporters.",
+      "implementation": "./src/migrations/update-17-3-0/vitest-coverage-and-reporters"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "v17.2.5",
+  "version": "17.3.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -29,13 +29,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "v17.2.5",
+    "@nx/devkit": "17.3.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/js": "v17.2.5",
+    "@nx/js": "17.3.0-beta.1",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "v17.2.5"
+    "@nrwl/vite": "17.3.0-beta.1"
   },
   "peerDependencies": {
     "vite": "^5.0.0",

package/src/executors/build/build.impl.d.ts

@@ -1,6 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
 import { ViteBuildExecutorOptions } from './schema';
-import { BuildOptions } from 'vite';
 export declare function viteBuildExecutor(options: Record<string, any> & ViteBuildExecutorOptions, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
 } | {
@@ -8,7 +7,7 @@ export declare function viteBuildExecutor(options: Record<string, any> & ViteBui
     outfile: string;
 }, void, undefined>;
 export declare function getBuildExtraArgs(options: ViteBuildExecutorOptions): Promise<{
-    buildOptions: BuildOptions;
+    buildOptions: Record<string, unknown>;
     otherOptions: Record<string, any>;
 }>;
 export default viteBuildExecutor;

package/src/executors/build/build.impl.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/executors/build/build.impl.ts"],"sourcesContent":["import {\n  detectPackageManager,\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  offsetFromRoot,\n  stripIndents,\n  writeJsonFile,\n} from '@nx/devkit';\nimport {\n  getProjectTsConfigPath,\n  normalizeViteConfigFilePath,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from './schema';\nimport {\n  copyAssets,\n  createLockFile,\n  createPackageJson,\n  getLockFileName,\n} from '@nx/js';\nimport { existsSync, writeFileSync } from 'fs';\nimport { relative, resolve } from 'path';\nimport { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';\nimport {\n  createBuildableTsConfig,\n  validateTypes,\n} from '../../utils/executor-utils';\nimport { BuildOptions } from 'vite';\n\nexport async function* viteBuildExecutor(\n  options: Record<string, any> & ViteBuildExecutorOptions,\n  context: ExecutorContext\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 { mergeConfig, build, loadConfigFromFile } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  createBuildableTsConfig(projectRoot, options, context);\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    options.configFile\n  );\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\n\n  const { buildOptions, otherOptions } = await getBuildExtraArgs(options);\n\n  const resolved = await loadConfigFromFile(\n    {\n      mode: otherOptions?.mode ?? 'production',\n      command: 'build',\n    },\n    viteConfigPath\n  );\n\n  const outDir =\n    joinPathFragments(offsetFromRoot(projectRoot), options.outputPath) ??\n    resolved?.config?.build?.outDir;\n\n  const buildConfig = mergeConfig(\n    {\n      // This should not be needed as it's going to be set in vite.config.ts\n      // but leaving it here in case someone did not migrate correctly\n      root: resolved.config.root ?? root,\n      configFile: viteConfigPath,\n    },\n    {\n      build: {\n        outDir,\n        ...buildOptions,\n      },\n      ...otherOptions,\n    }\n  );\n\n  if (!options.skipTypeCheck) {\n    await validateTypes({\n      workspaceRoot: context.root,\n      projectRoot: projectRoot,\n      tsconfig: getProjectTsConfigPath(projectRoot),\n    });\n  }\n\n  const watcherOrOutput = await build(buildConfig);\n\n  const libraryPackageJson = resolve(projectRoot, 'package.json');\n  const rootPackageJson = resolve(context.root, 'package.json');\n\n  // Here, we want the outdir relative to the workspace root.\n  // So, we calculate the relative path from the workspace root to the outdir.\n  const outDirRelativeToWorkspaceRoot = outDir.replaceAll('../', '');\n  const distPackageJson = resolve(\n    outDirRelativeToWorkspaceRoot,\n    'package.json'\n  );\n\n  // Generate a package.json if option has been set.\n  if (options.generatePackageJson) {\n    if (context.projectGraph.nodes[context.projectName].type !== 'app') {\n      logger.warn(\n        stripIndents`The project ${context.projectName} is using the 'generatePackageJson' option which is deprecated for library projects. It should only be used for applications.\n        For libraries, configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).`\n      );\n    }\n\n    const builtPackageJson = createPackageJson(\n      context.projectName,\n      context.projectGraph,\n      {\n        target: context.targetName,\n        root: context.root,\n        isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.\n      }\n    );\n\n    builtPackageJson.type = 'module';\n\n    writeJsonFile(\n      `${outDirRelativeToWorkspaceRoot}/package.json`,\n      builtPackageJson\n    );\n    const packageManager = detectPackageManager(context.root);\n\n    const lockFile = createLockFile(\n      builtPackageJson,\n      context.projectGraph,\n      packageManager\n    );\n    writeFileSync(\n      `${outDirRelativeToWorkspaceRoot}/${getLockFileName(packageManager)}`,\n      lockFile,\n      {\n        encoding: 'utf-8',\n      }\n    );\n  }\n  // For buildable libs, copy package.json if it exists.\n  else if (\n    !existsSync(distPackageJson) &&\n    existsSync(libraryPackageJson) &&\n    rootPackageJson !== libraryPackageJson\n  ) {\n    await copyAssets(\n      {\n        outputPath: outDirRelativeToWorkspaceRoot,\n        assets: [\n          {\n            input: projectRoot,\n            output: '.',\n            glob: 'package.json',\n          },\n        ],\n      },\n      context\n    );\n  }\n\n  if ('on' in watcherOrOutput) {\n    const iterable = createAsyncIterable<{ success: boolean }>(({ next }) => {\n      let success = true;\n      watcherOrOutput.on('event', (event) => {\n        if (event.code === 'START') {\n          success = true;\n        } else if (event.code === 'ERROR') {\n          success = false;\n        } else if (event.code === 'END') {\n          next({ success });\n        }\n        // result must be closed when present.\n        // see https://rollupjs.org/guide/en/#rollupwatch\n        if ('result' in event) {\n          event.result.close();\n        }\n      });\n    });\n    yield* iterable;\n  } else {\n    const output = watcherOrOutput?.['output'] || watcherOrOutput?.[0]?.output;\n    const fileName = output?.[0]?.fileName || 'main.cjs';\n    const outfile = resolve(outDirRelativeToWorkspaceRoot, fileName);\n    yield { success: true, outfile };\n  }\n}\n\nexport async function getBuildExtraArgs(\n  options: ViteBuildExecutorOptions\n): Promise<{\n  buildOptions: BuildOptions;\n  otherOptions: Record<string, any>;\n}> {\n  // support passing extra args to vite cli\n  const schema = await import('./schema.json');\n  const extraArgs = {};\n  for (const key of Object.keys(options)) {\n    if (!schema.properties[key]) {\n      extraArgs[key] = options[key];\n    }\n  }\n\n  const buildOptions = {} as BuildOptions;\n  const buildSchemaKeys = [\n    'target',\n    'polyfillModulePreload',\n    'modulePreload',\n    'outDir',\n    'assetsDir',\n    'assetsInlineLimit',\n    'cssCodeSplit',\n    'cssTarget',\n    'cssMinify',\n    'sourcemap',\n    'minify',\n    'terserOptions',\n    'rollupOptions',\n    'commonjsOptions',\n    'dynamicImportVarsOptions',\n    'write',\n    'emptyOutDir',\n    'copyPublicDir',\n    'manifest',\n    'lib',\n    'ssr',\n    'ssrManifest',\n    'ssrEmitAssets',\n    'reportCompressedSize',\n    'chunkSizeWarningLimit',\n    'watch',\n  ];\n  const otherOptions = {};\n  for (const key of Object.keys(extraArgs)) {\n    if (buildSchemaKeys.includes(key)) {\n      buildOptions[key] = extraArgs[key];\n    } else {\n      otherOptions[key] = extraArgs[key];\n    }\n  }\n\n  return {\n    buildOptions,\n    otherOptions,\n  };\n}\n\nexport default viteBuildExecutor;\n"],"names":["viteBuildExecutor","getBuildExtraArgs","options","context","resolved","process","env","VITE_CJS_IGNORE_WARNING","mergeConfig","build","loadConfigFromFile","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","viteConfigPath","normalizeViteConfigFilePath","configFile","cwd","relative","joinPathFragments","buildOptions","otherOptions","mode","command","outDir","offsetFromRoot","outputPath","config","buildConfig","skipTypeCheck","validateTypes","workspaceRoot","tsconfig","getProjectTsConfigPath","watcherOrOutput","libraryPackageJson","resolve","rootPackageJson","outDirRelativeToWorkspaceRoot","replaceAll","distPackageJson","generatePackageJson","projectGraph","nodes","type","logger","warn","stripIndents","builtPackageJson","createPackageJson","target","targetName","isProduction","includeDevDependenciesInPackageJson","writeJsonFile","packageManager","detectPackageManager","lockFile","createLockFile","writeFileSync","getLockFileName","encoding","existsSync","copyAssets","assets","input","output","glob","iterable","createAsyncIterable","next","success","on","event","code","result","close","fileName","outfile","schema","extraArgs","key","Object","keys","properties","buildSchemaKeys","includes"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/build/build.impl.ts"],"sourcesContent":["import {\n  detectPackageManager,\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  offsetFromRoot,\n  stripIndents,\n  writeJsonFile,\n} from '@nx/devkit';\nimport {\n  getProjectTsConfigPath,\n  normalizeViteConfigFilePath,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from './schema';\nimport {\n  copyAssets,\n  createLockFile,\n  createPackageJson,\n  getLockFileName,\n} from '@nx/js';\nimport { existsSync, writeFileSync } from 'fs';\nimport { relative, resolve } from 'path';\nimport { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';\nimport {\n  createBuildableTsConfig,\n  validateTypes,\n} from '../../utils/executor-utils';\n\nexport async function* viteBuildExecutor(\n  options: Record<string, any> & ViteBuildExecutorOptions,\n  context: ExecutorContext\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 { mergeConfig, build, loadConfigFromFile } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  createBuildableTsConfig(projectRoot, options, context);\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    options.configFile\n  );\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\n\n  const { buildOptions, otherOptions } = await getBuildExtraArgs(options);\n\n  const resolved = await loadConfigFromFile(\n    {\n      mode: otherOptions?.mode ?? 'production',\n      command: 'build',\n    },\n    viteConfigPath\n  );\n\n  const outDir =\n    joinPathFragments(offsetFromRoot(projectRoot), options.outputPath) ??\n    resolved?.config?.build?.outDir;\n\n  const buildConfig = mergeConfig(\n    {\n      // This should not be needed as it's going to be set in vite.config.ts\n      // but leaving it here in case someone did not migrate correctly\n      root: resolved.config.root ?? root,\n      configFile: viteConfigPath,\n    },\n    {\n      build: {\n        outDir,\n        ...buildOptions,\n      },\n      ...otherOptions,\n    }\n  );\n\n  if (!options.skipTypeCheck) {\n    await validateTypes({\n      workspaceRoot: context.root,\n      projectRoot: projectRoot,\n      tsconfig: getProjectTsConfigPath(projectRoot),\n    });\n  }\n\n  const watcherOrOutput = await build(buildConfig);\n\n  const libraryPackageJson = resolve(projectRoot, 'package.json');\n  const rootPackageJson = resolve(context.root, 'package.json');\n\n  // Here, we want the outdir relative to the workspace root.\n  // So, we calculate the relative path from the workspace root to the outdir.\n  const outDirRelativeToWorkspaceRoot = outDir.replaceAll('../', '');\n  const distPackageJson = resolve(\n    outDirRelativeToWorkspaceRoot,\n    'package.json'\n  );\n\n  // Generate a package.json if option has been set.\n  if (options.generatePackageJson) {\n    if (context.projectGraph.nodes[context.projectName].type !== 'app') {\n      logger.warn(\n        stripIndents`The project ${context.projectName} is using the 'generatePackageJson' option which is deprecated for library projects. It should only be used for applications.\n        For libraries, configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).`\n      );\n    }\n\n    const builtPackageJson = createPackageJson(\n      context.projectName,\n      context.projectGraph,\n      {\n        target: context.targetName,\n        root: context.root,\n        isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.\n      }\n    );\n\n    builtPackageJson.type = 'module';\n\n    writeJsonFile(\n      `${outDirRelativeToWorkspaceRoot}/package.json`,\n      builtPackageJson\n    );\n    const packageManager = detectPackageManager(context.root);\n\n    const lockFile = createLockFile(\n      builtPackageJson,\n      context.projectGraph,\n      packageManager\n    );\n    writeFileSync(\n      `${outDirRelativeToWorkspaceRoot}/${getLockFileName(packageManager)}`,\n      lockFile,\n      {\n        encoding: 'utf-8',\n      }\n    );\n  }\n  // For buildable libs, copy package.json if it exists.\n  else if (\n    !existsSync(distPackageJson) &&\n    existsSync(libraryPackageJson) &&\n    rootPackageJson !== libraryPackageJson\n  ) {\n    await copyAssets(\n      {\n        outputPath: outDirRelativeToWorkspaceRoot,\n        assets: [\n          {\n            input: projectRoot,\n            output: '.',\n            glob: 'package.json',\n          },\n        ],\n      },\n      context\n    );\n  }\n\n  if ('on' in watcherOrOutput) {\n    const iterable = createAsyncIterable<{ success: boolean }>(({ next }) => {\n      let success = true;\n      watcherOrOutput.on('event', (event) => {\n        if (event.code === 'START') {\n          success = true;\n        } else if (event.code === 'ERROR') {\n          success = false;\n        } else if (event.code === 'END') {\n          next({ success });\n        }\n        // result must be closed when present.\n        // see https://rollupjs.org/guide/en/#rollupwatch\n        if ('result' in event) {\n          event.result.close();\n        }\n      });\n    });\n    yield* iterable;\n  } else {\n    const output = watcherOrOutput?.['output'] || watcherOrOutput?.[0]?.output;\n    const fileName = output?.[0]?.fileName || 'main.cjs';\n    const outfile = resolve(outDirRelativeToWorkspaceRoot, fileName);\n    yield { success: true, outfile };\n  }\n}\n\nexport async function getBuildExtraArgs(\n  options: ViteBuildExecutorOptions\n): Promise<{\n  // vite BuildOptions\n  buildOptions: Record<string, unknown>;\n  otherOptions: Record<string, any>;\n}> {\n  // support passing extra args to vite cli\n  const schema = await import('./schema.json');\n  const extraArgs = {};\n  for (const key of Object.keys(options)) {\n    if (!schema.properties[key]) {\n      extraArgs[key] = options[key];\n    }\n  }\n\n  const buildOptions = {};\n  const buildSchemaKeys = [\n    'target',\n    'polyfillModulePreload',\n    'modulePreload',\n    'outDir',\n    'assetsDir',\n    'assetsInlineLimit',\n    'cssCodeSplit',\n    'cssTarget',\n    'cssMinify',\n    'sourcemap',\n    'minify',\n    'terserOptions',\n    'rollupOptions',\n    'commonjsOptions',\n    'dynamicImportVarsOptions',\n    'write',\n    'emptyOutDir',\n    'copyPublicDir',\n    'manifest',\n    'lib',\n    'ssr',\n    'ssrManifest',\n    'ssrEmitAssets',\n    'reportCompressedSize',\n    'chunkSizeWarningLimit',\n    'watch',\n  ];\n  const otherOptions = {};\n  for (const key of Object.keys(extraArgs)) {\n    if (buildSchemaKeys.includes(key)) {\n      buildOptions[key] = extraArgs[key];\n    } else {\n      otherOptions[key] = extraArgs[key];\n    }\n  }\n\n  return {\n    buildOptions,\n    otherOptions,\n  };\n}\n\nexport default viteBuildExecutor;\n"],"names":["viteBuildExecutor","getBuildExtraArgs","options","context","resolved","process","env","VITE_CJS_IGNORE_WARNING","mergeConfig","build","loadConfigFromFile","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","viteConfigPath","normalizeViteConfigFilePath","configFile","cwd","relative","joinPathFragments","buildOptions","otherOptions","mode","command","outDir","offsetFromRoot","outputPath","config","buildConfig","skipTypeCheck","validateTypes","workspaceRoot","tsconfig","getProjectTsConfigPath","watcherOrOutput","libraryPackageJson","resolve","rootPackageJson","outDirRelativeToWorkspaceRoot","replaceAll","distPackageJson","generatePackageJson","projectGraph","nodes","type","logger","warn","stripIndents","builtPackageJson","createPackageJson","target","targetName","isProduction","includeDevDependenciesInPackageJson","writeJsonFile","packageManager","detectPackageManager","lockFile","createLockFile","writeFileSync","getLockFileName","encoding","existsSync","copyAssets","assets","input","output","glob","iterable","createAsyncIterable","next","success","on","event","code","result","close","fileName","outfile","schema","extraArgs","key","Object","keys","properties","buildSchemaKeys","includes"],"mappings":";;;;;;;;IA4BuBA,iBAAiB;eAAjBA;;IAkKDC,iBAAiB;eAAjBA;;IA4DtB,OAAiC;eAAjC;;;;wBAlPO;8BAIA;oBAOA;oBACmC;sBACR;+BACE;+BAI7B;AAEA,gBAAgBD,kBACrBE,OAAuD,EACvDC,OAAwB;QAiCtBC,wBAAAA;IA/BFC,QAAQC,GAAG,CAACC,uBAAuB,GAAG;IACtC,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAEC,KAAK,EAAEC,kBAAkB,EAAE,GAAG,MAAOC,SACxD;IAEF,MAAMC,cACJT,QAAQU,sBAAsB,CAACC,QAAQ,CAACX,QAAQY,WAAW,CAAC,CAACC,IAAI;IACnEC,IAAAA,sCAAuB,EAACL,aAAaV,SAASC;IAE9C,MAAMe,iBAAiBC,IAAAA,yCAA2B,EAChDhB,QAAQa,IAAI,EACZJ,aACAV,QAAQkB,UAAU;IAEpB,MAAMJ,OACJJ,gBAAgB,MACZP,QAAQgB,GAAG,KACXC,IAAAA,cAAQ,EAACnB,QAAQkB,GAAG,EAAEE,IAAAA,yBAAiB,EAACpB,QAAQa,IAAI,EAAEJ;IAE5D,MAAM,EAAEY,YAAY,EAAEC,YAAY,EAAE,GAAG,MAAMxB,kBAAkBC;QAIrDuB;IAFV,MAAMrB,WAAW,MAAMM,mBACrB;QACEgB,MAAMD,CAAAA,qBAAAA,gCAAAA,aAAcC,IAAI,YAAlBD,qBAAsB;QAC5BE,SAAS;IACX,GACAT;QAIAK;IADF,MAAMK,SACJL,CAAAA,qBAAAA,IAAAA,yBAAiB,EAACM,IAAAA,sBAAc,EAACjB,cAAcV,QAAQ4B,UAAU,aAAjEP,qBACAnB,6BAAAA,mBAAAA,SAAU2B,MAAM,sBAAhB3B,yBAAAA,iBAAkBK,KAAK,qBAAvBL,uBAAyBwB,MAAM;QAMvBxB;IAJV,MAAM4B,cAAcxB,YAClB;QACE,sEAAsE;QACtE,gEAAgE;QAChEQ,MAAMZ,CAAAA,wBAAAA,SAAS2B,MAAM,CAACf,IAAI,YAApBZ,wBAAwBY;QAC9BI,YAAYF;IACd,GACA;QACET,OAAO;YACLmB;WACGJ;OAEFC;IAIP,IAAI,CAACvB,QAAQ+B,aAAa,EAAE;QAC1B,MAAMC,IAAAA,4BAAa,EAAC;YAClBC,eAAehC,QAAQa,IAAI;YAC3BJ,aAAaA;YACbwB,UAAUC,IAAAA,oCAAsB,EAACzB;QACnC;IACF;IAEA,MAAM0B,kBAAkB,MAAM7B,MAAMuB;IAEpC,MAAMO,qBAAqBC,IAAAA,aAAO,EAAC5B,aAAa;IAChD,MAAM6B,kBAAkBD,IAAAA,aAAO,EAACrC,QAAQa,IAAI,EAAE;IAE9C,2DAA2D;IAC3D,4EAA4E;IAC5E,MAAM0B,gCAAgCd,OAAOe,UAAU,CAAC,OAAO;IAC/D,MAAMC,kBAAkBJ,IAAAA,aAAO,EAC7BE,+BACA;IAGF,kDAAkD;IAClD,IAAIxC,QAAQ2C,mBAAmB,EAAE;QAC/B,IAAI1C,QAAQ2C,YAAY,CAACC,KAAK,CAAC5C,QAAQY,WAAW,CAAC,CAACiC,IAAI,KAAK,OAAO;YAClEC,cAAM,CAACC,IAAI,CACTC,IAAAA,oBAAY,CAAA,CAAC,YAAY,EAAEhD,QAAQY,WAAW,CAAC;wKACiH,CAAC;QAErK;QAEA,MAAMqC,mBAAmBC,IAAAA,qBAAiB,EACxClD,QAAQY,WAAW,EACnBZ,QAAQ2C,YAAY,EACpB;YACEQ,QAAQnD,QAAQoD,UAAU;YAC1BvC,MAAMb,QAAQa,IAAI;YAClBwC,cAAc,CAACtD,QAAQuD,mCAAmC;QAC5D;QAGFL,iBAAiBJ,IAAI,GAAG;QAExBU,IAAAA,qBAAa,EACX,CAAC,EAAEhB,8BAA8B,aAAa,CAAC,EAC/CU;QAEF,MAAMO,iBAAiBC,IAAAA,4BAAoB,EAACzD,QAAQa,IAAI;QAExD,MAAM6C,WAAWC,IAAAA,kBAAc,EAC7BV,kBACAjD,QAAQ2C,YAAY,EACpBa;QAEFI,IAAAA,iBAAa,EACX,CAAC,EAAErB,8BAA8B,CAAC,EAAEsB,IAAAA,mBAAe,EAACL,gBAAgB,CAAC,EACrEE,UACA;YACEI,UAAU;QACZ;IAEJ,OAEK,IACH,CAACC,IAAAA,cAAU,EAACtB,oBACZsB,IAAAA,cAAU,EAAC3B,uBACXE,oBAAoBF,oBACpB;QACA,MAAM4B,IAAAA,cAAU,EACd;YACErC,YAAYY;YACZ0B,QAAQ;gBACN;oBACEC,OAAOzD;oBACP0D,QAAQ;oBACRC,MAAM;gBACR;aACD;QACH,GACApE;IAEJ;IAEA,IAAI,QAAQmC,iBAAiB;QAC3B,MAAMkC,WAAWC,IAAAA,kCAAmB,EAAuB,CAAC,EAAEC,IAAI,EAAE;YAClE,IAAIC,UAAU;YACdrC,gBAAgBsC,EAAE,CAAC,SAAS,CAACC;gBAC3B,IAAIA,MAAMC,IAAI,KAAK,SAAS;oBAC1BH,UAAU;gBACZ,OAAO,IAAIE,MAAMC,IAAI,KAAK,SAAS;oBACjCH,UAAU;gBACZ,OAAO,IAAIE,MAAMC,IAAI,KAAK,OAAO;oBAC/BJ,KAAK;wBAAEC;oBAAQ;gBACjB;gBACA,sCAAsC;gBACtC,iDAAiD;gBACjD,IAAI,YAAYE,OAAO;oBACrBA,MAAME,MAAM,CAACC,KAAK;gBACpB;YACF;QACF;QACA,OAAOR;IACT,OAAO;YACyClC,mBAC7BgC;QADjB,MAAMA,SAAShC,CAAAA,mCAAAA,eAAiB,CAAC,SAAS,MAAIA,oCAAAA,oBAAAA,eAAiB,CAAC,EAAE,qBAApBA,kBAAsBgC,MAAM;QAC1E,MAAMW,WAAWX,CAAAA,2BAAAA,WAAAA,MAAQ,CAAC,EAAE,qBAAXA,SAAaW,QAAQ,KAAI;QAC1C,MAAMC,UAAU1C,IAAAA,aAAO,EAACE,+BAA+BuC;QACvD,MAAM;YAAEN,SAAS;YAAMO;QAAQ;IACjC;AACF;AAEO,eAAejF,kBACpBC,OAAiC;IAMjC,yCAAyC;IACzC,MAAMiF,SAAS,MAAM,2BAAA,QAAO;IAC5B,MAAMC,YAAY,CAAC;IACnB,KAAK,MAAMC,OAAOC,OAAOC,IAAI,CAACrF,SAAU;QACtC,IAAI,CAACiF,OAAOK,UAAU,CAACH,IAAI,EAAE;YAC3BD,SAAS,CAACC,IAAI,GAAGnF,OAAO,CAACmF,IAAI;QAC/B;IACF;IAEA,MAAM7D,eAAe,CAAC;IACtB,MAAMiE,kBAAkB;QACtB;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;KACD;IACD,MAAMhE,eAAe,CAAC;IACtB,KAAK,MAAM4D,OAAOC,OAAOC,IAAI,CAACH,WAAY;QACxC,IAAIK,gBAAgBC,QAAQ,CAACL,MAAM;YACjC7D,YAAY,CAAC6D,IAAI,GAAGD,SAAS,CAACC,IAAI;QACpC,OAAO;YACL5D,YAAY,CAAC4D,IAAI,GAAGD,SAAS,CAACC,IAAI;QACpC;IACF;IAEA,OAAO;QACL7D;QACAC;IACF;AACF;MAEA,WAAezB"}

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

@@ -15,27 +15,30 @@ _export(exports, {
 });
 const _extends = require("@swc/helpers/_/_extends");
 const _devkit = require("@nx/devkit");
-const _vite = require("vite");
 const _optionsutils = require("../../utils/options-utils");
 const _executorutils = require("../../utils/executor-utils");
 const _path = require("path");
+const _buildimpl = require("../build/build.impl");
 async function* viteDevServerExecutor(options, context) {
     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 { mergeConfig, createServer } = await Function('return import("vite")')();
+    const { mergeConfig, createServer, loadConfigFromFile } = await Function('return import("vite")')();
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const root = projectRoot === '.' ? process.cwd() : (0, _path.relative)(context.cwd, (0, _devkit.joinPathFragments)(context.root, projectRoot));
     (0, _executorutils.createBuildableTsConfig)(projectRoot, options, context);
     // Retrieve the option for the configured buildTarget.
     const buildTargetOptions = (0, _optionsutils.getNxTargetOptions)(options.buildTarget, context);
+    const { configuration } = (0, _devkit.parseTargetString)(options.buildTarget, context);
+    const { buildOptions, otherOptions: otherOptionsFromBuild } = await (0, _buildimpl.getBuildExtraArgs)(buildTargetOptions);
     const viteConfigPath = (0, _optionsutils.normalizeViteConfigFilePath)(context.root, projectRoot, buildTargetOptions.configFile);
-    const { serverOptions, otherOptions } = await getServerExtraArgs(options);
-    var _otherOptions_mode;
-    const resolved = await (0, _vite.loadConfigFromFile)({
-        mode: (_otherOptions_mode = otherOptions == null ? void 0 : otherOptions.mode) != null ? _otherOptions_mode : 'development',
+    const { serverOptions, otherOptions } = await getServerExtraArgs(options, configuration, buildOptions, otherOptionsFromBuild);
+    var _otherOptions_mode, _ref;
+    const resolved = await loadConfigFromFile({
+        mode: (_ref = (_otherOptions_mode = otherOptions == null ? void 0 : otherOptions.mode) != null ? _otherOptions_mode : buildTargetOptions == null ? void 0 : buildTargetOptions['mode']) != null ? _ref : 'development',
         command: 'serve'
     }, viteConfigPath);
     var _resolved_config_root;
+    // vite InlineConfig
     const serverConfig = mergeConfig({
         // This should not be needed as it's going to be set in vite.config.ts
         // but leaving it here in case someone did not migrate correctly
@@ -69,6 +72,7 @@ async function* viteDevServerExecutor(options, context) {
         process.once('exit', ()=>resolve());
     });
 }
+// vite ViteDevServer
 async function runViteDevServer(server) {
     await server.listen();
     server.printUrls();
@@ -80,7 +84,7 @@ async function runViteDevServer(server) {
     process.once('exit', processOnExit);
 }
 const _default = viteDevServerExecutor;
-async function getServerExtraArgs(options) {
+async function getServerExtraArgs(options, configuration, buildOptionsFromBuildTarget, otherOptionsFromBuildTarget) {
     // support passing extra args to vite cli
     const schema = await Promise.resolve().then(()=>require("./schema.json"));
     const extraArgs = {};
@@ -89,7 +93,7 @@ async function getServerExtraArgs(options) {
             extraArgs[key] = options[key];
         }
     }
-    const serverOptions = {};
+    let serverOptions = {};
     const serverSchemaKeys = [
         'hmr',
         'warmup',
@@ -108,7 +112,7 @@ async function getServerExtraArgs(options) {
         'cors',
         'headers'
     ];
-    const otherOptions = {};
+    let otherOptions = {};
     for (const key of Object.keys(extraArgs)){
         if (serverSchemaKeys.includes(key)) {
             serverOptions[key] = extraArgs[key];
@@ -116,6 +120,13 @@ async function getServerExtraArgs(options) {
             otherOptions[key] = extraArgs[key];
         }
     }
+    if (configuration) {
+        var _buildOptionsFromBuildTarget_watch;
+        serverOptions = _extends._({}, serverOptions, {
+            watch: (_buildOptionsFromBuildTarget_watch = buildOptionsFromBuildTarget == null ? void 0 : buildOptionsFromBuildTarget.watch) != null ? _buildOptionsFromBuildTarget_watch : serverOptions == null ? void 0 : serverOptions.watch
+        });
+        otherOptions = _extends._({}, otherOptions, otherOptionsFromBuildTarget != null ? otherOptionsFromBuildTarget : {});
+    }
     return {
         serverOptions,
         otherOptions

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, joinPathFragments } from '@nx/devkit';\nimport {\n  loadConfigFromFile,\n  type InlineConfig,\n  type ViteDevServer,\n  ServerOptions,\n} from 'vite';\n\nimport {\n  getNxTargetOptions,\n  getViteServerOptions,\n  normalizeViteConfigFilePath,\n} from '../../utils/options-utils';\n\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { createBuildableTsConfig } from '../../utils/executor-utils';\nimport { relative } from 'path';\n\nexport async function* viteDevServerExecutor(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): AsyncGenerator<{ success: boolean; baseUrl: string }> {\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 { 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  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\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  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    buildTargetOptions.configFile\n  );\n  const { serverOptions, otherOptions } = await getServerExtraArgs(options);\n  const resolved = await loadConfigFromFile(\n    {\n      mode: otherOptions?.mode ?? 'development',\n      command: 'serve',\n    },\n    viteConfigPath\n  );\n\n  const serverConfig: InlineConfig = mergeConfig(\n    {\n      // This should not be needed as it's going to be set in vite.config.ts\n      // but leaving it here in case someone did not migrate correctly\n      root: resolved.config.root ?? root,\n      configFile: viteConfigPath,\n    },\n    {\n      server: {\n        ...(await getViteServerOptions(options, context)),\n        ...serverOptions,\n      },\n      ...otherOptions,\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\nasync function getServerExtraArgs(\n  options: ViteDevServerExecutorOptions\n): Promise<{\n  serverOptions: ServerOptions;\n  otherOptions: Record<string, any>;\n}> {\n  // support passing extra args to vite cli\n  const schema = await import('./schema.json');\n  const extraArgs = {};\n  for (const key of Object.keys(options)) {\n    if (!schema.properties[key]) {\n      extraArgs[key] = options[key];\n    }\n  }\n\n  const serverOptions = {} as ServerOptions;\n  const serverSchemaKeys = [\n    'hmr',\n    'warmup',\n    'watch',\n    'middlewareMode',\n    'fs',\n    'origin',\n    'preTransformRequests',\n    'sourcemapIgnoreList',\n    'port',\n    'strictPort',\n    'host',\n    'https',\n    'open',\n    'proxy',\n    'cors',\n    'headers',\n  ];\n\n  const otherOptions = {};\n  for (const key of Object.keys(extraArgs)) {\n    if (serverSchemaKeys.includes(key)) {\n      serverOptions[key] = extraArgs[key];\n    } else {\n      otherOptions[key] = extraArgs[key];\n    }\n  }\n\n  return {\n    serverOptions,\n    otherOptions,\n  };\n}\n"],"names":["viteDevServerExecutor","options","context","process","env","VITE_CJS_IGNORE_WARNING","mergeConfig","createServer","Function","projectRoot","projectsConfigurations","projects","projectName","root","cwd","relative","joinPathFragments","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","viteConfigPath","normalizeViteConfigFilePath","configFile","serverOptions","otherOptions","getServerExtraArgs","resolved","loadConfigFromFile","mode","command","serverConfig","config","server","getViteServerOptions","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","resolve","once","listen","printUrls","processOnExit","close","schema","extraArgs","key","Object","keys","properties","serverSchemaKeys","includes"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  parseTargetString,\n} from '@nx/devkit';\nimport {\n  getNxTargetOptions,\n  getViteServerOptions,\n  normalizeViteConfigFilePath,\n} from '../../utils/options-utils';\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { createBuildableTsConfig } from '../../utils/executor-utils';\nimport { relative } from 'path';\nimport { getBuildExtraArgs } from '../build/build.impl';\n\nexport async function* viteDevServerExecutor(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): AsyncGenerator<{ success: boolean; baseUrl: string }> {\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 { mergeConfig, createServer, loadConfigFromFile } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\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  const { configuration } = parseTargetString(options.buildTarget, context);\n\n  const { buildOptions, otherOptions: otherOptionsFromBuild } =\n    await getBuildExtraArgs(buildTargetOptions);\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    buildTargetOptions.configFile\n  );\n  const { serverOptions, otherOptions } = await getServerExtraArgs(\n    options,\n    configuration,\n    buildOptions,\n    otherOptionsFromBuild\n  );\n  const resolved = await loadConfigFromFile(\n    {\n      mode: otherOptions?.mode ?? buildTargetOptions?.['mode'] ?? 'development',\n      command: 'serve',\n    },\n    viteConfigPath\n  );\n\n  // vite InlineConfig\n  const serverConfig = mergeConfig(\n    {\n      // This should not be needed as it's going to be set in vite.config.ts\n      // but leaving it here in case someone did not migrate correctly\n      root: resolved.config.root ?? root,\n      configFile: viteConfigPath,\n    },\n    {\n      server: {\n        ...(await getViteServerOptions(options, context)),\n        ...serverOptions,\n      },\n      ...otherOptions,\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// vite ViteDevServer\nasync function runViteDevServer(server: Record<string, any>): 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\nasync function getServerExtraArgs(\n  options: ViteDevServerExecutorOptions,\n  configuration: string | undefined,\n  buildOptionsFromBuildTarget: Record<string, unknown> | undefined,\n  otherOptionsFromBuildTarget: Record<string, unknown> | undefined\n): Promise<{\n  // vite ServerOptions\n  serverOptions: Record<string, unknown>;\n  otherOptions: Record<string, any>;\n}> {\n  // support passing extra args to vite cli\n  const schema = await import('./schema.json');\n  const extraArgs = {};\n  for (const key of Object.keys(options)) {\n    if (!schema.properties[key]) {\n      extraArgs[key] = options[key];\n    }\n  }\n\n  let serverOptions: Record<string, unknown> = {};\n  const serverSchemaKeys = [\n    'hmr',\n    'warmup',\n    'watch',\n    'middlewareMode',\n    'fs',\n    'origin',\n    'preTransformRequests',\n    'sourcemapIgnoreList',\n    'port',\n    'strictPort',\n    'host',\n    'https',\n    'open',\n    'proxy',\n    'cors',\n    'headers',\n  ];\n\n  let otherOptions = {};\n  for (const key of Object.keys(extraArgs)) {\n    if (serverSchemaKeys.includes(key)) {\n      serverOptions[key] = extraArgs[key];\n    } else {\n      otherOptions[key] = extraArgs[key];\n    }\n  }\n\n  if (configuration) {\n    serverOptions = {\n      ...serverOptions,\n      watch: buildOptionsFromBuildTarget?.watch ?? serverOptions?.watch,\n    };\n    otherOptions = {\n      ...otherOptions,\n      ...(otherOptionsFromBuildTarget ?? {}),\n    };\n  }\n\n  return {\n    serverOptions,\n    otherOptions,\n  };\n}\n"],"names":["viteDevServerExecutor","options","context","process","env","VITE_CJS_IGNORE_WARNING","mergeConfig","createServer","loadConfigFromFile","Function","projectRoot","projectsConfigurations","projects","projectName","root","cwd","relative","joinPathFragments","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","configuration","parseTargetString","buildOptions","otherOptions","otherOptionsFromBuild","getBuildExtraArgs","viteConfigPath","normalizeViteConfigFilePath","configFile","serverOptions","getServerExtraArgs","resolved","mode","command","serverConfig","config","server","getViteServerOptions","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","resolve","once","listen","printUrls","processOnExit","close","buildOptionsFromBuildTarget","otherOptionsFromBuildTarget","schema","extraArgs","key","Object","keys","properties","serverSchemaKeys","includes","watch"],"mappings":"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"}

package/src/executors/preview-server/preview-server.impl.d.ts

@@ -2,6 +2,6 @@ import { ExecutorContext } from '@nx/devkit';
 import { VitePreviewServerExecutorOptions } from './schema';
 export declare function vitePreviewServerExecutor(options: VitePreviewServerExecutorOptions, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
-    baseUrl: string;
+    baseUrl: any;
 }, void, unknown>;
 export default vitePreviewServerExecutor;

package/src/executors/preview-server/preview-server.impl.js

@@ -32,16 +32,17 @@ async function* vitePreviewServerExecutor(options, context) {
     const isCustomBuildTarget = targetConfiguration.executor !== '@nx/vite:build' && targetConfiguration.executor !== '@nrwl/vite:build';
     // Retrieve the option for the configured buildTarget.
     const buildTargetOptions = (0, _optionsutils.getNxTargetOptions)(options.buildTarget, context);
+    const { configuration } = (0, _devkit.parseTargetString)(options.buildTarget, context);
     const viteConfigPath = (0, _optionsutils.normalizeViteConfigFilePath)(context.root, projectRoot, buildTargetOptions.configFile);
     const { buildOptions, otherOptions: otherOptionsFromBuild } = await (0, _buildimpl.getBuildExtraArgs)(buildTargetOptions);
-    const { previewOptions, otherOptions } = await getExtraArgs(options);
-    var _otherOptions_mode;
+    const { previewOptions, otherOptions } = await getExtraArgs(options, configuration, otherOptionsFromBuild);
+    var _otherOptions_mode, _ref;
     const resolved = await loadConfigFromFile({
-        mode: (_otherOptions_mode = otherOptions == null ? void 0 : otherOptions.mode) != null ? _otherOptions_mode : 'production',
+        mode: (_ref = (_otherOptions_mode = otherOptions == null ? void 0 : otherOptions.mode) != null ? _otherOptions_mode : otherOptionsFromBuild == null ? void 0 : otherOptionsFromBuild.mode) != null ? _ref : 'production',
         command: 'build'
     }, viteConfigPath);
-    var _options_staticFilePath, _ref;
-    const outDir = (_ref = (_options_staticFilePath = options.staticFilePath) != null ? _options_staticFilePath : (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(projectRoot), buildTargetOptions.outputPath)) != null ? _ref : resolved == null ? void 0 : (_resolved_config = resolved.config) == null ? void 0 : (_resolved_config_build = _resolved_config.build) == null ? void 0 : _resolved_config_build.outDir;
+    var _options_staticFilePath, _ref1;
+    const outDir = (_ref1 = (_options_staticFilePath = options.staticFilePath) != null ? _options_staticFilePath : (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(projectRoot), buildTargetOptions.outputPath)) != null ? _ref1 : resolved == null ? void 0 : (_resolved_config = resolved.config) == null ? void 0 : (_resolved_config_build = _resolved_config.build) == null ? void 0 : _resolved_config_build.outDir;
     if (!outDir) {
         throw new Error(`Could not infer the "outputPath" or "outDir". It should be set in your vite.config.ts, or as a property of the "${options.buildTarget}" buildTarget or provided explicitly as a "staticFilePath" option.`);
     }
@@ -58,6 +59,7 @@ async function* vitePreviewServerExecutor(options, context) {
         preview: _extends._({}, (0, _optionsutils.getProxyConfig)(context, otherOptions.proxyConfig), previewOptions)
     });
     var _resolved_config_root;
+    // vite InlineConfig
     const serverConfig = mergeConfig({
         // This should not be needed as it's going to be set in vite.config.ts
         // but leaving it here in case someone did not migrate correctly
@@ -67,6 +69,7 @@ async function* vitePreviewServerExecutor(options, context) {
     if (serverConfig.mode === 'production') {
         console.warn('WARNING: preview is not meant to be run in production!');
     }
+    // vite PreviewServer
     let server;
     const processOnExit = async ()=>{
         await closeServer(server);
@@ -132,7 +135,7 @@ function closeServer(server) {
     });
 }
 const _default = vitePreviewServerExecutor;
-async function getExtraArgs(options) {
+async function getExtraArgs(options, configuration, otherOptionsFromBuildTarget) {
     // support passing extra args to vite cli
     const schema = await Promise.resolve().then(()=>require("./schema.json"));
     const extraArgs = {};
@@ -152,7 +155,7 @@ async function getExtraArgs(options) {
         'cors',
         'headers'
     ];
-    const otherOptions = {};
+    let otherOptions = {};
     for (const key of Object.keys(extraArgs)){
         if (previewSchemaKeys.includes(key)) {
             previewOptions[key] = extraArgs[key];
@@ -160,6 +163,9 @@ async function getExtraArgs(options) {
             otherOptions[key] = extraArgs[key];
         }
     }
+    if (configuration) {
+        otherOptions = _extends._({}, otherOptions, otherOptionsFromBuildTarget != null ? otherOptionsFromBuildTarget : {});
+    }
     return {
         previewOptions,
         otherOptions

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/executors/preview-server/preview-server.impl.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  offsetFromRoot,\n  parseTargetString,\n  runExecutor,\n} from '@nx/devkit';\nimport type { InlineConfig, PreviewOptions, PreviewServer } from 'vite';\nimport {\n  getNxTargetOptions,\n  getProxyConfig,\n  normalizeViteConfigFilePath,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { VitePreviewServerExecutorOptions } from './schema';\nimport { relative } from 'path';\nimport { getBuildExtraArgs } from '../build/build.impl';\n\nexport async function* vitePreviewServerExecutor(\n  options: VitePreviewServerExecutorOptions,\n  context: ExecutorContext\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 { mergeConfig, preview, loadConfigFromFile } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  const target = parseTargetString(options.buildTarget, context);\n  const targetConfiguration =\n    context.projectsConfigurations.projects[target.project]?.targets[\n      target.target\n    ];\n  if (!targetConfiguration) {\n    throw new Error(`Invalid buildTarget: ${options.buildTarget}`);\n  }\n\n  const isCustomBuildTarget =\n    targetConfiguration.executor !== '@nx/vite:build' &&\n    targetConfiguration.executor !== '@nrwl/vite:build';\n\n  // Retrieve the option for the configured buildTarget.\n  const buildTargetOptions: ViteBuildExecutorOptions = getNxTargetOptions(\n    options.buildTarget,\n    context\n  );\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    buildTargetOptions.configFile\n  );\n\n  const { buildOptions, otherOptions: otherOptionsFromBuild } =\n    await getBuildExtraArgs(buildTargetOptions);\n\n  const { previewOptions, otherOptions } = await getExtraArgs(options);\n  const resolved = await loadConfigFromFile(\n    {\n      mode: otherOptions?.mode ?? 'production',\n      command: 'build',\n    },\n    viteConfigPath\n  );\n\n  const outDir =\n    options.staticFilePath ??\n    joinPathFragments(\n      offsetFromRoot(projectRoot),\n      buildTargetOptions.outputPath\n    ) ??\n    resolved?.config?.build?.outDir;\n\n  if (!outDir) {\n    throw new Error(\n      `Could not infer the \"outputPath\" or \"outDir\". It should be set in your vite.config.ts, or as a property of the \"${options.buildTarget}\" buildTarget or provided explicitly as a \"staticFilePath\" option.`\n    );\n  }\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\n\n  // Merge the options from the build and preview-serve targets.\n  // The latter takes precedence.\n  const mergedOptions = {\n    ...{ watch: {} },\n    build: {\n      outDir,\n      ...(isCustomBuildTarget ? {} : buildOptions),\n    },\n    ...(isCustomBuildTarget ? {} : otherOptionsFromBuild),\n    ...otherOptions,\n    preview: {\n      ...getProxyConfig(context, otherOptions.proxyConfig),\n      ...previewOptions,\n    },\n  };\n\n  const serverConfig: InlineConfig = mergeConfig(\n    {\n      // This should not be needed as it's going to be set in vite.config.ts\n      // but leaving it here in case someone did not migrate correctly\n      root: resolved.config.root ?? root,\n      configFile: viteConfigPath,\n    },\n    {\n      ...mergedOptions,\n    }\n  );\n\n  if (serverConfig.mode === 'production') {\n    console.warn('WARNING: preview is not meant to be run in production!');\n  }\n\n  let server: PreviewServer | undefined;\n\n  const processOnExit = async () => {\n    await closeServer(server);\n  };\n\n  process.once('SIGINT', processOnExit);\n  process.once('SIGTERM', processOnExit);\n  process.once('exit', processOnExit);\n\n  // Launch the build target.\n  // If customBuildTarget is set to true, do not provide any overrides to it\n  const buildTargetOverrides = isCustomBuildTarget ? {} : mergedOptions;\n  const build = await runExecutor(target, buildTargetOverrides, context);\n\n  for await (const result of build) {\n    if (result.success) {\n      try {\n        if (!server) {\n          server = await preview(serverConfig);\n        }\n        server.printUrls();\n\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    } else {\n      yield {\n        success: false,\n        baseUrl: '',\n      };\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\nfunction closeServer(server?: PreviewServer): Promise<void> {\n  return new Promise((resolve) => {\n    if (!server) {\n      resolve();\n    } else {\n      const { httpServer } = server;\n      if (httpServer['closeAllConnections']) {\n        // https://github.com/vitejs/vite/pull/14834\n        // closeAllConnections was added in Node v18.2.0\n        // typically is \"as http.Server\" but no reason\n        // to import http just for this\n        (httpServer as any).closeAllConnections();\n      }\n      httpServer.close(() => resolve());\n    }\n  });\n}\n\nexport default vitePreviewServerExecutor;\n\nasync function getExtraArgs(\n  options: VitePreviewServerExecutorOptions\n): Promise<{\n  previewOptions: PreviewOptions;\n  otherOptions: Record<string, any>;\n}> {\n  // support passing extra args to vite cli\n  const schema = await import('./schema.json');\n  const extraArgs = {};\n  for (const key of Object.keys(options)) {\n    if (!schema.properties[key]) {\n      extraArgs[key] = options[key];\n    }\n  }\n\n  const previewOptions = {} as PreviewOptions;\n  const previewSchemaKeys = [\n    'port',\n    'strictPort',\n    'host',\n    'https',\n    'open',\n    'proxy',\n    'cors',\n    'headers',\n  ];\n\n  const otherOptions = {};\n  for (const key of Object.keys(extraArgs)) {\n    if (previewSchemaKeys.includes(key)) {\n      previewOptions[key] = extraArgs[key];\n    } else {\n      otherOptions[key] = extraArgs[key];\n    }\n  }\n\n  return {\n    previewOptions,\n    otherOptions,\n  };\n}\n"],"names":["vitePreviewServerExecutor","options","context","resolved","process","env","VITE_CJS_IGNORE_WARNING","mergeConfig","preview","loadConfigFromFile","Function","projectRoot","projectsConfigurations","projects","projectName","root","target","parseTargetString","buildTarget","targetConfiguration","project","targets","Error","isCustomBuildTarget","executor","buildTargetOptions","getNxTargetOptions","viteConfigPath","normalizeViteConfigFilePath","configFile","buildOptions","otherOptions","otherOptionsFromBuild","getBuildExtraArgs","previewOptions","getExtraArgs","mode","command","outDir","staticFilePath","joinPathFragments","offsetFromRoot","outputPath","config","build","cwd","relative","mergedOptions","watch","getProxyConfig","proxyConfig","serverConfig","console","warn","server","processOnExit","closeServer","once","buildTargetOverrides","runExecutor","result","success","printUrls","resolvedUrls","local","network","baseUrl","e","error","Promise","resolve","httpServer","closeAllConnections","close","schema","extraArgs","key","Object","keys","properties","previewSchemaKeys","includes"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/preview-server/preview-server.impl.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  offsetFromRoot,\n  parseTargetString,\n  runExecutor,\n} from '@nx/devkit';\nimport {\n  getNxTargetOptions,\n  getProxyConfig,\n  normalizeViteConfigFilePath,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { VitePreviewServerExecutorOptions } from './schema';\nimport { relative } from 'path';\nimport { getBuildExtraArgs } from '../build/build.impl';\n\nexport async function* vitePreviewServerExecutor(\n  options: VitePreviewServerExecutorOptions,\n  context: ExecutorContext\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 { mergeConfig, preview, loadConfigFromFile } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  const target = parseTargetString(options.buildTarget, context);\n  const targetConfiguration =\n    context.projectsConfigurations.projects[target.project]?.targets[\n      target.target\n    ];\n  if (!targetConfiguration) {\n    throw new Error(`Invalid buildTarget: ${options.buildTarget}`);\n  }\n\n  const isCustomBuildTarget =\n    targetConfiguration.executor !== '@nx/vite:build' &&\n    targetConfiguration.executor !== '@nrwl/vite:build';\n\n  // Retrieve the option for the configured buildTarget.\n  const buildTargetOptions: ViteBuildExecutorOptions = getNxTargetOptions(\n    options.buildTarget,\n    context\n  );\n\n  const { configuration } = parseTargetString(options.buildTarget, context);\n\n  const viteConfigPath = normalizeViteConfigFilePath(\n    context.root,\n    projectRoot,\n    buildTargetOptions.configFile\n  );\n\n  const { buildOptions, otherOptions: otherOptionsFromBuild } =\n    await getBuildExtraArgs(buildTargetOptions);\n\n  const { previewOptions, otherOptions } = await getExtraArgs(\n    options,\n    configuration,\n    otherOptionsFromBuild\n  );\n  const resolved = await loadConfigFromFile(\n    {\n      mode: otherOptions?.mode ?? otherOptionsFromBuild?.mode ?? 'production',\n      command: 'build',\n    },\n    viteConfigPath\n  );\n\n  const outDir =\n    options.staticFilePath ??\n    joinPathFragments(\n      offsetFromRoot(projectRoot),\n      buildTargetOptions.outputPath\n    ) ??\n    resolved?.config?.build?.outDir;\n\n  if (!outDir) {\n    throw new Error(\n      `Could not infer the \"outputPath\" or \"outDir\". It should be set in your vite.config.ts, or as a property of the \"${options.buildTarget}\" buildTarget or provided explicitly as a \"staticFilePath\" option.`\n    );\n  }\n  const root =\n    projectRoot === '.'\n      ? process.cwd()\n      : relative(context.cwd, joinPathFragments(context.root, projectRoot));\n\n  // Merge the options from the build and preview-serve targets.\n  // The latter takes precedence.\n  const mergedOptions = {\n    ...{ watch: {} },\n    build: {\n      outDir,\n      ...(isCustomBuildTarget ? {} : buildOptions),\n    },\n    ...(isCustomBuildTarget ? {} : otherOptionsFromBuild),\n    ...otherOptions,\n    preview: {\n      ...getProxyConfig(context, otherOptions.proxyConfig),\n      ...previewOptions,\n    },\n  };\n\n  // vite InlineConfig\n  const serverConfig = mergeConfig(\n    {\n      // This should not be needed as it's going to be set in vite.config.ts\n      // but leaving it here in case someone did not migrate correctly\n      root: resolved.config.root ?? root,\n      configFile: viteConfigPath,\n    },\n    {\n      ...mergedOptions,\n    }\n  );\n\n  if (serverConfig.mode === 'production') {\n    console.warn('WARNING: preview is not meant to be run in production!');\n  }\n\n  // vite PreviewServer\n  let server: Record<string, any> | undefined;\n\n  const processOnExit = async () => {\n    await closeServer(server);\n  };\n\n  process.once('SIGINT', processOnExit);\n  process.once('SIGTERM', processOnExit);\n  process.once('exit', processOnExit);\n\n  // Launch the build target.\n  // If customBuildTarget is set to true, do not provide any overrides to it\n  const buildTargetOverrides = isCustomBuildTarget ? {} : mergedOptions;\n  const build = await runExecutor(target, buildTargetOverrides, context);\n\n  for await (const result of build) {\n    if (result.success) {\n      try {\n        if (!server) {\n          server = await preview(serverConfig);\n        }\n        server.printUrls();\n\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    } else {\n      yield {\n        success: false,\n        baseUrl: '',\n      };\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\nfunction closeServer(server?: Record<string, any>): Promise<void> {\n  return new Promise((resolve) => {\n    if (!server) {\n      resolve();\n    } else {\n      const { httpServer } = server;\n      if (httpServer['closeAllConnections']) {\n        // https://github.com/vitejs/vite/pull/14834\n        // closeAllConnections was added in Node v18.2.0\n        // typically is \"as http.Server\" but no reason\n        // to import http just for this\n        (httpServer as any).closeAllConnections();\n      }\n      httpServer.close(() => resolve());\n    }\n  });\n}\n\nexport default vitePreviewServerExecutor;\n\nasync function getExtraArgs(\n  options: VitePreviewServerExecutorOptions,\n  configuration: string | undefined,\n  otherOptionsFromBuildTarget: Record<string, unknown> | undefined\n): Promise<{\n  // vite PreviewOptions\n  previewOptions: Record<string, any>;\n  otherOptions: Record<string, any>;\n}> {\n  // support passing extra args to vite cli\n  const schema = await import('./schema.json');\n  const extraArgs = {};\n  for (const key of Object.keys(options)) {\n    if (!schema.properties[key]) {\n      extraArgs[key] = options[key];\n    }\n  }\n\n  const previewOptions = {};\n  const previewSchemaKeys = [\n    'port',\n    'strictPort',\n    'host',\n    'https',\n    'open',\n    'proxy',\n    'cors',\n    'headers',\n  ];\n\n  let otherOptions = {};\n  for (const key of Object.keys(extraArgs)) {\n    if (previewSchemaKeys.includes(key)) {\n      previewOptions[key] = extraArgs[key];\n    } else {\n      otherOptions[key] = extraArgs[key];\n    }\n  }\n\n  if (configuration) {\n    otherOptions = {\n      ...otherOptions,\n      ...(otherOptionsFromBuildTarget ?? {}),\n    };\n  }\n\n  return {\n    previewOptions,\n    otherOptions,\n  };\n}\n"],"names":["vitePreviewServerExecutor","options","context","resolved","process","env","VITE_CJS_IGNORE_WARNING","mergeConfig","preview","loadConfigFromFile","Function","projectRoot","projectsConfigurations","projects","projectName","root","target","parseTargetString","buildTarget","targetConfiguration","project","targets","Error","isCustomBuildTarget","executor","buildTargetOptions","getNxTargetOptions","configuration","viteConfigPath","normalizeViteConfigFilePath","configFile","buildOptions","otherOptions","otherOptionsFromBuild","getBuildExtraArgs","previewOptions","getExtraArgs","mode","command","outDir","staticFilePath","joinPathFragments","offsetFromRoot","outputPath","config","build","cwd","relative","mergedOptions","watch","getProxyConfig","proxyConfig","serverConfig","console","warn","server","processOnExit","closeServer","once","buildTargetOverrides","runExecutor","result","success","printUrls","resolvedUrls","local","network","baseUrl","e","error","Promise","resolve","httpServer","closeAllConnections","close","otherOptionsFromBuildTarget","schema","extraArgs","key","Object","keys","properties","previewSchemaKeys","includes"],"mappings":"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"}

package/src/migrations/update-17-3-0/lib/{fix-coverage.d.ts → fix-coverage-and-reporters.d.ts}

@@ -1,3 +1,3 @@
 import ts = require('typescript');
-export declare function fixCoverage(configContents: string): string | undefined;
+export declare function fixCoverageAndRerporters(configContents: string): string | undefined;
 export declare function getConfigNode(configFileContents: string): ts.Node | undefined;

package/src/migrations/update-17-3-0/lib/fix-coverage-and-reporters.js

@@ -0,0 +1,117 @@
+"use strict";
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    fixCoverageAndRerporters: function() {
+        return fixCoverageAndRerporters;
+    },
+    getConfigNode: function() {
+        return getConfigNode;
+    }
+});
+const _devkit = require("@nx/devkit");
+const _tsquery = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+function fixCoverageAndRerporters(configContents) {
+    var _tsquery_query, _tsquery_query1;
+    const configNode = getConfigNode(configContents);
+    if (!configNode) {
+        return;
+    }
+    const testHasCoverage = (_tsquery_query = _tsquery.tsquery.query(configNode, `PropertyAssignment:has(Identifier[name="test"]):has(PropertyAssignment:has(Identifier[name="coverage"]))`)) == null ? void 0 : _tsquery_query[0];
+    let changes = [];
+    if (testHasCoverage) {
+        var _tsquery_query2, _tsquery_query3, _tsquery_query4, _tsquery_query5, _tsquery_query6;
+        const testObjectLiteralExpressionNode = (_tsquery_query2 = _tsquery.tsquery.query(testHasCoverage, `ObjectLiteralExpression:has(Identifier[name="coverage"])`)) == null ? void 0 : _tsquery_query2[0];
+        const coverageNode = findCoverageNode(testObjectLiteralExpressionNode);
+        if (!coverageNode) {
+            return;
+        }
+        const linesNode = (_tsquery_query3 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="lines"])`)) == null ? void 0 : _tsquery_query3[0];
+        const statementsNode = (_tsquery_query4 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="statements"])`)) == null ? void 0 : _tsquery_query4[0];
+        const functionsNode = (_tsquery_query5 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="functions"])`)) == null ? void 0 : _tsquery_query5[0];
+        const branchesNode = (_tsquery_query6 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="branches"])`)) == null ? void 0 : _tsquery_query6[0];
+        if (linesNode) {
+            changes.push({
+                type: _devkit.ChangeType.Delete,
+                start: linesNode.getStart(),
+                length: linesNode.getWidth() + 1
+            });
+        }
+        if (statementsNode) {
+            changes.push({
+                type: _devkit.ChangeType.Delete,
+                start: statementsNode.getStart(),
+                length: statementsNode.getWidth() + 1
+            });
+        }
+        if (functionsNode) {
+            changes.push({
+                type: _devkit.ChangeType.Delete,
+                start: functionsNode.getStart(),
+                length: functionsNode.getWidth() + 1
+            });
+        }
+        if (branchesNode) {
+            changes.push({
+                type: _devkit.ChangeType.Delete,
+                start: branchesNode.getStart(),
+                length: branchesNode.getWidth() + 1
+            });
+        }
+        if (branchesNode || functionsNode || statementsNode || linesNode) {
+            changes.push({
+                type: _devkit.ChangeType.Insert,
+                index: coverageNode.getStart() + 1,
+                text: `thresholds: {
+        ${linesNode ? linesNode.getText() + ',' : ''}
+        ${statementsNode ? statementsNode.getText() + ',' : ''}
+        ${functionsNode ? functionsNode.getText() + ',' : ''}
+        ${branchesNode ? branchesNode.getText() + ',' : ''}
+      },`
+            });
+        }
+    }
+    const testHasReporters = (_tsquery_query1 = _tsquery.tsquery.query(configNode, `PropertyAssignment:has(Identifier[name="test"]):has(PropertyAssignment:has(Identifier[name="reporters"]))`)) == null ? void 0 : _tsquery_query1[0];
+    if (!testHasReporters) {
+        var _tsquery_query7;
+        const testObject = (_tsquery_query7 = _tsquery.tsquery.query(configNode, `PropertyAssignment:has(Identifier[name="test"])`)) == null ? void 0 : _tsquery_query7[0];
+        changes.push({
+            type: _devkit.ChangeType.Insert,
+            index: testObject.getStart() + `test: {`.length + 1,
+            text: `reporters: ['default'],`
+        });
+    }
+    if (changes.length > 0) {
+        return (0, _devkit.applyChangesToString)(configContents, changes);
+    } else {
+        return;
+    }
+}
+function getConfigNode(configFileContents) {
+    var _tsquery_query, _tsquery_query1;
+    if (!configFileContents) {
+        return;
+    }
+    let configNode = (_tsquery_query = _tsquery.tsquery.query(configFileContents, `ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query[0];
+    const arrowFunctionReturnStatement = (_tsquery_query1 = _tsquery.tsquery.query(configFileContents, `ArrowFunction Block ReturnStatement ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query1[0];
+    if (arrowFunctionReturnStatement) {
+        configNode = arrowFunctionReturnStatement;
+    }
+    return configNode;
+}
+function findCoverageNode(testNode) {
+    let coverageNode;
+    testNode.forEachChild((child)=>{
+        if (ts.isPropertyAssignment(child) && child.name.getText() === 'coverage') {
+            coverageNode = child.initializer;
+        }
+    });
+    return coverageNode;
+}
+
+//# sourceMappingURL=fix-coverage-and-reporters.js.map

package/src/migrations/update-17-3-0/lib/fix-coverage-and-reporters.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-3-0/lib/fix-coverage-and-reporters.ts"],"sourcesContent":["import { ChangeType, applyChangesToString } from '@nx/devkit';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\n\nexport function fixCoverageAndRerporters(\n  configContents: string\n): string | undefined {\n  const configNode = getConfigNode(configContents);\n  if (!configNode) {\n    return;\n  }\n\n  const testHasCoverage = tsquery.query(\n    configNode,\n    `PropertyAssignment:has(Identifier[name=\"test\"]):has(PropertyAssignment:has(Identifier[name=\"coverage\"]))`\n  )?.[0];\n  let changes = [];\n\n  if (testHasCoverage) {\n    const testObjectLiteralExpressionNode = tsquery.query(\n      testHasCoverage,\n      `ObjectLiteralExpression:has(Identifier[name=\"coverage\"])`\n    )?.[0];\n    const coverageNode = findCoverageNode(testObjectLiteralExpressionNode);\n\n    if (!coverageNode) {\n      return;\n    }\n\n    const linesNode = tsquery.query(\n      coverageNode,\n      `PropertyAssignment:has(Identifier[name=\"lines\"])`\n    )?.[0];\n\n    const statementsNode = tsquery.query(\n      coverageNode,\n      `PropertyAssignment:has(Identifier[name=\"statements\"])`\n    )?.[0];\n\n    const functionsNode = tsquery.query(\n      coverageNode,\n      `PropertyAssignment:has(Identifier[name=\"functions\"])`\n    )?.[0];\n\n    const branchesNode = tsquery.query(\n      coverageNode,\n      `PropertyAssignment:has(Identifier[name=\"branches\"])`\n    )?.[0];\n\n    if (linesNode) {\n      changes.push({\n        type: ChangeType.Delete,\n        start: linesNode.getStart(),\n        length: linesNode.getWidth() + 1,\n      });\n    }\n    if (statementsNode) {\n      changes.push({\n        type: ChangeType.Delete,\n        start: statementsNode.getStart(),\n        length: statementsNode.getWidth() + 1,\n      });\n    }\n\n    if (functionsNode) {\n      changes.push({\n        type: ChangeType.Delete,\n        start: functionsNode.getStart(),\n        length: functionsNode.getWidth() + 1,\n      });\n    }\n\n    if (branchesNode) {\n      changes.push({\n        type: ChangeType.Delete,\n        start: branchesNode.getStart(),\n        length: branchesNode.getWidth() + 1,\n      });\n    }\n\n    if (branchesNode || functionsNode || statementsNode || linesNode) {\n      changes.push({\n        type: ChangeType.Insert,\n        index: coverageNode.getStart() + 1,\n        text: `thresholds: {\n        ${linesNode ? linesNode.getText() + ',' : ''}\n        ${statementsNode ? statementsNode.getText() + ',' : ''}\n        ${functionsNode ? functionsNode.getText() + ',' : ''}\n        ${branchesNode ? branchesNode.getText() + ',' : ''}\n      },`,\n      });\n    }\n  }\n\n  const testHasReporters = tsquery.query(\n    configNode,\n    `PropertyAssignment:has(Identifier[name=\"test\"]):has(PropertyAssignment:has(Identifier[name=\"reporters\"]))`\n  )?.[0];\n\n  if (!testHasReporters) {\n    const testObject = tsquery.query(\n      configNode,\n      `PropertyAssignment:has(Identifier[name=\"test\"])`\n    )?.[0];\n    changes.push({\n      type: ChangeType.Insert,\n      index: testObject.getStart() + `test: {`.length + 1,\n      text: `reporters: ['default'],`,\n    });\n  }\n\n  if (changes.length > 0) {\n    return applyChangesToString(configContents, changes);\n  } else {\n    return;\n  }\n}\n\nexport function getConfigNode(configFileContents: string): ts.Node | undefined {\n  if (!configFileContents) {\n    return;\n  }\n  let configNode = tsquery.query(\n    configFileContents,\n    `ObjectLiteralExpression`\n  )?.[0];\n\n  const arrowFunctionReturnStatement = tsquery.query(\n    configFileContents,\n    `ArrowFunction Block ReturnStatement ObjectLiteralExpression`\n  )?.[0];\n\n  if (arrowFunctionReturnStatement) {\n    configNode = arrowFunctionReturnStatement;\n  }\n\n  return configNode;\n}\n\nfunction findCoverageNode(testNode: ts.Node) {\n  let coverageNode: ts.Node | undefined;\n  testNode.forEachChild((child) => {\n    if (ts.isPropertyAssignment(child) && child.name.getText() === 'coverage') {\n      coverageNode = child.initializer;\n    }\n  });\n  return coverageNode;\n}\n"],"names":["fixCoverageAndRerporters","getConfigNode","ts","configContents","tsquery","configNode","testHasCoverage","query","changes","testObjectLiteralExpressionNode","coverageNode","findCoverageNode","linesNode","statementsNode","functionsNode","branchesNode","push","type","ChangeType","Delete","start","getStart","length","getWidth","Insert","index","text","getText","testHasReporters","testObject","applyChangesToString","configFileContents","arrowFunctionReturnStatement","testNode","forEachChild","child","isPropertyAssignment","name","initializer"],"mappings":"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"}

package/src/migrations/update-17-3-0/{vitest-coverage-threshold.js → vitest-coverage-and-reporters.js}

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "default", {
 });
 const _devkit = require("@nx/devkit");
 const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
-const _fixcoverage = require("./lib/fix-coverage");
+const _fixcoverageandreporters = require("./lib/fix-coverage-and-reporters");
 async function fixCoverageThreshold(tree) {
     const projects = (0, _devkit.getProjects)(tree);
     (0, _executoroptionsutils.forEachExecutorOptions)(tree, '@nx/vite:test', (_options, projectName)=>{
@@ -17,7 +17,7 @@ async function fixCoverageThreshold(tree) {
             return;
         }
         const configContents = tree.read(configPath, 'utf-8');
-        const updatedConfigContents = (0, _fixcoverage.fixCoverage)(configContents);
+        const updatedConfigContents = (0, _fixcoverageandreporters.fixCoverageAndRerporters)(configContents);
         if (updatedConfigContents) {
             tree.write(configPath, updatedConfigContents);
         }
@@ -42,4 +42,4 @@ function findViteConfig(tree, searchRoot) {
     }
 }
 
-//# sourceMappingURL=vitest-coverage-threshold.js.map
+//# sourceMappingURL=vitest-coverage-and-reporters.js.map

package/src/migrations/update-17-3-0/vitest-coverage-and-reporters.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-3-0/vitest-coverage-and-reporters.ts"],"sourcesContent":["import {\n  ProjectConfiguration,\n  Tree,\n  formatFiles,\n  getProjects,\n  joinPathFragments,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { fixCoverageAndRerporters } from './lib/fix-coverage-and-reporters';\n\nexport default async function fixCoverageThreshold(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions(tree, '@nx/vite:test', (_options, projectName) => {\n    const projectConfig: ProjectConfiguration = projects.get(\n      projectName\n    ) as ProjectConfiguration;\n    const configPath = findViteConfig(tree, projectConfig.root);\n    if (!configPath || !tree.exists(configPath)) {\n      return;\n    }\n    const configContents = tree.read(configPath, 'utf-8') as string;\n    const updatedConfigContents = fixCoverageAndRerporters(configContents);\n    if (updatedConfigContents) {\n      tree.write(configPath, updatedConfigContents);\n    }\n  });\n\n  await formatFiles(tree);\n}\n\nfunction findViteConfig(tree: Tree, searchRoot: string) {\n  const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];\n\n  for (const ext of allowsExt) {\n    if (tree.exists(joinPathFragments(searchRoot, `vite.config.${ext}`))) {\n      return joinPathFragments(searchRoot, `vite.config.${ext}`);\n    } else if (\n      tree.exists(joinPathFragments(searchRoot, `vitest.config.${ext}`))\n    ) {\n      return joinPathFragments(searchRoot, `vitest.config.${ext}`);\n    }\n  }\n}\n"],"names":["fixCoverageThreshold","tree","projects","getProjects","forEachExecutorOptions","_options","projectName","projectConfig","get","configPath","findViteConfig","root","exists","configContents","read","updatedConfigContents","fixCoverageAndRerporters","write","formatFiles","searchRoot","allowsExt","ext","joinPathFragments"],"mappings":";+BAUA;;;eAA8BA;;;wBAJvB;sCACgC;yCACE;AAE1B,eAAeA,qBAAqBC,IAAU;IAC3D,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EAACH,MAAM,iBAAiB,CAACI,UAAUC;QACvD,MAAMC,gBAAsCL,SAASM,GAAG,CACtDF;QAEF,MAAMG,aAAaC,eAAeT,MAAMM,cAAcI,IAAI;QAC1D,IAAI,CAACF,cAAc,CAACR,KAAKW,MAAM,CAACH,aAAa;YAC3C;QACF;QACA,MAAMI,iBAAiBZ,KAAKa,IAAI,CAACL,YAAY;QAC7C,MAAMM,wBAAwBC,IAAAA,iDAAwB,EAACH;QACvD,IAAIE,uBAAuB;YACzBd,KAAKgB,KAAK,CAACR,YAAYM;QACzB;IACF;IAEA,MAAMG,IAAAA,mBAAW,EAACjB;AACpB;AAEA,SAASS,eAAeT,IAAU,EAAEkB,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAInB,KAAKW,MAAM,CAACU,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D,OAAO,IACLpB,KAAKW,MAAM,CAACU,IAAAA,yBAAiB,EAACH,YAAY,CAAC,cAAc,EAAEE,IAAI,CAAC,IAChE;YACA,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,cAAc,EAAEE,IAAI,CAAC;QAC7D;IACF;AACF"}

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

@@ -1,5 +1,4 @@
 import { ExecutorContext } from '@nx/devkit';
-import { ProxyOptions, ServerOptions } from 'vite';
 import { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';
 /**
  * Returns the path to the vite config file or undefined when not found.
@@ -13,6 +12,6 @@ export declare function getViteServerProxyConfigPath(nxProxyConfig: string | und
 /**
  * Builds the options for the vite dev server.
  */
-export declare function getViteServerOptions(options: ViteDevServerExecutorOptions, context: ExecutorContext): Promise<ServerOptions>;
-export declare function getProxyConfig(context: ExecutorContext, proxyConfig?: string): Record<string, string | ProxyOptions> | undefined;
+export declare function getViteServerOptions(options: ViteDevServerExecutorOptions, context: ExecutorContext): Promise<Record<string, unknown>>;
+export declare function getProxyConfig(context: ExecutorContext, proxyConfig?: string): Record<string, string | unknown> | undefined;
 export declare function getNxTargetOptions(target: string, context: ExecutorContext): any;

package/src/utils/options-utils.js

@@ -64,6 +64,7 @@ function getViteServerProxyConfigPath(nxProxyConfig, context) {
     }
 }
 async function getViteServerOptions(options, context) {
+    // returns vite ServerOptions
     // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
     const { searchForWorkspaceRoot } = await Function('return import("vite")')();
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/vite/src/utils/options-utils.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  parseTargetString,\n  readTargetOptions,\n} from '@nx/devkit';\nimport { existsSync } from 'fs';\nimport { ProxyOptions, ServerOptions } from 'vite';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\n\n/**\n * Returns the path to the vite config file or undefined when not found.\n */\nexport function normalizeViteConfigFilePath(\n  contextRoot: string,\n  projectRoot: string,\n  configFile?: string\n): string | undefined {\n  if (configFile) {\n    const normalized = joinPathFragments(configFile);\n    if (!existsSync(normalized)) {\n      throw new Error(\n        `Could not find vite config at provided path \"${normalized}\".`\n      );\n    }\n    return normalized;\n  }\n\n  const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];\n\n  for (const ext of allowsExt) {\n    if (\n      existsSync(\n        joinPathFragments(contextRoot, projectRoot, `vite.config.${ext}`)\n      )\n    ) {\n      return joinPathFragments(contextRoot, projectRoot, `vite.config.${ext}`);\n    } else if (\n      existsSync(\n        joinPathFragments(contextRoot, projectRoot, `vitest.config.${ext}`)\n      )\n    ) {\n      return joinPathFragments(\n        contextRoot,\n        projectRoot,\n        `vitest.config.${ext}`\n      );\n    }\n  }\n}\n\nexport function getProjectTsConfigPath(\n  projectRoot: string\n): string | undefined {\n  return existsSync(joinPathFragments(projectRoot, 'tsconfig.app.json'))\n    ? joinPathFragments(projectRoot, 'tsconfig.app.json')\n    : existsSync(joinPathFragments(projectRoot, 'tsconfig.lib.json'))\n    ? joinPathFragments(projectRoot, 'tsconfig.lib.json')\n    : existsSync(joinPathFragments(projectRoot, 'tsconfig.json'))\n    ? joinPathFragments(projectRoot, 'tsconfig.json')\n    : undefined;\n}\n\n/**\n * Returns the path to the proxy configuration file or undefined when not found.\n */\nexport function getViteServerProxyConfigPath(\n  nxProxyConfig: string | undefined,\n  context: ExecutorContext\n): string | undefined {\n  if (nxProxyConfig) {\n    const projectRoot =\n      context.projectsConfigurations.projects[context.projectName].root;\n\n    const proxyConfigPath = nxProxyConfig\n      ? joinPathFragments(context.root, nxProxyConfig)\n      : joinPathFragments(projectRoot, 'proxy.conf.json');\n\n    if (existsSync(proxyConfigPath)) {\n      return proxyConfigPath;\n    }\n  }\n}\n\n/**\n * Builds the options for the vite dev server.\n */\nexport async function getViteServerOptions(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): Promise<ServerOptions> {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { searchForWorkspaceRoot } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  const serverOptions: ServerOptions = {\n    fs: {\n      allow: [\n        searchForWorkspaceRoot(joinPathFragments(projectRoot)),\n        joinPathFragments(context.root, 'node_modules/vite'),\n      ],\n    },\n  };\n\n  const proxyConfigPath = getViteServerProxyConfigPath(\n    options.proxyConfig,\n    context\n  );\n  if (proxyConfigPath) {\n    logger.info(`Loading proxy configuration from: ${proxyConfigPath}`);\n    serverOptions.proxy = require(proxyConfigPath);\n  }\n\n  return serverOptions;\n}\n\nexport function getProxyConfig(\n  context: ExecutorContext,\n  proxyConfig?: string\n): Record<string, string | ProxyOptions> | undefined {\n  const proxyConfigPath = getViteServerProxyConfigPath(proxyConfig, context);\n  if (proxyConfigPath) {\n    logger.info(`Loading proxy configuration from: ${proxyConfigPath}`);\n    return require(proxyConfigPath);\n  }\n  return;\n}\n\nexport function getNxTargetOptions(target: string, context: ExecutorContext) {\n  const targetObj = parseTargetString(target, context);\n  return readTargetOptions(targetObj, context);\n}\n"],"names":["normalizeViteConfigFilePath","getProjectTsConfigPath","getViteServerProxyConfigPath","getViteServerOptions","getProxyConfig","getNxTargetOptions","contextRoot","projectRoot","configFile","normalized","joinPathFragments","existsSync","Error","allowsExt","ext","undefined","nxProxyConfig","context","projectsConfigurations","projects","projectName","root","proxyConfigPath","options","searchForWorkspaceRoot","Function","serverOptions","fs","allow","proxyConfig","logger","info","proxy","require","target","targetObj","parseTargetString","readTargetOptions"],"mappings":";;;;;;;;IAcgBA,2BAA2B;eAA3BA;;IAsCAC,sBAAsB;eAAtBA;;IAeAC,4BAA4B;eAA5BA;;IAqBMC,oBAAoB;eAApBA;;IA+BNC,cAAc;eAAdA;;IAYAC,kBAAkB;eAAlBA;;;wBA7HT;oBACoB;AAOpB,SAASL,4BACdM,WAAmB,EACnBC,WAAmB,EACnBC,UAAmB;IAEnB,IAAIA,YAAY;QACd,MAAMC,aAAaC,IAAAA,yBAAiB,EAACF;QACrC,IAAI,CAACG,IAAAA,cAAU,EAACF,aAAa;YAC3B,MAAM,IAAIG,MACR,CAAC,6CAA6C,EAAEH,WAAW,EAAE,CAAC;QAElE;QACA,OAAOA;IACT;IAEA,MAAMI,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IACEF,IAAAA,cAAU,EACRD,IAAAA,yBAAiB,EAACJ,aAAaC,aAAa,CAAC,YAAY,EAAEO,IAAI,CAAC,IAElE;YACA,OAAOJ,IAAAA,yBAAiB,EAACJ,aAAaC,aAAa,CAAC,YAAY,EAAEO,IAAI,CAAC;QACzE,OAAO,IACLH,IAAAA,cAAU,EACRD,IAAAA,yBAAiB,EAACJ,aAAaC,aAAa,CAAC,cAAc,EAAEO,IAAI,CAAC,IAEpE;YACA,OAAOJ,IAAAA,yBAAiB,EACtBJ,aACAC,aACA,CAAC,cAAc,EAAEO,IAAI,CAAC;QAE1B;IACF;AACF;AAEO,SAASb,uBACdM,WAAmB;IAEnB,OAAOI,IAAAA,cAAU,EAACD,IAAAA,yBAAiB,EAACH,aAAa,wBAC7CG,IAAAA,yBAAiB,EAACH,aAAa,uBAC/BI,IAAAA,cAAU,EAACD,IAAAA,yBAAiB,EAACH,aAAa,wBAC1CG,IAAAA,yBAAiB,EAACH,aAAa,uBAC/BI,IAAAA,cAAU,EAACD,IAAAA,yBAAiB,EAACH,aAAa,oBAC1CG,IAAAA,yBAAiB,EAACH,aAAa,mBAC/BQ;AACN;AAKO,SAASb,6BACdc,aAAiC,EACjCC,OAAwB;IAExB,IAAID,eAAe;QACjB,MAAMT,cACJU,QAAQC,sBAAsB,CAACC,QAAQ,CAACF,QAAQG,WAAW,CAAC,CAACC,IAAI;QAEnE,MAAMC,kBAAkBN,gBACpBN,IAAAA,yBAAiB,EAACO,QAAQI,IAAI,EAAEL,iBAChCN,IAAAA,yBAAiB,EAACH,aAAa;QAEnC,IAAII,IAAAA,cAAU,EAACW,kBAAkB;YAC/B,OAAOA;QACT;IACF;AACF;AAKO,eAAenB,qBACpBoB,OAAqC,EACrCN,OAAwB;IAExB,yFAAyF;IACzF,MAAM,EAAEO,sBAAsB,EAAE,GAAG,MAAOC,SACxC;IAEF,MAAMlB,cACJU,QAAQC,sBAAsB,CAACC,QAAQ,CAACF,QAAQG,WAAW,CAAC,CAACC,IAAI;IACnE,MAAMK,gBAA+B;QACnCC,IAAI;YACFC,OAAO;gBACLJ,uBAAuBd,IAAAA,yBAAiB,EAACH;gBACzCG,IAAAA,yBAAiB,EAACO,QAAQI,IAAI,EAAE;aACjC;QACH;IACF;IAEA,MAAMC,kBAAkBpB,6BACtBqB,QAAQM,WAAW,EACnBZ;IAEF,IAAIK,iBAAiB;QACnBQ,cAAM,CAACC,IAAI,CAAC,CAAC,kCAAkC,EAAET,gBAAgB,CAAC;QAClEI,cAAcM,KAAK,GAAGC,QAAQX;IAChC;IAEA,OAAOI;AACT;AAEO,SAAStB,eACda,OAAwB,EACxBY,WAAoB;IAEpB,MAAMP,kBAAkBpB,6BAA6B2B,aAAaZ;IAClE,IAAIK,iBAAiB;QACnBQ,cAAM,CAACC,IAAI,CAAC,CAAC,kCAAkC,EAAET,gBAAgB,CAAC;QAClE,OAAOW,QAAQX;IACjB;IACA;AACF;AAEO,SAASjB,mBAAmB6B,MAAc,EAAEjB,OAAwB;IACzE,MAAMkB,YAAYC,IAAAA,yBAAiB,EAACF,QAAQjB;IAC5C,OAAOoB,IAAAA,yBAAiB,EAACF,WAAWlB;AACtC"}
+{"version":3,"sources":["../../../../../packages/vite/src/utils/options-utils.ts"],"sourcesContent":["import {\n  ExecutorContext,\n  joinPathFragments,\n  logger,\n  parseTargetString,\n  readTargetOptions,\n} from '@nx/devkit';\nimport { existsSync } from 'fs';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\n\n/**\n * Returns the path to the vite config file or undefined when not found.\n */\nexport function normalizeViteConfigFilePath(\n  contextRoot: string,\n  projectRoot: string,\n  configFile?: string\n): string | undefined {\n  if (configFile) {\n    const normalized = joinPathFragments(configFile);\n    if (!existsSync(normalized)) {\n      throw new Error(\n        `Could not find vite config at provided path \"${normalized}\".`\n      );\n    }\n    return normalized;\n  }\n\n  const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];\n\n  for (const ext of allowsExt) {\n    if (\n      existsSync(\n        joinPathFragments(contextRoot, projectRoot, `vite.config.${ext}`)\n      )\n    ) {\n      return joinPathFragments(contextRoot, projectRoot, `vite.config.${ext}`);\n    } else if (\n      existsSync(\n        joinPathFragments(contextRoot, projectRoot, `vitest.config.${ext}`)\n      )\n    ) {\n      return joinPathFragments(\n        contextRoot,\n        projectRoot,\n        `vitest.config.${ext}`\n      );\n    }\n  }\n}\n\nexport function getProjectTsConfigPath(\n  projectRoot: string\n): string | undefined {\n  return existsSync(joinPathFragments(projectRoot, 'tsconfig.app.json'))\n    ? joinPathFragments(projectRoot, 'tsconfig.app.json')\n    : existsSync(joinPathFragments(projectRoot, 'tsconfig.lib.json'))\n    ? joinPathFragments(projectRoot, 'tsconfig.lib.json')\n    : existsSync(joinPathFragments(projectRoot, 'tsconfig.json'))\n    ? joinPathFragments(projectRoot, 'tsconfig.json')\n    : undefined;\n}\n\n/**\n * Returns the path to the proxy configuration file or undefined when not found.\n */\nexport function getViteServerProxyConfigPath(\n  nxProxyConfig: string | undefined,\n  context: ExecutorContext\n): string | undefined {\n  if (nxProxyConfig) {\n    const projectRoot =\n      context.projectsConfigurations.projects[context.projectName].root;\n\n    const proxyConfigPath = nxProxyConfig\n      ? joinPathFragments(context.root, nxProxyConfig)\n      : joinPathFragments(projectRoot, 'proxy.conf.json');\n\n    if (existsSync(proxyConfigPath)) {\n      return proxyConfigPath;\n    }\n  }\n}\n\n/**\n * Builds the options for the vite dev server.\n */\nexport async function getViteServerOptions(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): Promise<Record<string, unknown>> {\n  // returns vite ServerOptions\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { searchForWorkspaceRoot } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n  const serverOptions: Record<string, unknown> = {\n    fs: {\n      allow: [\n        searchForWorkspaceRoot(joinPathFragments(projectRoot)),\n        joinPathFragments(context.root, 'node_modules/vite'),\n      ],\n    },\n  };\n\n  const proxyConfigPath = getViteServerProxyConfigPath(\n    options.proxyConfig,\n    context\n  );\n  if (proxyConfigPath) {\n    logger.info(`Loading proxy configuration from: ${proxyConfigPath}`);\n    serverOptions.proxy = require(proxyConfigPath);\n  }\n\n  return serverOptions;\n}\n\nexport function getProxyConfig(\n  context: ExecutorContext,\n  proxyConfig?: string\n): Record<string, string | unknown> | undefined {\n  const proxyConfigPath = getViteServerProxyConfigPath(proxyConfig, context);\n  if (proxyConfigPath) {\n    logger.info(`Loading proxy configuration from: ${proxyConfigPath}`);\n    return require(proxyConfigPath);\n  }\n  return;\n}\n\nexport function getNxTargetOptions(target: string, context: ExecutorContext) {\n  const targetObj = parseTargetString(target, context);\n  return readTargetOptions(targetObj, context);\n}\n"],"names":["normalizeViteConfigFilePath","getProjectTsConfigPath","getViteServerProxyConfigPath","getViteServerOptions","getProxyConfig","getNxTargetOptions","contextRoot","projectRoot","configFile","normalized","joinPathFragments","existsSync","Error","allowsExt","ext","undefined","nxProxyConfig","context","projectsConfigurations","projects","projectName","root","proxyConfigPath","options","searchForWorkspaceRoot","Function","serverOptions","fs","allow","proxyConfig","logger","info","proxy","require","target","targetObj","parseTargetString","readTargetOptions"],"mappings":"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"}

package/src/migrations/update-17-3-0/lib/fix-coverage.js

@@ -1,109 +0,0 @@
-"use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    fixCoverage: function() {
-        return fixCoverage;
-    },
-    getConfigNode: function() {
-        return getConfigNode;
-    }
-});
-const _devkit = require("@nx/devkit");
-const _tsquery = require("@phenomnomnominal/tsquery");
-const ts = require("typescript");
-function fixCoverage(configContents) {
-    var _tsquery_query, _tsquery_query1, _tsquery_query2, _tsquery_query3, _tsquery_query4, _tsquery_query5;
-    const configNode = getConfigNode(configContents);
-    if (!configNode) {
-        return;
-    }
-    const testHasCoverage = (_tsquery_query = _tsquery.tsquery.query(configNode, `PropertyAssignment:has(Identifier[name="test"]):has(PropertyAssignment:has(Identifier[name="coverage"]))`)) == null ? void 0 : _tsquery_query[0];
-    let changes = [];
-    if (!testHasCoverage) {
-        return;
-    }
-    const testObjectLiteralExpressionNode = (_tsquery_query1 = _tsquery.tsquery.query(testHasCoverage, `ObjectLiteralExpression:has(Identifier[name="coverage"])`)) == null ? void 0 : _tsquery_query1[0];
-    const coverageNode = findCoverageNode(testObjectLiteralExpressionNode);
-    console.log('coverage node', coverageNode == null ? void 0 : coverageNode.getText());
-    console.log('coverage node getStart', coverageNode == null ? void 0 : coverageNode.getStart());
-    if (!coverageNode) {
-        return;
-    }
-    const linesNode = (_tsquery_query2 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="lines"])`)) == null ? void 0 : _tsquery_query2[0];
-    const statementsNode = (_tsquery_query3 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="statements"])`)) == null ? void 0 : _tsquery_query3[0];
-    const functionsNode = (_tsquery_query4 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="functions"])`)) == null ? void 0 : _tsquery_query4[0];
-    const branchesNode = (_tsquery_query5 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="branches"])`)) == null ? void 0 : _tsquery_query5[0];
-    if (linesNode) {
-        changes.push({
-            type: _devkit.ChangeType.Delete,
-            start: linesNode.getStart(),
-            length: linesNode.getWidth() + 1
-        });
-    }
-    if (statementsNode) {
-        changes.push({
-            type: _devkit.ChangeType.Delete,
-            start: statementsNode.getStart(),
-            length: statementsNode.getWidth() + 1
-        });
-    }
-    if (functionsNode) {
-        changes.push({
-            type: _devkit.ChangeType.Delete,
-            start: functionsNode.getStart(),
-            length: functionsNode.getWidth() + 1
-        });
-    }
-    if (branchesNode) {
-        changes.push({
-            type: _devkit.ChangeType.Delete,
-            start: branchesNode.getStart(),
-            length: branchesNode.getWidth() + 1
-        });
-    }
-    if (branchesNode || functionsNode || statementsNode || linesNode) {
-        changes.push({
-            type: _devkit.ChangeType.Insert,
-            index: coverageNode.getStart() + 1,
-            text: `thresholds: {
-        ${linesNode ? linesNode.getText() + ',' : ''}
-        ${statementsNode ? statementsNode.getText() + ',' : ''}
-        ${functionsNode ? functionsNode.getText() + ',' : ''}
-        ${branchesNode ? branchesNode.getText() + ',' : ''}
-      },`
-        });
-    }
-    if (changes.length > 0) {
-        return (0, _devkit.applyChangesToString)(configContents, changes);
-    } else {
-        return;
-    }
-}
-function getConfigNode(configFileContents) {
-    var _tsquery_query, _tsquery_query1;
-    if (!configFileContents) {
-        return;
-    }
-    let configNode = (_tsquery_query = _tsquery.tsquery.query(configFileContents, `ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query[0];
-    const arrowFunctionReturnStatement = (_tsquery_query1 = _tsquery.tsquery.query(configFileContents, `ArrowFunction Block ReturnStatement ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query1[0];
-    if (arrowFunctionReturnStatement) {
-        configNode = arrowFunctionReturnStatement;
-    }
-    return configNode;
-}
-function findCoverageNode(testNode) {
-    let coverageNode;
-    testNode.forEachChild((child)=>{
-        if (ts.isPropertyAssignment(child) && child.name.getText() === 'coverage') {
-            coverageNode = child.initializer;
-        }
-    });
-    return coverageNode;
-}
-
-//# sourceMappingURL=fix-coverage.js.map

package/src/migrations/update-17-3-0/lib/fix-coverage.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-3-0/lib/fix-coverage.ts"],"sourcesContent":["import { ChangeType, applyChangesToString } from '@nx/devkit';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\n\nexport function fixCoverage(configContents: string): string | undefined {\n  const configNode = getConfigNode(configContents);\n  if (!configNode) {\n    return;\n  }\n\n  const testHasCoverage = tsquery.query(\n    configNode,\n    `PropertyAssignment:has(Identifier[name=\"test\"]):has(PropertyAssignment:has(Identifier[name=\"coverage\"]))`\n  )?.[0];\n  let changes = [];\n\n  if (!testHasCoverage) {\n    return;\n  }\n  const testObjectLiteralExpressionNode = tsquery.query(\n    testHasCoverage,\n    `ObjectLiteralExpression:has(Identifier[name=\"coverage\"])`\n  )?.[0];\n  const coverageNode = findCoverageNode(testObjectLiteralExpressionNode);\n  console.log('coverage node', coverageNode?.getText());\n  console.log('coverage node getStart', coverageNode?.getStart());\n\n  if (!coverageNode) {\n    return;\n  }\n\n  const linesNode = tsquery.query(\n    coverageNode,\n    `PropertyAssignment:has(Identifier[name=\"lines\"])`\n  )?.[0];\n\n  const statementsNode = tsquery.query(\n    coverageNode,\n    `PropertyAssignment:has(Identifier[name=\"statements\"])`\n  )?.[0];\n\n  const functionsNode = tsquery.query(\n    coverageNode,\n    `PropertyAssignment:has(Identifier[name=\"functions\"])`\n  )?.[0];\n\n  const branchesNode = tsquery.query(\n    coverageNode,\n    `PropertyAssignment:has(Identifier[name=\"branches\"])`\n  )?.[0];\n\n  if (linesNode) {\n    changes.push({\n      type: ChangeType.Delete,\n      start: linesNode.getStart(),\n      length: linesNode.getWidth() + 1,\n    });\n  }\n  if (statementsNode) {\n    changes.push({\n      type: ChangeType.Delete,\n      start: statementsNode.getStart(),\n      length: statementsNode.getWidth() + 1,\n    });\n  }\n\n  if (functionsNode) {\n    changes.push({\n      type: ChangeType.Delete,\n      start: functionsNode.getStart(),\n      length: functionsNode.getWidth() + 1,\n    });\n  }\n\n  if (branchesNode) {\n    changes.push({\n      type: ChangeType.Delete,\n      start: branchesNode.getStart(),\n      length: branchesNode.getWidth() + 1,\n    });\n  }\n\n  if (branchesNode || functionsNode || statementsNode || linesNode) {\n    changes.push({\n      type: ChangeType.Insert,\n      index: coverageNode.getStart() + 1,\n      text: `thresholds: {\n        ${linesNode ? linesNode.getText() + ',' : ''}\n        ${statementsNode ? statementsNode.getText() + ',' : ''}\n        ${functionsNode ? functionsNode.getText() + ',' : ''}\n        ${branchesNode ? branchesNode.getText() + ',' : ''}\n      },`,\n    });\n  }\n\n  if (changes.length > 0) {\n    return applyChangesToString(configContents, changes);\n  } else {\n    return;\n  }\n}\n\nexport function getConfigNode(configFileContents: string): ts.Node | undefined {\n  if (!configFileContents) {\n    return;\n  }\n  let configNode = tsquery.query(\n    configFileContents,\n    `ObjectLiteralExpression`\n  )?.[0];\n\n  const arrowFunctionReturnStatement = tsquery.query(\n    configFileContents,\n    `ArrowFunction Block ReturnStatement ObjectLiteralExpression`\n  )?.[0];\n\n  if (arrowFunctionReturnStatement) {\n    configNode = arrowFunctionReturnStatement;\n  }\n\n  return configNode;\n}\n\nfunction findCoverageNode(testNode: ts.Node) {\n  let coverageNode: ts.Node | undefined;\n  testNode.forEachChild((child) => {\n    if (ts.isPropertyAssignment(child) && child.name.getText() === 'coverage') {\n      coverageNode = child.initializer;\n    }\n  });\n  return coverageNode;\n}\n"],"names":["fixCoverage","getConfigNode","ts","configContents","tsquery","configNode","testHasCoverage","query","changes","testObjectLiteralExpressionNode","coverageNode","findCoverageNode","console","log","getText","getStart","linesNode","statementsNode","functionsNode","branchesNode","push","type","ChangeType","Delete","start","length","getWidth","Insert","index","text","applyChangesToString","configFileContents","arrowFunctionReturnStatement","testNode","forEachChild","child","isPropertyAssignment","name","initializer"],"mappings":"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"}

package/src/migrations/update-17-3-0/vitest-coverage-threshold.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-3-0/vitest-coverage-threshold.ts"],"sourcesContent":["import {\n  ProjectConfiguration,\n  Tree,\n  formatFiles,\n  getProjects,\n  joinPathFragments,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { fixCoverage } from './lib/fix-coverage';\n\nexport default async function fixCoverageThreshold(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions(tree, '@nx/vite:test', (_options, projectName) => {\n    const projectConfig: ProjectConfiguration = projects.get(\n      projectName\n    ) as ProjectConfiguration;\n    const configPath = findViteConfig(tree, projectConfig.root);\n    if (!configPath || !tree.exists(configPath)) {\n      return;\n    }\n    const configContents = tree.read(configPath, 'utf-8') as string;\n\n    const updatedConfigContents = fixCoverage(configContents);\n\n    if (updatedConfigContents) {\n      tree.write(configPath, updatedConfigContents);\n    }\n  });\n\n  await formatFiles(tree);\n}\n\nfunction findViteConfig(tree: Tree, searchRoot: string) {\n  const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];\n\n  for (const ext of allowsExt) {\n    if (tree.exists(joinPathFragments(searchRoot, `vite.config.${ext}`))) {\n      return joinPathFragments(searchRoot, `vite.config.${ext}`);\n    } else if (\n      tree.exists(joinPathFragments(searchRoot, `vitest.config.${ext}`))\n    ) {\n      return joinPathFragments(searchRoot, `vitest.config.${ext}`);\n    }\n  }\n}\n"],"names":["fixCoverageThreshold","tree","projects","getProjects","forEachExecutorOptions","_options","projectName","projectConfig","get","configPath","findViteConfig","root","exists","configContents","read","updatedConfigContents","fixCoverage","write","formatFiles","searchRoot","allowsExt","ext","joinPathFragments"],"mappings":";+BAUA;;;eAA8BA;;;wBAJvB;sCACgC;6BACX;AAEb,eAAeA,qBAAqBC,IAAU;IAC3D,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EAACH,MAAM,iBAAiB,CAACI,UAAUC;QACvD,MAAMC,gBAAsCL,SAASM,GAAG,CACtDF;QAEF,MAAMG,aAAaC,eAAeT,MAAMM,cAAcI,IAAI;QAC1D,IAAI,CAACF,cAAc,CAACR,KAAKW,MAAM,CAACH,aAAa;YAC3C;QACF;QACA,MAAMI,iBAAiBZ,KAAKa,IAAI,CAACL,YAAY;QAE7C,MAAMM,wBAAwBC,IAAAA,wBAAW,EAACH;QAE1C,IAAIE,uBAAuB;YACzBd,KAAKgB,KAAK,CAACR,YAAYM;QACzB;IACF;IAEA,MAAMG,IAAAA,mBAAW,EAACjB;AACpB;AAEA,SAASS,eAAeT,IAAU,EAAEkB,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAInB,KAAKW,MAAM,CAACU,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D,OAAO,IACLpB,KAAKW,MAAM,CAACU,IAAAA,yBAAiB,EAACH,YAAY,CAAC,cAAc,EAAEE,IAAI,CAAC,IAChE;YACA,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,cAAc,EAAEE,IAAI,CAAC;QAC7D;IACF;AACF"}