@nx/vite 17.0.3 → 17.0.5

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

@@ -1,23 +1,10 @@
-import type { FileReplacement } from '../../plugins/rollup-replace-files.plugin';
 export interface ViteBuildExecutorOptions {
-  outputPath: string;
-  emptyOutDir?: boolean;
-  base?: string;
+  outputPath?: string;
+  buildLibsFromSource?: boolean;
+  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;
+  tsConfig?: string;
 }

package/src/executors/build/schema.json

@@ -28,10 +28,11 @@
       "description": "Skip type-checking via TypeScript. Skipping type-checking speeds up the build but type errors are not caught.",
       "default": false
     },
-    "base": {
+    "tsConfig": {
       "type": "string",
-      "description": "Base public path when served in development or production.",
-      "alias": "baseHref"
+      "description": "The path to custom tsconfig file for type-checking when skipTypeCheck is false. Required when tsconfig file is not at the projectRoot level.",
+      "x-completion-type": "file",
+      "x-completion-glob": "tsconfig.*.json"
     },
     "configFile": {
       "type": "string",
@@ -39,109 +40,6 @@
       "x-completion-type": "file",
       "x-completion-glob": "vite.config.@(js|ts)"
     },
-    "fileReplacements": {
-      "description": "Replace files with other files in the build.",
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "replace": {
-            "type": "string",
-            "description": "The file to be replaced.",
-            "x-completion-type": "file"
-          },
-          "with": {
-            "type": "string",
-            "description": "The file to replace with.",
-            "x-completion-type": "file"
-          }
-        },
-        "additionalProperties": false,
-        "required": ["replace", "with"]
-      },
-      "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,39 @@ _export(exports, {
     }
 });
 const _extends = require("@swc/helpers/_/_extends");
+const _devkit = require("@nx/devkit");
 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 (0, _executorutils.loadViteDynamicImport)();
     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 { 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, 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
+        root: (_resolved_config_root = resolved.config.root) != null ? _resolved_config_root : root,
+        configFile: viteConfigPath
+    }, _extends._({
+        server: _extends._({}, await (0, _optionsutils.getViteServerOptions)(options, context), serverOptions)
+    }, otherOptions));
     try {
         const server = await createServer(serverConfig);
         await runViteDevServer(server);
@@ -56,6 +72,7 @@ async function* viteDevServerExecutor(options, context) {
         process.once('exit', ()=>resolve());
     });
 }
+// vite ViteDevServer
 async function runViteDevServer(server) {
     await server.listen();
     server.printUrls();
@@ -67,5 +84,53 @@ async function runViteDevServer(server) {
     process.once('exit', processOnExit);
 }
 const _default = viteDevServerExecutor;
+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 = {};
+    for (const key of Object.keys(options)){
+        if (!schema.properties[key]) {
+            extraArgs[key] = options[key];
+        }
+    }
+    let serverOptions = {};
+    const serverSchemaKeys = [
+        'hmr',
+        'warmup',
+        'watch',
+        'middlewareMode',
+        'fs',
+        'origin',
+        'preTransformRequests',
+        'sourcemapIgnoreList',
+        'port',
+        'strictPort',
+        'host',
+        'https',
+        'open',
+        'proxy',
+        'cors',
+        'headers'
+    ];
+    let otherOptions = {};
+    for (const key of Object.keys(extraArgs)){
+        if (serverSchemaKeys.includes(key)) {
+            serverOptions[key] = extraArgs[key];
+        } else {
+            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
+    };
+}
 
 //# 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  server.printUrls();\n\n  const processOnExit = async () => {\n    await server.close();\n  };\n\n  process.once('SIGINT', processOnExit);\n  process.once('SIGTERM', processOnExit);\n  process.once('exit', processOnExit);\n}\n\nexport default viteDevServerExecutor;\n"],"names":["viteDevServerExecutor","options","context","mergeConfig","createServer","Function","projectRoot","projectsConfigurations","projects","projectName","root","createBuildableTsConfig","buildTargetOptions","getNxTargetOptions","buildTarget","mergedOptions","serverConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","server","getViteServerOptions","runViteDevServer","resolvedUrls","local","network","success","baseUrl","e","console","error","Promise","resolve","process","once","listen","printUrls","processOnExit","close"],"mappings":";;;;;;;;IAcuBA,qBAAqB;eAArBA;;IA4EvB,OAAqC;eAArC;;;;8BAlFO;+BAIiC;AAEjC,gBAAgBA,sBACrBC,OAAqC,EACrCC,OAAwB;IAExB,yFAAyF;IACzF,MAAM,EAAEC,WAAW,EAAEC,YAAY,EAAE,GAAG,MAAOC,SAC3C;IAGF,MAAMC,cACJJ,QAAQK,sBAAsB,CAACC,QAAQ,CAACN,QAAQO,WAAW,CAAC,CAACC,IAAI;IAEnEC,IAAAA,sCAAuB,EAACL,aAAaL,SAASC;IAE9C,sDAAsD;IACtD,MAAMU,qBAA+CC,IAAAA,gCAAkB,EACrEZ,QAAQa,WAAW,EACnBZ;IAGF,0DAA0D;IAC1D,+BAA+B;IAC/B,MAAMa,gBAAgB,eACjBH,oBACAX;IAGL,yCAAyC;IACzC,MAAMe,eAA6Bb,YACjCc,IAAAA,iCAAmB,EAACF,eAAed,QAAQiB,WAAW,EAAEhB,UACxD;QACEiB,OAAOC,IAAAA,iCAAmB,EAACL,eAAeb;QAC1CmB,QAAQ,MAAMC,IAAAA,kCAAoB,EAACP,eAAeb;IACpD;IAGF,IAAI;QACF,MAAMmB,SAAS,MAAMjB,aAAaY;QAClC,MAAMO,iBAAiBF;QACvB,MAAMG,eAAe;eAChBH,OAAOG,YAAY,CAACC,KAAK;eACzBJ,OAAOG,YAAY,CAACE,OAAO;SAC/B;YAIUF;QAFX,MAAM;YACJG,SAAS;YACTC,SAASJ,CAAAA,iBAAAA,YAAY,CAAC,EAAE,YAAfA,iBAAmB;QAC9B;IACF,EAAE,OAAOK,GAAG;QACVC,QAAQC,KAAK,CAACF;QACd,MAAM;YACJF,SAAS;YACTC,SAAS;QACX;IACF;IAEA,MAAM,IAAII,QAAc,CAACC;QACvBC,QAAQC,IAAI,CAAC,UAAU,IAAMF;QAC7BC,QAAQC,IAAI,CAAC,WAAW,IAAMF;QAC9BC,QAAQC,IAAI,CAAC,QAAQ,IAAMF;IAC7B;AACF;AAEA,eAAeV,iBAAiBF,MAAqB;IACnD,MAAMA,OAAOe,MAAM;IACnBf,OAAOgB,SAAS;IAEhB,MAAMC,gBAAgB;QACpB,MAAMjB,OAAOkB,KAAK;IACpB;IAEAL,QAAQC,IAAI,CAAC,UAAUG;IACvBJ,QAAQC,IAAI,CAAC,WAAWG;IACxBJ,QAAQC,IAAI,CAAC,QAAQG;AACvB;MAEA,WAAetC"}
+{"version":3,"sources":["../../../../../../packages/vite/src/executors/dev-server/dev-server.impl.ts"],"sourcesContent":["import {\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 {\n  createBuildableTsConfig,\n  loadViteDynamicImport,\n} 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 } =\n    await loadViteDynamicImport();\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","loadViteDynamicImport","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/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;
 }

package/src/executors/dev-server/schema.json

@@ -30,69 +30,6 @@
       "type": "string",
       "description": "Path to the proxy configuration file.",
       "x-completion-type": "file"
-    },
-    "port": {
-      "type": "number",
-      "description": "Port to listen on.",
-      "x-priority": "important"
-    },
-    "host": {
-      "description": "Specify which IP addresses the server should listen on.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "https": {
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "object"
-        }
-      ],
-      "description": "Serve using HTTPS. https://vitejs.dev/config/server-options.html#server-https"
-    },
-    "hmr": {
-      "description": "Enable hot module replacement. For more options, use the 'hmr' option in the Vite configuration file.",
-      "type": "boolean"
-    },
-    "open": {
-      "description": "Automatically open the app in the browser on server start. When the value is a string, it will be used as the URL's pathname.",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "cors": {
-      "description": "Configure CORS for the dev server.",
-      "type": "boolean"
-    },
-    "logLevel": {
-      "type": "string",
-      "description": "Adjust console output verbosity.",
-      "enum": ["info", "warn", "error", "silent"]
-    },
-    "mode": {
-      "type": "string",
-      "description": "Mode to run the server in."
-    },
-    "clearScreen": {
-      "description": "Set to false to prevent Vite from clearing the terminal screen when logging certain messages.",
-      "type": "boolean"
-    },
-    "force": {
-      "description": "Force the optimizer to ignore the cache and re-bundle",
-      "type": "boolean"
     }
   },
   "definitions": {},

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

@@ -16,10 +16,15 @@ _export(exports, {
 const _extends = require("@swc/helpers/_/_extends");
 const _devkit = require("@nx/devkit");
 const _optionsutils = require("../../utils/options-utils");
+const _path = require("path");
+const _buildimpl = require("../build/build.impl");
+const _executorutils = require("../../utils/executor-utils");
 async function* vitePreviewServerExecutor(options, context) {
-    var _context_projectsConfigurations_projects_target_project;
+    var _context_projectsConfigurations_projects_target_project, _resolved_config_build, _resolved_config;
+    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, preview } = await Function('return import("vite")')();
+    const { mergeConfig, preview, loadConfigFromFile } = await (0, _executorutils.loadViteDynamicImport)();
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const target = (0, _devkit.parseTargetString)(options.buildTarget, context);
     const targetConfiguration = (_context_projectsConfigurations_projects_target_project = context.projectsConfigurations.projects[target.project]) == null ? void 0 : _context_projectsConfigurations_projects_target_project.targets[target.target];
     if (!targetConfiguration) {
@@ -28,26 +33,44 @@ 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);
-    var _options_staticFilePath;
-    const outputPath = (_options_staticFilePath = options.staticFilePath) != null ? _options_staticFilePath : buildTargetOptions.outputPath;
-    if (!outputPath) {
-        throw new Error(`Could not infer the "outputPath". It should either be a property of the "${options.buildTarget}" buildTarget or provided explicitly as a "staticFilePath" option.`);
+    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, configuration, otherOptionsFromBuild);
+    var _otherOptions_mode, _ref;
+    const resolved = await loadConfigFromFile({
+        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, _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.`);
     }
+    const root = projectRoot === '.' ? process.cwd() : (0, _path.relative)(context.cwd, (0, _devkit.joinPathFragments)(context.root, projectRoot));
     // Merge the options from the build and preview-serve targets.
     // The latter takes precedence.
     const mergedOptions = _extends._({}, {
         watch: {}
-    }, isCustomBuildTarget ? {} : buildTargetOptions, options, {
-        outputPath
-    });
-    // Retrieve the server configuration.
-    const serverConfig = mergeConfig((0, _optionsutils.getViteSharedConfig)(mergedOptions, options.clearScreen, context), {
-        build: (0, _optionsutils.getViteBuildOptions)(mergedOptions, context),
-        preview: (0, _optionsutils.getVitePreviewOptions)(mergedOptions, context)
+    }, {
+        build: _extends._({
+            outDir
+        }, isCustomBuildTarget ? {} : buildOptions)
+    }, isCustomBuildTarget ? {} : otherOptionsFromBuild, otherOptions, {
+        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
+        root: (_resolved_config_root = resolved.config.root) != null ? _resolved_config_root : root,
+        configFile: viteConfigPath
+    }, _extends._({}, mergedOptions));
     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);
@@ -101,12 +124,53 @@ function closeServer(server) {
             resolve();
         } else {
             const { httpServer } = server;
-            // closeAllConnections was added in Node v18.2.0
-            httpServer.closeAllConnections && httpServer.closeAllConnections();
+            if (httpServer['closeAllConnections']) {
+                // https://github.com/vitejs/vite/pull/14834
+                // closeAllConnections was added in Node v18.2.0
+                // typically is "as http.Server" but no reason
+                // to import http just for this
+                httpServer.closeAllConnections();
+            }
             httpServer.close(()=>resolve());
         }
     });
 }
 const _default = vitePreviewServerExecutor;
+async function getExtraArgs(options, configuration, otherOptionsFromBuildTarget) {
+    // 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 previewOptions = {};
+    const previewSchemaKeys = [
+        'port',
+        'strictPort',
+        'host',
+        'https',
+        'open',
+        'proxy',
+        'cors',
+        'headers'
+    ];
+    let otherOptions = {};
+    for (const key of Object.keys(extraArgs)){
+        if (previewSchemaKeys.includes(key)) {
+            previewOptions[key] = extraArgs[key];
+        } else {
+            otherOptions[key] = extraArgs[key];
+        }
+    }
+    if (configuration) {
+        otherOptions = _extends._({}, otherOptions, otherOptionsFromBuildTarget != null ? otherOptionsFromBuildTarget : {});
+    }
+    return {
+        previewOptions,
+        otherOptions
+    };
+}
 
 //# sourceMappingURL=preview-server.impl.js.map

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 { ExecutorContext, parseTargetString, runExecutor } from '@nx/devkit';\nimport type { InlineConfig, PreviewServer } from 'vite';\nimport {\n  getNxTargetOptions,\n  getViteBuildOptions,\n  getVitePreviewOptions,\n  getViteSharedConfig,\n} from '../../utils/options-utils';\nimport { ViteBuildExecutorOptions } from '../build/schema';\nimport { VitePreviewServerExecutorOptions } from './schema';\n\ninterface CustomBuildTargetOptions {\n  outputPath: string;\n}\n\nexport async function* vitePreviewServerExecutor(\n  options: VitePreviewServerExecutorOptions,\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, preview } = await (Function(\n    'return import(\"vite\")'\n  )() as Promise<typeof import('vite')>);\n\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:\n    | ViteBuildExecutorOptions\n    | CustomBuildTargetOptions = getNxTargetOptions(\n    options.buildTarget,\n    context\n  );\n\n  const outputPath = options.staticFilePath ?? buildTargetOptions.outputPath;\n\n  if (!outputPath) {\n    throw new Error(\n      `Could not infer the \"outputPath\". It should either be a property of the \"${options.buildTarget}\" buildTarget or provided explicitly as a \"staticFilePath\" option.`\n    );\n  }\n\n  // Merge the options from the build and preview-serve targets.\n  // The latter takes precedence.\n  const mergedOptions = {\n    ...{ watch: {} },\n    ...(isCustomBuildTarget ? {} : buildTargetOptions),\n    ...options,\n    outputPath,\n  };\n\n  // Retrieve the server configuration.\n  const serverConfig: InlineConfig = mergeConfig(\n    getViteSharedConfig(mergedOptions, options.clearScreen, context),\n    {\n      build: getViteBuildOptions(mergedOptions, context),\n      preview: getVitePreviewOptions(mergedOptions, context),\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      // closeAllConnections was added in Node v18.2.0\n      httpServer.closeAllConnections && httpServer.closeAllConnections();\n      httpServer.close(() => resolve());\n    }\n  });\n}\n\nexport default vitePreviewServerExecutor;\n"],"names":["vitePreviewServerExecutor","options","context","mergeConfig","preview","Function","target","parseTargetString","buildTarget","targetConfiguration","projectsConfigurations","projects","project","targets","Error","isCustomBuildTarget","executor","buildTargetOptions","getNxTargetOptions","outputPath","staticFilePath","mergedOptions","watch","serverConfig","getViteSharedConfig","clearScreen","build","getViteBuildOptions","getVitePreviewOptions","mode","console","warn","server","processOnExit","closeServer","process","once","buildTargetOverrides","runExecutor","result","success","printUrls","resolvedUrls","local","network","baseUrl","e","error","Promise","resolve","httpServer","closeAllConnections","close"],"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';\nimport { loadViteDynamicImport } from '../../utils/executor-utils';\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 } =\n    await loadViteDynamicImport();\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","loadViteDynamicImport","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/executors/preview-server/schema.d.ts

@@ -1,12 +1,5 @@
 export interface VitePreviewServerExecutorOptions {
   buildTarget: string;
   proxyConfig?: string;
-  port?: number;
-  host?: string | boolean;
-  https?: boolean | Json;
-  open?: string | boolean;
-  logLevel?: 'info' | 'warn' | 'error' | 'silent';
-  mode?: string;
-  clearScreen?: boolean;
   staticFilePath?: string;
 }