@nx/vite 17.2.0-beta.1 → 17.2.0-beta.10

package/migrations.json

@@ -40,25 +40,45 @@
       "version": "17.1.0-beta.2",
       "description": "Move target defaults",
       "implementation": "./src/migrations/update-17-1-0/move-target-defaults"
+    },
+    "update-vite-config": {
+      "version": "17.2.0-beta.10",
+      "description": "Update vite config.",
+      "implementation": "./src/migrations/update-17-2-0/update-vite-config"
     }
   },
   "packageJsonUpdates": {
     "17.2.0": {
-      "vitest": {
-        "version": "~0.34.6",
-        "alwaysAddToPackageJson": false
-      },
-      "@vitest/coverage-v8": {
-        "version": "~0.34.6",
-        "alwaysAddToPackageJson": false
-      },
-      "@vitest/ui": {
-        "version": "~0.34.6",
-        "alwaysAddToPackageJson": false
-      },
-      "@vitest/coverage-istanbul": {
-        "version": "~0.34.6",
-        "alwaysAddToPackageJson": false
+      "version": "17.2.0-beta.2",
+      "packages": {
+        "vite": {
+          "version": "^5.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitejs/plugin-react": {
+          "version": "^4.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitejs/plugin-react-swc": {
+          "version": "^3.5.0",
+          "alwaysAddToPackageJson": false
+        },
+        "vitest": {
+          "version": "~0.34.6",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitest/coverage-v8": {
+          "version": "~0.34.6",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitest/ui": {
+          "version": "~0.34.6",
+          "alwaysAddToPackageJson": false
+        },
+        "@vitest/coverage-istanbul": {
+          "version": "~0.34.6",
+          "alwaysAddToPackageJson": false
+        }
       }
     },
     "16.4.0-beta.7": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "17.2.0-beta.1",
+  "version": "17.2.0-beta.10",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -32,14 +32,14 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@swc/helpers": "~0.5.0",
     "enquirer": "~2.3.6",
-    "@nx/devkit": "17.2.0-beta.1",
-    "@nx/js": "17.2.0-beta.1",
+    "@nx/devkit": "17.2.0-beta.10",
+    "@nx/js": "17.2.0-beta.10",
     "tsconfig-paths": "^4.1.2",
-    "@nrwl/vite": "17.2.0-beta.1"
+    "@nrwl/vite": "17.2.0-beta.10"
   },
   "peerDependencies": {
-    "vite": "^4.3.4",
-    "vitest": ">=0.31.0 <1.0.0"
+    "vite": "^5.0.0",
+    "vitest": ">=0.34.6 <1.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -54,7 +54,8 @@
     "./src/executors/*/schema.json": "./src/executors/*/schema.json",
     "./src/executors/*.impl": "./src/executors/*.impl.js",
     "./src/executors/*/compat": "./src/executors/*/compat.js",
-    "./plugins/nx-tsconfig-paths.plugin": "./plugins/nx-tsconfig-paths.plugin.js"
+    "./plugins/nx-tsconfig-paths.plugin": "./plugins/nx-tsconfig-paths.plugin.js",
+    "./plugins/rollup-replace-files.plugin": "./plugins/rollup-replace-files.plugin.js"
   },
   "type": "commonjs"
 }

package/plugins/rollup-replace-files.plugin.d.ts

@@ -1,11 +1,11 @@
 /**
  * @function replaceFiles
  * @param {FileReplacement[]} replacements
- * @return {({name: "rollup-plugin-replace-files", enforce: "pre", Promise<resolveId>})}
+ * @return {({name: "rollup-plugin-replace-files", enforce: "pre" | "post" | undefined, Promise<resolveId>})}
  */
 export default function replaceFiles(replacements: FileReplacement[]): {
     name: string;
-    enforce: string;
+    enforce: 'pre' | 'post' | undefined;
     resolveId(source: any, importer: any, options: any): Promise<{
         id: string;
     }>;

package/plugins/rollup-replace-files.plugin.js

@@ -2,7 +2,7 @@
 /**
  * @function replaceFiles
  * @param {FileReplacement[]} replacements
- * @return {({name: "rollup-plugin-replace-files", enforce: "pre", Promise<resolveId>})}
+ * @return {({name: "rollup-plugin-replace-files", enforce: "pre" | "post" | undefined, Promise<resolveId>})}
  */ "use strict";
 Object.defineProperty(exports, "default", {
     enumerable: true,

package/plugins/rollup-replace-files.plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../packages/vite/plugins/rollup-replace-files.plugin.ts"],"sourcesContent":["// source: https://github.com/Myrmod/vitejs-theming/blob/master/build-plugins/rollup/replace-files.js\n\n/**\n * @function replaceFiles\n * @param {FileReplacement[]} replacements\n * @return {({name: \"rollup-plugin-replace-files\", enforce: \"pre\", Promise<resolveId>})}\n */\nexport default function replaceFiles(replacements: FileReplacement[]) {\n  if (!replacements?.length) {\n    return null;\n  }\n  return {\n    name: 'rollup-plugin-replace-files',\n    enforce: 'pre',\n    async resolveId(source, importer, options) {\n      const resolved = await this.resolve(source, importer, {\n        ...options,\n        skipSelf: true,\n      });\n      /**\n       * The reason we're using endsWith here is because the resolved id\n       * will be the absolute path to the file. We want to check if the\n       * file ends with the file we're trying to replace, which will be essentially\n       * the path from the root of our workspace.\n       */\n\n      const foundReplace = replacements.find((replacement) =>\n        resolved?.id?.endsWith(replacement.replace)\n      );\n      if (foundReplace) {\n        console.info(\n          `replace \"${foundReplace.replace}\" with \"${foundReplace.with}\"`\n        );\n        try {\n          // return new file content\n          return {\n            id: foundReplace.with,\n          };\n        } catch (err) {\n          console.error(err);\n          return null;\n        }\n      }\n      return null;\n    },\n  };\n}\n\nexport interface FileReplacement {\n  replace: string;\n  with: string;\n}\n"],"names":["replaceFiles","replacements","length","name","enforce","resolveId","source","importer","options","resolved","resolve","skipSelf","foundReplace","find","replacement","id","endsWith","replace","console","info","with","err","error"],"mappings":"AAAA,qGAAqG;AAErG;;;;CAIC;+BACD;;;eAAwBA;;;;AAAT,SAASA,aAAaC,YAA+B;IAClE,IAAI,EAACA,gCAAAA,aAAcC,MAAM,GAAE;QACzB,OAAO;IACT;IACA,OAAO;QACLC,MAAM;QACNC,SAAS;QACT,MAAMC,WAAUC,MAAM,EAAEC,QAAQ,EAAEC,OAAO;YACvC,MAAMC,WAAW,MAAM,IAAI,CAACC,OAAO,CAACJ,QAAQC,UAAU,eACjDC;gBACHG,UAAU;;YAEZ;;;;;OAKC,GAED,MAAMC,eAAeX,aAAaY,IAAI,CAAC,CAACC;oBACtCL;uBAAAA,6BAAAA,eAAAA,SAAUM,EAAE,qBAAZN,aAAcO,QAAQ,CAACF,YAAYG,OAAO;;YAE5C,IAAIL,cAAc;gBAChBM,QAAQC,IAAI,CACV,CAAC,SAAS,EAAEP,aAAaK,OAAO,CAAC,QAAQ,EAAEL,aAAaQ,IAAI,CAAC,CAAC,CAAC;gBAEjE,IAAI;oBACF,0BAA0B;oBAC1B,OAAO;wBACLL,IAAIH,aAAaQ,IAAI;oBACvB;gBACF,EAAE,OAAOC,KAAK;oBACZH,QAAQI,KAAK,CAACD;oBACd,OAAO;gBACT;YACF;YACA,OAAO;QACT;IACF;AACF"}
+{"version":3,"sources":["../../../../packages/vite/plugins/rollup-replace-files.plugin.ts"],"sourcesContent":["// source: https://github.com/Myrmod/vitejs-theming/blob/master/build-plugins/rollup/replace-files.js\n\n/**\n * @function replaceFiles\n * @param {FileReplacement[]} replacements\n * @return {({name: \"rollup-plugin-replace-files\", enforce: \"pre\" | \"post\" | undefined, Promise<resolveId>})}\n */\nexport default function replaceFiles(replacements: FileReplacement[]): {\n  name: string;\n  enforce: 'pre' | 'post' | undefined;\n  resolveId(\n    source: any,\n    importer: any,\n    options: any\n  ): Promise<{\n    id: string;\n  }>;\n} {\n  if (!replacements?.length) {\n    return null;\n  }\n  return {\n    name: 'rollup-plugin-replace-files',\n    enforce: 'pre',\n    async resolveId(source, importer, options) {\n      const resolved = await this.resolve(source, importer, {\n        ...options,\n        skipSelf: true,\n      });\n      /**\n       * The reason we're using endsWith here is because the resolved id\n       * will be the absolute path to the file. We want to check if the\n       * file ends with the file we're trying to replace, which will be essentially\n       * the path from the root of our workspace.\n       */\n\n      const foundReplace = replacements.find((replacement) =>\n        resolved?.id?.endsWith(replacement.replace)\n      );\n      if (foundReplace) {\n        console.info(\n          `replace \"${foundReplace.replace}\" with \"${foundReplace.with}\"`\n        );\n        try {\n          // return new file content\n          return {\n            id: foundReplace.with,\n          };\n        } catch (err) {\n          console.error(err);\n          return null;\n        }\n      }\n      return null;\n    },\n  };\n}\n\nexport interface FileReplacement {\n  replace: string;\n  with: string;\n}\n"],"names":["replaceFiles","replacements","length","name","enforce","resolveId","source","importer","options","resolved","resolve","skipSelf","foundReplace","find","replacement","id","endsWith","replace","console","info","with","err","error"],"mappings":"AAAA,qGAAqG;AAErG;;;;CAIC;+BACD;;;eAAwBA;;;;AAAT,SAASA,aAAaC,YAA+B;IAWlE,IAAI,EAACA,gCAAAA,aAAcC,MAAM,GAAE;QACzB,OAAO;IACT;IACA,OAAO;QACLC,MAAM;QACNC,SAAS;QACT,MAAMC,WAAUC,MAAM,EAAEC,QAAQ,EAAEC,OAAO;YACvC,MAAMC,WAAW,MAAM,IAAI,CAACC,OAAO,CAACJ,QAAQC,UAAU,eACjDC;gBACHG,UAAU;;YAEZ;;;;;OAKC,GAED,MAAMC,eAAeX,aAAaY,IAAI,CAAC,CAACC;oBACtCL;uBAAAA,6BAAAA,eAAAA,SAAUM,EAAE,qBAAZN,aAAcO,QAAQ,CAACF,YAAYG,OAAO;;YAE5C,IAAIL,cAAc;gBAChBM,QAAQC,IAAI,CACV,CAAC,SAAS,EAAEP,aAAaK,OAAO,CAAC,QAAQ,EAAEL,aAAaQ,IAAI,CAAC,CAAC,CAAC;gBAEjE,IAAI;oBACF,0BAA0B;oBAC1B,OAAO;wBACLL,IAAIH,aAAaQ,IAAI;oBACvB;gBACF,EAAE,OAAOC,KAAK;oBACZH,QAAQI,KAAK,CAACD;oBACd,OAAO;gBACT;YACF;YACA,OAAO;QACT;IACF;AACF"}

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

@@ -1,6 +1,6 @@
 import { ExecutorContext } from '@nx/devkit';
 import { ViteBuildExecutorOptions } from './schema';
-export declare function viteBuildExecutor(options: ViteBuildExecutorOptions, context: ExecutorContext): AsyncGenerator<{
+export declare function viteBuildExecutor(options: Record<string, any> & ViteBuildExecutorOptions, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
 } | {
     success: boolean;

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

@@ -22,14 +22,32 @@ const _path = require("path");
 const _asynciterable = require("@nx/devkit/src/utils/async-iterable");
 const _executorutils = require("../../utils/executor-utils");
 async function* viteBuildExecutor(options, context) {
+    var _resolved_config_build, _resolved_config;
     // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
-    const { mergeConfig, build } = await Function('return import("vite")')();
+    const { mergeConfig, build, loadConfigFromFile } = await Function('return import("vite")')();
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     (0, _executorutils.createBuildableTsConfig)(projectRoot, options, context);
-    const normalizedOptions = normalizeOptions(options);
-    const buildConfig = mergeConfig((0, _optionsutils.getViteSharedConfig)(normalizedOptions, false, context), {
-        build: (0, _optionsutils.getViteBuildOptions)(normalizedOptions, context)
-    });
+    const viteConfigPath = (0, _optionsutils.normalizeViteConfigFilePath)(context.root, projectRoot, options.configFile);
+    const root = projectRoot === '.' ? process.cwd() : (0, _path.relative)(context.cwd, (0, _devkit.joinPathFragments)(context.root, projectRoot));
+    const { buildOptions, otherOptions } = await getExtraArgs(options);
+    var _otherOptions_mode;
+    const resolved = await loadConfigFromFile({
+        mode: (_otherOptions_mode = otherOptions == null ? void 0 : otherOptions.mode) != null ? _otherOptions_mode : 'production',
+        command: 'build'
+    }, viteConfigPath);
+    var _joinPathFragments;
+    const outDir = (_joinPathFragments = (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(projectRoot), options.outputPath)) != null ? _joinPathFragments : 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 _resolved_config_root;
+    const buildConfig = 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
+        root: (_resolved_config_root = resolved.config.root) != null ? _resolved_config_root : root,
+        configFile: viteConfigPath
+    }, _extends._({
+        build: _extends._({
+            outDir
+        }, buildOptions)
+    }, otherOptions));
     if (!options.skipTypeCheck) {
         await (0, _executorutils.validateTypes)({
             workspaceRoot: context.root,
@@ -40,7 +58,10 @@ async function* viteBuildExecutor(options, context) {
     const watcherOrOutput = await build(buildConfig);
     const libraryPackageJson = (0, _path.resolve)(projectRoot, 'package.json');
     const rootPackageJson = (0, _path.resolve)(context.root, 'package.json');
-    const distPackageJson = (0, _path.resolve)(normalizedOptions.outputPath, 'package.json');
+    // Here, we want the outdir relative to the workspace root.
+    // So, we calculate the relative path from the workspace root to the outdir.
+    const outDirRelativeToWorkspaceRoot = outDir.replaceAll('../', '');
+    const distPackageJson = (0, _path.resolve)(outDirRelativeToWorkspaceRoot, 'package.json');
     // Generate a package.json if option has been set.
     if (options.generatePackageJson) {
         if (context.projectGraph.nodes[context.projectName].type !== 'app') {
@@ -53,15 +74,15 @@ async function* viteBuildExecutor(options, context) {
             isProduction: !options.includeDevDependenciesInPackageJson
         });
         builtPackageJson.type = 'module';
-        (0, _devkit.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
+        (0, _devkit.writeJsonFile)(`${outDirRelativeToWorkspaceRoot}/package.json`, builtPackageJson);
         const packageManager = (0, _devkit.detectPackageManager)(context.root);
         const lockFile = (0, _js.createLockFile)(builtPackageJson, context.projectGraph, packageManager);
-        (0, _fs.writeFileSync)(`${options.outputPath}/${(0, _js.getLockFileName)(packageManager)}`, lockFile, {
+        (0, _fs.writeFileSync)(`${outDirRelativeToWorkspaceRoot}/${(0, _js.getLockFileName)(packageManager)}`, lockFile, {
             encoding: 'utf-8'
         });
     } else if (!(0, _fs.existsSync)(distPackageJson) && (0, _fs.existsSync)(libraryPackageJson) && rootPackageJson !== libraryPackageJson) {
         await (0, _js.copyAssets)({
-            outputPath: normalizedOptions.outputPath,
+            outputPath: outDirRelativeToWorkspaceRoot,
             assets: [
                 {
                     input: projectRoot,
@@ -96,22 +117,63 @@ async function* viteBuildExecutor(options, context) {
         var _watcherOrOutput_, _output_;
         const output = (watcherOrOutput == null ? void 0 : watcherOrOutput['output']) || (watcherOrOutput == null ? void 0 : (_watcherOrOutput_ = watcherOrOutput[0]) == null ? void 0 : _watcherOrOutput_.output);
         const fileName = (output == null ? void 0 : (_output_ = output[0]) == null ? void 0 : _output_.fileName) || 'main.cjs';
-        const outfile = (0, _path.resolve)(normalizedOptions.outputPath, fileName);
+        const outfile = (0, _path.resolve)(outDirRelativeToWorkspaceRoot, fileName);
         yield {
             success: true,
             outfile
         };
     }
 }
-function normalizeOptions(options) {
-    const normalizedOptions = _extends._({}, options);
-    // coerce watch to null or {} to match with Vite's watch config
-    if (options.watch === false) {
-        normalizedOptions.watch = null;
-    } else if (options.watch === true) {
-        normalizedOptions.watch = {};
+async function getExtraArgs(options) {
+    // support passing extra args to vite cli
+    const schema = await Promise.resolve().then(()=>require("./schema.json"));
+    const extraArgs = {};
+    for (const key of Object.keys(options)){
+        if (!schema.properties[key]) {
+            extraArgs[key] = options[key];
+        }
+    }
+    const buildOptions = {};
+    const buildSchemaKeys = [
+        'target',
+        'polyfillModulePreload',
+        'modulePreload',
+        'outDir',
+        'assetsDir',
+        'assetsInlineLimit',
+        'cssCodeSplit',
+        'cssTarget',
+        'cssMinify',
+        'sourcemap',
+        'minify',
+        'terserOptions',
+        'rollupOptions',
+        'commonjsOptions',
+        'dynamicImportVarsOptions',
+        'write',
+        'emptyOutDir',
+        'copyPublicDir',
+        'manifest',
+        'lib',
+        'ssr',
+        'ssrManifest',
+        'ssrEmitAssets',
+        'reportCompressedSize',
+        'chunkSizeWarningLimit',
+        'watch'
+    ];
+    const otherOptions = {};
+    for (const key of Object.keys(extraArgs)){
+        if (buildSchemaKeys.includes(key)) {
+            buildOptions[key] = extraArgs[key];
+        } else {
+            otherOptions[key] = extraArgs[key];
+        }
     }
-    return normalizedOptions;
+    return {
+        buildOptions,
+        otherOptions
+    };
 }
 const _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  logger,\n  stripIndents,\n  writeJsonFile,\n} from '@nx/devkit';\nimport {\n  getProjectTsConfigPath,\n  getViteBuildOptions,\n  getViteSharedConfig,\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 { 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: ViteBuildExecutorOptions,\n  context: ExecutorContext\n) {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { mergeConfig, build } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n\n  createBuildableTsConfig(projectRoot, options, context);\n\n  const normalizedOptions = normalizeOptions(options);\n\n  const buildConfig = mergeConfig(\n    getViteSharedConfig(normalizedOptions, false, context),\n    {\n      build: getViteBuildOptions(normalizedOptions, context),\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  const distPackageJson = resolve(normalizedOptions.outputPath, 'package.json');\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(`${options.outputPath}/package.json`, builtPackageJson);\n    const packageManager = detectPackageManager(context.root);\n\n    const lockFile = createLockFile(\n      builtPackageJson,\n      context.projectGraph,\n      packageManager\n    );\n    writeFileSync(\n      `${options.outputPath}/${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: normalizedOptions.outputPath,\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(normalizedOptions.outputPath, fileName);\n    yield { success: true, outfile };\n  }\n}\n\nfunction normalizeOptions(options: ViteBuildExecutorOptions) {\n  const normalizedOptions = { ...options };\n\n  // coerce watch to null or {} to match with Vite's watch config\n  if (options.watch === false) {\n    normalizedOptions.watch = null;\n  } else if (options.watch === true) {\n    normalizedOptions.watch = {};\n  }\n\n  return normalizedOptions;\n}\n\nexport default viteBuildExecutor;\n"],"names":["viteBuildExecutor","options","context","mergeConfig","build","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","normalizedOptions","normalizeOptions","buildConfig","getViteSharedConfig","getViteBuildOptions","skipTypeCheck","validateTypes","workspaceRoot","tsconfig","getProjectTsConfigPath","watcherOrOutput","libraryPackageJson","resolve","rootPackageJson","distPackageJson","outputPath","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","watch"],"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';\nimport { BuildOptions } from 'vite';\n\nexport async function* viteBuildExecutor(\n  options: Record<string, any> & ViteBuildExecutorOptions,\n  context: ExecutorContext\n) {\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 getExtraArgs(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\nasync function getExtraArgs(options: ViteBuildExecutorOptions): 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","options","context","resolved","mergeConfig","build","loadConfigFromFile","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","viteConfigPath","normalizeViteConfigFilePath","configFile","process","cwd","relative","joinPathFragments","buildOptions","otherOptions","getExtraArgs","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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"}

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

@@ -1,23 +1,11 @@
 import type { FileReplacement } from '../../plugins/rollup-replace-files.plugin';
 export interface ViteBuildExecutorOptions {
-  outputPath: string;
-  emptyOutDir?: boolean;
-  base?: string;
+  outputPath?: string;
+  skipTypeCheck?: boolean;
   configFile?: string;
   fileReplacements?: FileReplacement[];
-  force?: boolean;
-  sourcemap?: boolean | 'inline' | 'hidden';
-  minify?: boolean | 'esbuild' | 'terser';
-  manifest?: boolean | string;
-  ssrManifest?: boolean | string;
-  logLevel?: 'info' | 'warn' | 'error' | 'silent';
-  mode?: string;
-  ssr?: boolean | string;
-  watch?: object | boolean;
-  target?: string | string[];
+  watch?: boolean;
   generatePackageJson?: boolean;
   includeDevDependenciesInPackageJson?: boolean;
-  cssCodeSplit?: boolean;
   buildLibsFromSource?: boolean;
-  skipTypeCheck?: boolean;
 }

package/src/executors/build/schema.json

@@ -28,11 +28,6 @@
       "description": "Skip type-checking via TypeScript. Skipping type-checking speeds up the build but type errors are not caught.",
       "default": false
     },
-    "base": {
-      "type": "string",
-      "description": "Base public path when served in development or production.",
-      "alias": "baseHref"
-    },
     "configFile": {
       "type": "string",
       "description": "The name of the Vite.js configuration file.",
@@ -61,87 +56,6 @@
       },
       "default": []
     },
-    "emptyOutDir": {
-      "description": "When set to false, outputPath will not be emptied during the build process.",
-      "type": "boolean",
-      "default": true
-    },
-    "sourcemap": {
-      "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "target": {
-      "description": "Browser compatibility target for the final bundle. For more info: https://vitejs.dev/config/build-options.html#build-target",
-      "type": "string"
-    },
-    "minify": {
-      "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "manifest": {
-      "description": "Output sourcemaps. Use 'hidden' for use with error reporting tools without generating sourcemap comment.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "ssrManifest": {
-      "description": "When set to true, the build will also generate an SSR manifest for determining style links and asset preload directives in production. When the value is a string, it will be used as the manifest file name.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "ssr": {
-      "description": "Produce SSR-oriented build. The value can be a string to directly specify the SSR entry, or true, which requires specifying the SSR entry via rollupOptions.input.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "logLevel": {
-      "type": "string",
-      "description": "Adjust console output verbosity.",
-      "enum": ["info", "warn", "error", "silent"]
-    },
-    "mode": {
-      "type": "string",
-      "description": "Mode to run the build in."
-    },
-    "force": {
-      "description": "Force the optimizer to ignore the cache and re-bundle",
-      "type": "boolean"
-    },
-    "cssCodeSplit": {
-      "description": "Enable/disable CSS code splitting. When enabled, CSS imported in async chunks will be inlined into the async chunk itself and inserted when the chunk is loaded.",
-      "type": "boolean"
-    },
     "watch": {
       "description": "Enable re-building when files change.",
       "oneOf": [

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

@@ -14,23 +14,35 @@ _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");
 async function* viteDevServerExecutor(options, context) {
     // 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 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);
-    // Merge the options from the build and dev-serve targets.
-    // The latter takes precedence.
-    const mergedOptions = _extends._({}, buildTargetOptions, options);
-    // Add the server specific configuration.
-    const serverConfig = mergeConfig((0, _optionsutils.getViteSharedConfig)(mergedOptions, options.clearScreen, context), {
-        build: (0, _optionsutils.getViteBuildOptions)(mergedOptions, context),
-        server: await (0, _optionsutils.getViteServerOptions)(mergedOptions, context)
-    });
+    const viteConfigPath = (0, _optionsutils.normalizeViteConfigFilePath)(context.root, projectRoot, buildTargetOptions.configFile);
+    const extraArgs = await getExtraArgs(options);
+    var _extraArgs_mode;
+    const resolved = await (0, _vite.loadConfigFromFile)({
+        mode: (_extraArgs_mode = extraArgs == null ? void 0 : extraArgs.mode) != null ? _extraArgs_mode : 'production',
+        command: 'build'
+    }, viteConfigPath);
+    var _resolved_config_root;
+    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
+        root: (_resolved_config_root = resolved.config.root) != null ? _resolved_config_root : root,
+        configFile: viteConfigPath
+    }, _extends._({
+        server: _extends._({}, await (0, _optionsutils.getViteServerOptions)(options, context), extraArgs)
+    }, extraArgs));
     try {
         const server = await createServer(serverConfig);
         await runViteDevServer(server);
@@ -67,5 +79,16 @@ async function runViteDevServer(server) {
     process.once('exit', processOnExit);
 }
 const _default = viteDevServerExecutor;
+async function getExtraArgs(options) {
+    // support passing extra args to vite cli
+    const schema = await Promise.resolve().then(()=>require("./schema.json"));
+    const extraArgs = {};
+    for (const key of Object.keys(options)){
+        if (!schema.properties[key]) {
+            extraArgs[key] = options[key];
+        }
+    }
+    return extraArgs;
+}
 
 //# sourceMappingURL=dev-server.impl.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import { ExecutorContext } from '@nx/devkit';\nimport type { InlineConfig, ViteDevServer } from 'vite';\n\nimport {\n  getNxTargetOptions,\n  getViteBuildOptions,\n  getViteServerOptions,\n  getViteSharedConfig,\n} from '../../utils/options-utils';\n\nimport { ViteDevServerExecutorOptions } from './schema';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { createBuildableTsConfig } from '../../utils/executor-utils';\n\nexport async function* viteDevServerExecutor(\n  options: ViteDevServerExecutorOptions,\n  context: ExecutorContext\n): AsyncGenerator<{ success: boolean; baseUrl: string }> {\n  // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.\n  const { mergeConfig, createServer } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\n  const projectRoot =\n    context.projectsConfigurations.projects[context.projectName].root;\n\n  createBuildableTsConfig(projectRoot, options, context);\n\n  // Retrieve the option for the configured buildTarget.\n  const buildTargetOptions: ViteBuildExecutorOptions = getNxTargetOptions(\n    options.buildTarget,\n    context\n  );\n\n  // Merge the options from the build and dev-serve targets.\n  // The latter takes precedence.\n  const mergedOptions = {\n    ...buildTargetOptions,\n    ...options,\n  };\n\n  // Add the server specific configuration.\n  const serverConfig: InlineConfig = mergeConfig(\n    getViteSharedConfig(mergedOptions, options.clearScreen, context),\n    {\n      build: getViteBuildOptions(mergedOptions, context),\n      server: await getViteServerOptions(mergedOptions, context),\n    }\n  );\n\n  try {\n    const server = await createServer(serverConfig);\n    await runViteDevServer(server);\n    const resolvedUrls = [\n      ...server.resolvedUrls.local,\n      ...server.resolvedUrls.network,\n    ];\n\n    yield {\n      success: true,\n      baseUrl: resolvedUrls[0] ?? '',\n    };\n  } catch (e) {\n    console.error(e);\n    yield {\n      success: false,\n      baseUrl: '',\n    };\n  }\n\n  await new Promise<void>((resolve) => {\n    process.once('SIGINT', () => resolve());\n    process.once('SIGTERM', () => resolve());\n    process.once('exit', () => resolve());\n  });\n}\n\nasync function runViteDevServer(server: ViteDevServer): Promise<void> {\n  await server.listen();\n\n  server.printUrls();\n\n  const processOnExit = async () => {\n    await server.close();\n  };\n\n  process.once('SIGINT', processOnExit);\n  process.once('SIGTERM', processOnExit);\n  process.once('exit', processOnExit);\n}\n\nexport default viteDevServerExecutor;\n"],"names":["viteDevServerExecutor","options","context","mergeConfig","createServer","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","mergedOptions","serverConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","server","getViteServerOptions","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","resolve","process","once","listen","printUrls","processOnExit","close"],"mappings":";;;;;;;;IAcuBA,qBAAqB;eAArBA;;IA6EvB,OAAqC;eAArC;;;;8BAnFO;+BAIiC;AAEjC,gBAAgBA,sBACrBC,OAAqC,EACrCC,OAAwB;IAExB,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAEC,YAAY,EAAE,GAAG,MAAOC,SAC3C;IAGF,MAAMC,cACJJ,QAAQK,sBAAsB,CAACC,QAAQ,CAACN,QAAQO,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,sCAAuB,EAACL,aAAaL,SAASC;IAE9C,sDAAsD;IACtD,MAAMU,qBAA+CC,IAAAA,gCAAkB,EACrEZ,QAAQa,WAAW,EACnBZ;IAGF,0DAA0D;IAC1D,+BAA+B;IAC/B,MAAMa,gBAAgB,eACjBH,oBACAX;IAGL,yCAAyC;IACzC,MAAMe,eAA6Bb,YACjCc,IAAAA,iCAAmB,EAACF,eAAed,QAAQiB,WAAW,EAAEhB,UACxD;QACEiB,OAAOC,IAAAA,iCAAmB,EAACL,eAAeb;QAC1CmB,QAAQ,MAAMC,IAAAA,kCAAoB,EAACP,eAAeb;IACpD;IAGF,IAAI;QACF,MAAMmB,SAAS,MAAMjB,aAAaY;QAClC,MAAMO,iBAAiBF;QACvB,MAAMG,eAAe;eAChBH,OAAOG,YAAY,CAACC,KAAK;eACzBJ,OAAOG,YAAY,CAACE,OAAO;SAC/B;YAIUF;QAFX,MAAM;YACJG,SAAS;YACTC,SAASJ,CAAAA,iBAAAA,YAAY,CAAC,EAAE,YAAfA,iBAAmB;QAC9B;IACF,EAAE,OAAOK,GAAG;QACVC,QAAQC,KAAK,CAACF;QACd,MAAM;YACJF,SAAS;YACTC,SAAS;QACX;IACF;IAEA,MAAM,IAAII,QAAc,CAACC;QACvBC,QAAQC,IAAI,CAAC,UAAU,IAAMF;QAC7BC,QAAQC,IAAI,CAAC,WAAW,IAAMF;QAC9BC,QAAQC,IAAI,CAAC,QAAQ,IAAMF;IAC7B;AACF;AAEA,eAAeV,iBAAiBF,MAAqB;IACnD,MAAMA,OAAOe,MAAM;IAEnBf,OAAOgB,SAAS;IAEhB,MAAMC,gBAAgB;QACpB,MAAMjB,OAAOkB,KAAK;IACpB;IAEAL,QAAQC,IAAI,CAAC,UAAUG;IACvBJ,QAAQC,IAAI,CAAC,WAAWG;IACxBJ,QAAQC,IAAI,CAAC,QAAQG;AACvB;MAEA,WAAetC"}
+{"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} 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  // 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 extraArgs = await getExtraArgs(options);\n  const resolved = await loadConfigFromFile(\n    {\n      mode: extraArgs?.mode ?? 'production',\n      command: 'build',\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        ...extraArgs,\n      },\n      ...extraArgs,\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 getExtraArgs(\n  options: ViteDevServerExecutorOptions\n): Promise<InlineConfig> {\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  return extraArgs as InlineConfig;\n}\n"],"names":["viteDevServerExecutor","options","context","mergeConfig","createServer","Function","projectRoot","projectsConfigurations","projects","projectName","root","process","cwd","relative","joinPathFragments","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","viteConfigPath","normalizeViteConfigFilePath","configFile","extraArgs","getExtraArgs","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","key","Object","keys","properties"],"mappings":";;;;;;;;IAkBuBA,qBAAqB;eAArBA;;IA6FvB,OAAqC;eAArC;;;;wBA/GmD;sBAK5C;8BAMA;+BAIiC;sBACf;AAElB,gBAAgBA,sBACrBC,OAAqC,EACrCC,OAAwB;IAExB,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAEC,YAAY,EAAE,GAAG,MAAOC,SAC3C;IAGF,MAAMC,cACJJ,QAAQK,sBAAsB,CAACC,QAAQ,CAACN,QAAQO,WAAW,CAAC,CAACC,IAAI;IACnE,MAAMA,OACJJ,gBAAgB,MACZK,QAAQC,GAAG,KACXC,IAAAA,cAAQ,EAACX,QAAQU,GAAG,EAAEE,IAAAA,yBAAiB,EAACZ,QAAQQ,IAAI,EAAEJ;IAC5DS,IAAAA,sCAAuB,EAACT,aAAaL,SAASC;IAE9C,sDAAsD;IACtD,MAAMc,qBAA+CC,IAAAA,gCAAkB,EACrEhB,QAAQiB,WAAW,EACnBhB;IAEF,MAAMiB,iBAAiBC,IAAAA,yCAA2B,EAChDlB,QAAQQ,IAAI,EACZJ,aACAU,mBAAmBK,UAAU;IAE/B,MAAMC,YAAY,MAAMC,aAAatB;QAG3BqB;IAFV,MAAME,WAAW,MAAMC,IAAAA,wBAAkB,EACvC;QACEC,MAAMJ,CAAAA,kBAAAA,6BAAAA,UAAWI,IAAI,YAAfJ,kBAAmB;QACzBK,SAAS;IACX,GACAR;QAOQK;IAJV,MAAMI,eAA6BzB,YACjC;QACE,sEAAsE;QACtE,gEAAgE;QAChEO,MAAMc,CAAAA,wBAAAA,SAASK,MAAM,CAACnB,IAAI,YAApBc,wBAAwBd;QAC9BW,YAAYF;IACd,GACA;QACEW,QAAQ,eACF,MAAMC,IAAAA,kCAAoB,EAAC9B,SAASC,UACrCoB;OAEFA;IAIP,IAAI;QACF,MAAMQ,SAAS,MAAM1B,aAAawB;QAClC,MAAMI,iBAAiBF;QACvB,MAAMG,eAAe;eAChBH,OAAOG,YAAY,CAACC,KAAK;eACzBJ,OAAOG,YAAY,CAACE,OAAO;SAC/B;YAIUF;QAFX,MAAM;YACJG,SAAS;YACTC,SAASJ,CAAAA,iBAAAA,YAAY,CAAC,EAAE,YAAfA,iBAAmB;QAC9B;IACF,EAAE,OAAOK,GAAG;QACVC,QAAQC,KAAK,CAACF;QACd,MAAM;YACJF,SAAS;YACTC,SAAS;QACX;IACF;IAEA,MAAM,IAAII,QAAc,CAACC;QACvB/B,QAAQgC,IAAI,CAAC,UAAU,IAAMD;QAC7B/B,QAAQgC,IAAI,CAAC,WAAW,IAAMD;QAC9B/B,QAAQgC,IAAI,CAAC,QAAQ,IAAMD;IAC7B;AACF;AAEA,eAAeV,iBAAiBF,MAAqB;IACnD,MAAMA,OAAOc,MAAM;IAEnBd,OAAOe,SAAS;IAEhB,MAAMC,gBAAgB;QACpB,MAAMhB,OAAOiB,KAAK;IACpB;IAEApC,QAAQgC,IAAI,CAAC,UAAUG;IACvBnC,QAAQgC,IAAI,CAAC,WAAWG;IACxBnC,QAAQgC,IAAI,CAAC,QAAQG;AACvB;MAEA,WAAe9C;AAEf,eAAeuB,aACbtB,OAAqC;IAErC,yCAAyC;IACzC,MAAM+C,SAAS,MAAM,2BAAA,QAAO;IAC5B,MAAM1B,YAAY,CAAC;IACnB,KAAK,MAAM2B,OAAOC,OAAOC,IAAI,CAAClD,SAAU;QACtC,IAAI,CAAC+C,OAAOI,UAAU,CAACH,IAAI,EAAE;YAC3B3B,SAAS,CAAC2B,IAAI,GAAGhD,OAAO,CAACgD,IAAI;QAC/B;IACF;IAEA,OAAO3B;AACT"}

package/src/executors/dev-server/schema.d.ts

@@ -2,14 +2,4 @@ export interface ViteDevServerExecutorOptions {
   buildTarget: string;
   buildLibsFromSource?: boolean;
   proxyConfig?: string;
-  port?: number;
-  host?: string | boolean;
-  https?: boolean | Json;
-  hmr?: boolean;
-  open?: string | boolean;
-  cors?: boolean;
-  logLevel?: 'info' | 'warn' | 'error' | 'silent';
-  mode?: string;
-  clearScreen?: boolean;
-  force?: boolean;
 }