vite 6.0.0-alpha.4 → 6.0.0-alpha.6

package/dist/node/chunks/{dep-8UjKy9Ch.js → dep-CM9bEhFZ.js}

@@ -15158,6 +15158,34 @@ function terserPlugin(config) {
     };
 }
 
+async function resolveBoundedPlugins(environment) {
+    const resolvedPlugins = [];
+    for (const plugin of environment.config.plugins) {
+        if (plugin.create) {
+            const boundedPlugin = await plugin.create(environment);
+            if (boundedPlugin) {
+                const flatPlugins = await asyncFlattenBoundedPlugin(environment, boundedPlugin);
+                resolvedPlugins.push(...flatPlugins);
+            }
+        }
+        else {
+            resolvedPlugins.push(plugin);
+        }
+    }
+    return resolvedPlugins;
+}
+async function asyncFlattenBoundedPlugin(environment, plugins) {
+    if (!Array.isArray(plugins)) {
+        plugins = [plugins];
+    }
+    do {
+        plugins = (await Promise.all(plugins.map((p) => (p && p.split ? p.split(environment) : p))))
+            .flat(Infinity)
+            .filter(Boolean);
+    } while (plugins.some((v) => v?.then || v?.split));
+    return plugins;
+}
+
 const mimes = {
   "3g2": "video/3gpp2",
   "3gp": "video/3gpp",
@@ -36429,34 +36457,6 @@ function esbuildCjsExternalPlugin(externals, platform) {
     };
 }
 
-async function resolveBoundedPlugins(environment) {
-    const resolvedPlugins = [];
-    for (const plugin of environment.config.plugins) {
-        if (plugin.create) {
-            const boundedPlugin = await plugin.create(environment);
-            if (boundedPlugin) {
-                const flatPlugins = await asyncFlattenBoundedPlugin(environment, boundedPlugin);
-                resolvedPlugins.push(...flatPlugins);
-            }
-        }
-        else {
-            resolvedPlugins.push(plugin);
-        }
-    }
-    return resolvedPlugins;
-}
-async function asyncFlattenBoundedPlugin(environment, plugins) {
-    if (!Array.isArray(plugins)) {
-        plugins = [plugins];
-    }
-    do {
-        plugins = (await Promise.all(plugins.map((p) => (p && p.split ? p.split(environment) : p))))
-            .flat(Infinity)
-            .filter(Boolean);
-    } while (plugins.some((v) => v?.then || v?.split));
-    return plugins;
-}
-
 // Copyright 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Simon Lydell
 // License: MIT.
 var HashbangComment, Identifier, JSXIdentifier, JSXPunctuator, JSXString, JSXText, KeywordsWithExpressionAfter, KeywordsWithNoLineTerminatorAfter, LineTerminatorSequence, MultiLineComment, Newline, NumericLiteral, Punctuator, RegularExpressionLiteral, SingleLineComment, StringLiteral, Template, TokensNotPrecedingObjectLiteral, TokensPrecedingExpression, WhiteSpace;
@@ -68015,8 +68015,8 @@ async function build(inlineConfig = {}) {
         return builder.build(environment);
     }
 }
-function resolveConfigToBuild(inlineConfig = {}, patchConfig) {
-    return resolveConfig(inlineConfig, 'build', 'production', 'production', false, patchConfig);
+function resolveConfigToBuild(inlineConfig = {}, patchConfig, patchPlugins) {
+    return resolveConfig(inlineConfig, 'build', 'production', 'production', false, patchConfig, patchPlugins);
 }
 /**
  * Build an App environment, or a App library (if librayOptions is provided)
@@ -68056,9 +68056,8 @@ async function buildEnvironment(config, environment, libOptions = false) {
     }
     const outDir = resolve(options.outDir);
     // inject environment and ssr arg to plugin load/transform hooks
-    const plugins = (environment || ssr
-        ? config.plugins.map((p) => injectEnvironmentToHooks(p, environment))
-        : config.plugins);
+    // TODO: rework lib mode
+    const plugins = (libOptions ? config : environment).plugins.map((p) => injectEnvironmentToHooks(p, environment));
     const rollupOptions = {
         preserveEntrySignatures: ssr
             ? 'allow-extension'
@@ -68410,9 +68409,7 @@ function wrapEnvironmentLoad(hook, environment) {
         return;
     const fn = getHookHandler(hook);
     const handler = function (id, ...args) {
-        return fn.call(injectEnvironmentInContext(this, environment), id, 
-        // @ts-expect-error: Receiving options param to be future-proof if Rollup adds it
-        injectSsrFlag(args[0], environment));
+        return fn.call(injectEnvironmentInContext(this, environment), id, injectSsrFlag(args[0], environment));
     };
     if ('handler' in hook) {
         return {
@@ -68429,9 +68426,7 @@ function wrapEnvironmentTransform(hook, environment) {
         return;
     const fn = getHookHandler(hook);
     const handler = function (code, importer, ...args) {
-        return fn.call(injectEnvironmentInContext(this, environment), code, importer, 
-        // @ts-expect-error: Receiving options param to be future-proof if Rollup adds it
-        injectSsrFlag(args[0], environment));
+        return fn.call(injectEnvironmentInContext(this, environment), code, importer, injectSsrFlag(args[0], environment));
     };
     if ('handler' in hook) {
         return {
@@ -68580,6 +68575,13 @@ class BuildEnvironment extends Environment {
         }
         super(name, config, options);
     }
+    async init() {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
+        this._plugins = await resolveBoundedPlugins(this);
+    }
 }
 async function defaultBuildApp(builder) {
     for (const environment of Object.values(builder.environments)) {
@@ -68622,8 +68624,14 @@ async function createBuilder(inlineConfig = {}) {
         let environmentConfig = config;
         if (!config.builder.sharedConfigBuild) {
             const patchConfig = (resolved) => {
+                resolved.build = {
+                    ...resolved.environments[name].build,
+                    lib: false,
+                };
+            };
+            const patchPlugins = (resolvedPlugins) => {
                 // Force opt-in shared plugins
-                const environmentPlugins = [...resolved.plugins];
+                const environmentPlugins = [...resolvedPlugins];
                 let validMixedPlugins = true;
                 for (let i = 0; i < environmentPlugins.length; i++) {
                     const environmentPlugin = environmentPlugins[i];
@@ -68638,16 +68646,15 @@ async function createBuilder(inlineConfig = {}) {
                     }
                 }
                 if (validMixedPlugins) {
-                    resolved.plugins = environmentPlugins;
+                    for (let i = 0; i < environmentPlugins.length; i++) {
+                        resolvedPlugins[i] = environmentPlugins[i];
+                    }
                 }
-                resolved.build = {
-                    ...resolved.environments[name].build,
-                    lib: false,
-                };
             };
-            environmentConfig = await resolveConfigToBuild(inlineConfig, patchConfig);
+            environmentConfig = await resolveConfigToBuild(inlineConfig, patchConfig, patchPlugins);
         }
         const environment = await createEnvironment(name, environmentConfig);
+        await environment.init();
         environments[name] = environment;
     }
     return builder;
@@ -69061,7 +69068,7 @@ function resolveOptimizeDepsConfig(optimizeDeps, preserveSymlinks) {
         disabled: optimizeDeps.disabled,
     };
 }
-async function resolveConfig(inlineConfig, command, defaultMode = 'development', defaultNodeEnv = 'development', isPreview = false, patchConfig = undefined) {
+async function resolveConfig(inlineConfig, command, defaultMode = 'development', defaultNodeEnv = 'development', isPreview = false, patchConfig = undefined, patchPlugins = undefined) {
     let config = inlineConfig;
     let configFileDependencies = [];
     let mode = inlineConfig.mode || defaultMode;
@@ -69428,9 +69435,16 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
         ...config,
         ...resolved,
     };
-    resolved.plugins = await resolvePlugins(resolved, prePlugins, normalPlugins, postPlugins);
-    // Backward compatibility hook used in builder
+    // Backward compatibility hook, modify the resolved config before it is used
+    // to create inernal plugins. For example, `config.build.ssr`. Once we rework
+    // internal plugins to use environment.options, we can remove the dual
+    // patchConfig/patchPlugins and have a single patchConfig before configResolved
+    // gets called
     patchConfig?.(resolved);
+    const resolvedPlugins = await resolvePlugins(resolved, prePlugins, normalPlugins, postPlugins);
+    // Backward compatibility hook used in builder
+    patchPlugins?.(resolvedPlugins);
+    resolved.plugins = resolvedPlugins;
     Object.assign(resolved, createPluginHookUtils(resolved.plugins));
     // call configResolved hooks
     await Promise.all(resolved

package/dist/node/cli.js

@@ -731,7 +731,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-8UjKy9Ch.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-CM9bEhFZ.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -812,7 +812,7 @@ cli
     .option('--app', `[boolean] same as builder.entireApp`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { createBuilder, buildEnvironment } = await import('./chunks/dep-8UjKy9Ch.js').then(function (n) { return n.E; });
+    const { createBuilder, buildEnvironment } = await import('./chunks/dep-CM9bEhFZ.js').then(function (n) { return n.E; });
     const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
     const config = {
         root,
@@ -888,7 +888,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-8UjKy9Ch.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-CM9bEhFZ.js').then(function (n) { return n.F; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -2932,6 +2932,7 @@ declare class BuildEnvironment extends Environment {
     constructor(name: string, config: ResolvedConfig, setup?: {
         options?: EnvironmentOptions;
     });
+    init(): Promise<void>;
 }
 interface ViteBuilder {
     environments: Record<string, BuildEnvironment>;
@@ -3871,7 +3872,7 @@ interface PluginHookUtils {
     getSortedPluginHooks: <K extends keyof Plugin>(hookName: K) => NonNullable<HookHandler<Plugin[K]>>[];
 }
 type ResolveFn = (id: string, importer?: string, aliasOnly?: boolean, ssr?: boolean) => Promise<string | undefined>;
-declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string, defaultNodeEnv?: string, isPreview?: boolean, patchConfig?: ((config: ResolvedConfig) => void) | undefined): Promise<ResolvedConfig>;
+declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string, defaultNodeEnv?: string, isPreview?: boolean, patchConfig?: ((config: ResolvedConfig) => void) | undefined, patchPlugins?: ((plugins: Plugin[]) => void) | undefined): Promise<ResolvedConfig>;
 declare function sortUserPlugins(plugins: (Plugin | Plugin[])[] | undefined): [Plugin[], Plugin[], Plugin[]];
 declare function loadConfigFromFile(configEnv: ConfigEnv, configFile?: string, configRoot?: string, logLevel?: LogLevel, customLogger?: Logger): Promise<{
     path: string;

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules, a as arraify } from './chunks/dep-8UjKy9Ch.js';
-export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, b as build, h as buildErrorMessage, e as createBuilder, u as createFilter, j as createNodeDevEnvironment, c as createServer, m as createServerModuleRunner, d as defineConfig, k as fetchModule, f as formatPostcssSourceMap, y as isFileServingAllowed, l as loadConfigFromFile, z as loadEnv, q as mergeAlias, o as mergeConfig, n as normalizePath, g as preprocessCSS, p as preview, r as resolveConfig, A as resolveEnvPrefix, v as rollupVersion, x as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-8UjKy9Ch.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-CM9bEhFZ.js';
+export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, b as build, h as buildErrorMessage, e as createBuilder, u as createFilter, j as createNodeDevEnvironment, c as createServer, m as createServerModuleRunner, d as defineConfig, k as fetchModule, f as formatPostcssSourceMap, y as isFileServingAllowed, l as loadConfigFromFile, z as loadEnv, q as mergeAlias, o as mergeConfig, n as normalizePath, g as preprocessCSS, p as preview, r as resolveConfig, A as resolveEnvPrefix, v as rollupVersion, x as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-CM9bEhFZ.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { c as createLogger } from './chunks/dep-C7zR1Rh8.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.4",
+  "version": "6.0.0-alpha.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",