vite 6.0.0-alpha.8 → 6.0.0-beta.0

package/dist/node/cli.js

@@ -1,12 +1,49 @@
 import path from 'node:path';
-import fs from 'node:fs';
+import fs__default from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { a as colors, c as createLogger } from './chunks/dep-C7zR1Rh8.js';
+import { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-Bv1xMYNy.js';
 import { VERSION } from './constants.js';
-import 'node:readline';
-import 'tty';
+import 'node:fs/promises';
 import 'node:url';
+import 'node:util';
+import 'node:module';
+import 'tty';
+import 'esbuild';
+import 'path';
+import 'fs';
+import 'node:events';
+import 'node:stream';
+import 'node:string_decoder';
+import 'node:child_process';
+import 'node:http';
+import 'node:https';
+import 'util';
+import 'net';
+import 'url';
+import 'http';
+import 'stream';
+import 'os';
+import 'child_process';
+import 'node:os';
+import 'node:crypto';
+import 'node:dns';
+import 'vite/module-runner';
+import 'rollup/parseAst';
+import 'module';
+import 'node:assert';
+import 'node:v8';
+import 'node:worker_threads';
+import 'crypto';
+import 'node:buffer';
+import 'node:readline';
+import 'zlib';
+import 'buffer';
+import 'https';
+import 'tls';
+import 'assert';
+import 'querystring';
+import 'node:zlib';
 
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -621,200 +658,183 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-const cli = cac('vite');
+const cli = cac("vite");
 let profileSession = global.__vite_profile_session;
 let profileCount = 0;
 const stopProfiler = (log) => {
-    if (!profileSession)
-        return;
-    return new Promise((res, rej) => {
-        profileSession.post('Profiler.stop', (err, { profile }) => {
-            // Write profile to disk, upload, etc.
-            if (!err) {
-                const outPath = path.resolve(`./vite-profile-${profileCount++}.cpuprofile`);
-                fs.writeFileSync(outPath, JSON.stringify(profile));
-                log(colors.yellow(`CPU profile written to ${colors.white(colors.dim(outPath))}`));
-                profileSession = undefined;
-                res();
-            }
-            else {
-                rej(err);
-            }
-        });
+  if (!profileSession) return;
+  return new Promise((res, rej) => {
+    profileSession.post("Profiler.stop", (err, { profile }) => {
+      if (!err) {
+        const outPath = path.resolve(
+          `./vite-profile-${profileCount++}.cpuprofile`
+        );
+        fs__default.writeFileSync(outPath, JSON.stringify(profile));
+        log(
+          colors.yellow(
+            `CPU profile written to ${colors.white(colors.dim(outPath))}`
+          )
+        );
+        profileSession = void 0;
+        res();
+      } else {
+        rej(err);
+      }
     });
+  });
 };
 const filterDuplicateOptions = (options) => {
-    for (const [key, value] of Object.entries(options)) {
-        if (Array.isArray(value)) {
-            options[key] = value[value.length - 1];
-        }
+  for (const [key, value] of Object.entries(options)) {
+    if (Array.isArray(value)) {
+      options[key] = value[value.length - 1];
     }
+  }
 };
-/**
- * removing global flags before passing as command specific sub-configs
- */
 function cleanGlobalCLIOptions(options) {
-    const ret = { ...options };
-    delete ret['--'];
-    delete ret.c;
-    delete ret.config;
-    delete ret.base;
-    delete ret.l;
-    delete ret.logLevel;
-    delete ret.clearScreen;
-    delete ret.d;
-    delete ret.debug;
-    delete ret.f;
-    delete ret.filter;
-    delete ret.m;
-    delete ret.mode;
-    // convert the sourcemap option to a boolean if necessary
-    if ('sourcemap' in ret) {
-        const sourcemap = ret.sourcemap;
-        ret.sourcemap =
-            sourcemap === 'true'
-                ? true
-                : sourcemap === 'false'
-                    ? false
-                    : ret.sourcemap;
-    }
-    return ret;
+  const ret = { ...options };
+  delete ret["--"];
+  delete ret.c;
+  delete ret.config;
+  delete ret.base;
+  delete ret.l;
+  delete ret.logLevel;
+  delete ret.clearScreen;
+  delete ret.d;
+  delete ret.debug;
+  delete ret.f;
+  delete ret.filter;
+  delete ret.m;
+  delete ret.mode;
+  if ("sourcemap" in ret) {
+    const sourcemap = ret.sourcemap;
+    ret.sourcemap = sourcemap === "true" ? true : sourcemap === "false" ? false : ret.sourcemap;
+  }
+  return ret;
 }
-/**
- * removing builder flags before passing as command specific sub-configs
- */
 function cleanBuilderCLIOptions(options) {
-    const ret = { ...options };
-    delete ret.app;
-    return ret;
+  const ret = { ...options };
+  delete ret.app;
+  return ret;
 }
-/**
- * host may be a number (like 0), should convert to string
- */
 const convertHost = (v) => {
-    if (typeof v === 'number') {
-        return String(v);
-    }
-    return v;
+  if (typeof v === "number") {
+    return String(v);
+  }
+  return v;
 };
-/**
- * base may be a number (like 0), should convert to empty string
- */
 const convertBase = (v) => {
-    if (v === 0) {
-        return '';
-    }
-    return v;
+  if (v === 0) {
+    return "";
+  }
+  return v;
 };
-cli
-    .option('-c, --config <file>', `[string] use specified config file`)
-    .option('--base <path>', `[string] public base path (default: /)`, {
-    type: [convertBase],
-})
-    .option('-l, --logLevel <level>', `[string] info | warn | error | silent`)
-    .option('--clearScreen', `[boolean] allow/disable clear screen when logging`)
-    .option('-d, --debug [feat]', `[string | boolean] show debug logs`)
-    .option('-f, --filter <filter>', `[string] filter debug logs`)
-    .option('-m, --mode <mode>', `[string] set env mode`);
-// dev
-cli
-    .command('[root]', 'start dev server') // default command
-    .alias('serve') // the command is called 'serve' in Vite's API
-    .alias('dev') // alias to align with the script name
-    .option('--host [host]', `[string] specify hostname`, { type: [convertHost] })
-    .option('--port <port>', `[number] specify port`)
-    .option('--open [path]', `[boolean | string] open browser on startup`)
-    .option('--cors', `[boolean] enable CORS`)
-    .option('--strictPort', `[boolean] exit if specified port is already in use`)
-    .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
-    .action(async (root, options) => {
-    filterDuplicateOptions(options);
-    // output structure is preserved even after bundling so require()
-    // is ok here
-    const { createServer } = await import('./chunks/dep-8PNdpITG.js').then(function (n) { return n.C; });
-    try {
-        const server = await createServer({
-            root,
-            base: options.base,
-            mode: options.mode,
-            configFile: options.config,
-            logLevel: options.logLevel,
-            clearScreen: options.clearScreen,
-            optimizeDeps: { force: options.force },
-            server: cleanGlobalCLIOptions(options),
-        });
-        if (!server.httpServer) {
-            throw new Error('HTTP server not available');
-        }
-        await server.listen();
-        const info = server.config.logger.info;
-        const viteStartTime = global.__vite_start_time ?? false;
-        const startupDurationString = viteStartTime
-            ? colors.dim(`ready in ${colors.reset(colors.bold(Math.ceil(performance.now() - viteStartTime)))} ms`)
-            : '';
-        const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
-        info(`\n  ${colors.green(`${colors.bold('VITE')} v${VERSION}`)}  ${startupDurationString}\n`, {
-            clear: !hasExistingLogs,
-        });
-        server.printUrls();
-        const customShortcuts = [];
-        if (profileSession) {
-            customShortcuts.push({
-                key: 'p',
-                description: 'start/stop the profiler',
-                async action(server) {
-                    if (profileSession) {
-                        await stopProfiler(server.config.logger.info);
-                    }
-                    else {
-                        const inspector = await import('node:inspector').then((r) => r.default);
-                        await new Promise((res) => {
-                            profileSession = new inspector.Session();
-                            profileSession.connect();
-                            profileSession.post('Profiler.enable', () => {
-                                profileSession.post('Profiler.start', () => {
-                                    server.config.logger.info('Profiler started');
-                                    res();
-                                });
-                            });
-                        });
-                    }
-                },
+cli.option("-c, --config <file>", `[string] use specified config file`).option("--base <path>", `[string] public base path (default: /)`, {
+  type: [convertBase]
+}).option("-l, --logLevel <level>", `[string] info | warn | error | silent`).option("--clearScreen", `[boolean] allow/disable clear screen when logging`).option("-d, --debug [feat]", `[string | boolean] show debug logs`).option("-f, --filter <filter>", `[string] filter debug logs`).option("-m, --mode <mode>", `[string] set env mode`);
+cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--host [host]", `[string] specify hostname`, { type: [convertHost] }).option("--port <port>", `[number] specify port`).option("--open [path]", `[boolean | string] open browser on startup`).option("--cors", `[boolean] enable CORS`).option("--strictPort", `[boolean] exit if specified port is already in use`).option(
+  "--force",
+  `[boolean] force the optimizer to ignore the cache and re-bundle`
+).action(async (root, options) => {
+  filterDuplicateOptions(options);
+  const { createServer } = await import('./chunks/dep-Bv1xMYNy.js').then(function (n) { return n.M; });
+  try {
+    const server = await createServer({
+      root,
+      base: options.base,
+      mode: options.mode,
+      configFile: options.config,
+      logLevel: options.logLevel,
+      clearScreen: options.clearScreen,
+      optimizeDeps: { force: options.force },
+      server: cleanGlobalCLIOptions(options)
+    });
+    if (!server.httpServer) {
+      throw new Error("HTTP server not available");
+    }
+    await server.listen();
+    const info = server.config.logger.info;
+    const viteStartTime = global.__vite_start_time ?? false;
+    const startupDurationString = viteStartTime ? colors.dim(
+      `ready in ${colors.reset(
+        colors.bold(Math.ceil(performance.now() - viteStartTime))
+      )} ms`
+    ) : "";
+    const hasExistingLogs = process.stdout.bytesWritten > 0 || process.stderr.bytesWritten > 0;
+    info(
+      `
+  ${colors.green(
+        `${colors.bold("VITE")} v${VERSION}`
+      )}  ${startupDurationString}
+`,
+      {
+        clear: !hasExistingLogs
+      }
+    );
+    server.printUrls();
+    const customShortcuts = [];
+    if (profileSession) {
+      customShortcuts.push({
+        key: "p",
+        description: "start/stop the profiler",
+        async action(server2) {
+          if (profileSession) {
+            await stopProfiler(server2.config.logger.info);
+          } else {
+            const inspector = await import('node:inspector').then(
+              (r) => r.default
+            );
+            await new Promise((res) => {
+              profileSession = new inspector.Session();
+              profileSession.connect();
+              profileSession.post("Profiler.enable", () => {
+                profileSession.post("Profiler.start", () => {
+                  server2.config.logger.info("Profiler started");
+                  res();
+                });
+              });
             });
+          }
         }
-        server.bindCLIShortcuts({ print: true, customShortcuts });
-    }
-    catch (e) {
-        const logger = createLogger(options.logLevel);
-        logger.error(colors.red(`error when starting dev server:\n${e.stack}`), {
-            error: e,
-        });
-        stopProfiler(logger.info);
-        process.exit(1);
+      });
     }
+    server.bindCLIShortcuts({ print: true, customShortcuts });
+  } catch (e) {
+    const logger = createLogger(options.logLevel);
+    logger.error(colors.red(`error when starting dev server:
+${e.stack}`), {
+      error: e
+    });
+    stopProfiler(logger.info);
+    process.exit(1);
+  }
 });
-// build
-cli
-    .command('build [root]', 'build for production')
-    .option('--target <target>', `[string] transpile target (default: 'modules')`)
-    .option('--outDir <dir>', `[string] output directory (default: dist)`)
-    .option('--assetsDir <dir>', `[string] directory under outDir to place assets in (default: assets)`)
-    .option('--assetsInlineLimit <number>', `[number] static asset base64 inline threshold in bytes (default: 4096)`)
-    .option('--ssr [entry]', `[string] build specified entry for server-side rendering`)
-    .option('--sourcemap [output]', `[boolean | "inline" | "hidden"] output source maps for build (default: false)`)
-    .option('--minify [minifier]', `[boolean | "terser" | "esbuild"] enable/disable minification, ` +
-    `or specify minifier to use (default: esbuild)`)
-    .option('--manifest [name]', `[boolean | string] emit build manifest json`)
-    .option('--ssrManifest [name]', `[boolean | string] emit ssr manifest json`)
-    .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
-    .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
-    .option('--environment [name]', `[string] build a single environment`)
-    .option('--app', `[boolean] same as builder.entireApp`)
-    .action(async (root, options) => {
+cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option(
+  "--assetsDir <dir>",
+  `[string] directory under outDir to place assets in (default: assets)`
+).option(
+  "--assetsInlineLimit <number>",
+  `[number] static asset base64 inline threshold in bytes (default: 4096)`
+).option(
+  "--ssr [entry]",
+  `[string] build specified entry for server-side rendering`
+).option(
+  "--sourcemap [output]",
+  `[boolean | "inline" | "hidden"] output source maps for build (default: false)`
+).option(
+  "--minify [minifier]",
+  `[boolean | "terser" | "esbuild"] enable/disable minification, or specify minifier to use (default: esbuild)`
+).option("--manifest [name]", `[boolean | string] emit build manifest json`).option("--ssrManifest [name]", `[boolean | string] emit ssr manifest json`).option(
+  "--emptyOutDir",
+  `[boolean] force empty outDir when it's outside of root`
+).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--app", `[boolean] same as builder.entireApp`).action(
+  async (root, options) => {
     filterDuplicateOptions(options);
-    const { createBuilder, buildEnvironment } = await import('./chunks/dep-8PNdpITG.js').then(function (n) { return n.E; });
-    const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
-    const config = {
+    const build = await import('./chunks/dep-Bv1xMYNy.js').then(function (n) { return n.N; });
+    const buildOptions = cleanGlobalCLIOptions(
+      cleanBuilderCLIOptions(options)
+    );
+    try {
+      const inlineConfig = {
         root,
         base: options.base,
         mode: options.mode,
@@ -822,40 +842,49 @@ cli
         logLevel: options.logLevel,
         clearScreen: options.clearScreen,
         build: buildOptions,
-    };
-    try {
-        const builder = await createBuilder(config);
-        // TODO: Backward compatibility with lib and single environment build
-        // Ideally we would move to only building the entire app with this command
-        if (builder.config.build.lib) {
-            await buildEnvironment(builder.config, builder.environments.client, builder.config.build.lib);
-        }
-        else if (builder.config.builder.entireApp || options.app) {
-            await builder.buildApp();
+        ...options.app ? { builder: { entireApp: true } } : {}
+      };
+      const patchConfig = (resolved) => {
+        if (resolved.builder.entireApp) {
+          return;
         }
-        else {
-            const ssr = !!builder.config.build.ssr;
-            const environment = builder.environments[ssr ? 'ssr' : 'client'];
-            await builder.build(environment);
-        }
-    }
-    catch (e) {
-        createLogger(options.logLevel).error(colors.red(`error during build:\n${e.stack}`), { error: e });
-        process.exit(1);
-    }
-    finally {
-        stopProfiler((message) => createLogger(options.logLevel).info(message));
-    }
-});
-// optimize
-cli
-    .command('optimize [root]', 'pre-bundle dependencies')
-    .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
-    .action(async (root, options) => {
-    /* TODO: do we need this command?
-
-    filterDuplicateOptions(options)
-    const { optimizeDeps } = await import('./optimizer')
+        const environmentName = resolved.build.ssr ? "ssr" : "client";
+        resolved.build = {
+          ...resolved.environments[environmentName].build
+        };
+      };
+      const config = await build.resolveConfigToBuild(
+        inlineConfig,
+        patchConfig
+      );
+      if (config.builder.entireApp) {
+        const builder = await build.createBuilderWithResolvedConfig(
+          inlineConfig,
+          config
+        );
+        await builder.buildApp();
+      } else {
+        await build.buildWithResolvedConfig(config);
+      }
+    } catch (e) {
+      createLogger(options.logLevel).error(
+        colors.red(`error during build:
+${e.stack}`),
+        { error: e }
+      );
+      process.exit(1);
+    } finally {
+      stopProfiler((message) => createLogger(options.logLevel).info(message));
+    }
+  }
+);
+cli.command("optimize [root]", "pre-bundle dependencies").option(
+  "--force",
+  `[boolean] force the optimizer to ignore the cache and re-bundle`
+).action(
+  async (root, options) => {
+    filterDuplicateOptions(options);
+    const { optimizeDeps } = await import('./chunks/dep-Bv1xMYNy.js').then(function (n) { return n.L; });
     try {
       const config = await resolveConfig(
         {
@@ -863,60 +892,56 @@ cli
           base: options.base,
           configFile: options.config,
           logLevel: options.logLevel,
-          mode: options.mode,
+          mode: options.mode
         },
-        'serve',
-      )
-      const environment = new Environment('client', config)
-      await optimizeDeps(environment, options.force, true)
+        "serve"
+      );
+      await optimizeDeps(config, options.force, true);
     } catch (e) {
       createLogger(options.logLevel).error(
-        colors.red(`error when optimizing deps:\n${e.stack}`),
-        { error: e },
-      )
-      process.exit(1)
+        colors.red(`error when optimizing deps:
+${e.stack}`),
+        { error: e }
+      );
+      process.exit(1);
     }
-    */
-});
-// preview
-cli
-    .command('preview [root]', 'locally preview production build')
-    .option('--host [host]', `[string] specify hostname`, { type: [convertHost] })
-    .option('--port <port>', `[number] specify port`)
-    .option('--strictPort', `[boolean] exit if specified port is already in use`)
-    .option('--open [path]', `[boolean | string] open browser on startup`)
-    .option('--outDir <dir>', `[string] output directory (default: dist)`)
-    .action(async (root, options) => {
+  }
+);
+cli.command("preview [root]", "locally preview production build").option("--host [host]", `[string] specify hostname`, { type: [convertHost] }).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--open [path]", `[boolean | string] open browser on startup`).option("--outDir <dir>", `[string] output directory (default: dist)`).action(
+  async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-8PNdpITG.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-Bv1xMYNy.js').then(function (n) { return n.O; });
     try {
-        const server = await preview({
-            root,
-            base: options.base,
-            configFile: options.config,
-            logLevel: options.logLevel,
-            mode: options.mode,
-            build: {
-                outDir: options.outDir,
-            },
-            preview: {
-                port: options.port,
-                strictPort: options.strictPort,
-                host: options.host,
-                open: options.open,
-            },
-        });
-        server.printUrls();
-        server.bindCLIShortcuts({ print: true });
-    }
-    catch (e) {
-        createLogger(options.logLevel).error(colors.red(`error when starting preview server:\n${e.stack}`), { error: e });
-        process.exit(1);
-    }
-    finally {
-        stopProfiler((message) => createLogger(options.logLevel).info(message));
+      const server = await preview({
+        root,
+        base: options.base,
+        configFile: options.config,
+        logLevel: options.logLevel,
+        mode: options.mode,
+        build: {
+          outDir: options.outDir
+        },
+        preview: {
+          port: options.port,
+          strictPort: options.strictPort,
+          host: options.host,
+          open: options.open
+        }
+      });
+      server.printUrls();
+      server.bindCLIShortcuts({ print: true });
+    } catch (e) {
+      createLogger(options.logLevel).error(
+        colors.red(`error when starting preview server:
+${e.stack}`),
+        { error: e }
+      );
+      process.exit(1);
+    } finally {
+      stopProfiler((message) => createLogger(options.logLevel).info(message));
     }
-});
+  }
+);
 cli.help();
 cli.version(VERSION);
 cli.parse();