vite 6.0.0-alpha.10 → 6.0.0-alpha.11

package/dist/node/chunks/{dep-DhoCcTbV.js → dep-CjFMk8-F.js}

@@ -15142,13 +15142,13 @@ function terserPlugin(config) {
     };
 }
 
-async function resolveBoundedPlugins(environment) {
+async function resolveIsolatedPlugins(environment) {
     const userPlugins = [];
     for (const plugin of environment.config.rawPlugins) {
         if (typeof plugin === 'function') {
-            const boundedPlugin = await plugin(environment);
-            if (boundedPlugin) {
-                const flatPlugins = await asyncFlattenBoundedPlugin(environment, boundedPlugin);
+            const isolatedPlugin = await plugin(environment);
+            if (isolatedPlugin) {
+                const flatPlugins = await asyncFlattenIsolatedPlugin(environment, isolatedPlugin);
                 userPlugins.push(...flatPlugins);
             }
         }
@@ -15158,7 +15158,7 @@ async function resolveBoundedPlugins(environment) {
     }
     return environment.config.resolvePlugins(...sortUserPlugins(userPlugins));
 }
-async function asyncFlattenBoundedPlugin(environment, plugins) {
+async function asyncFlattenIsolatedPlugin(environment, plugins) {
     if (!Array.isArray(plugins)) {
         plugins = [plugins];
     }
@@ -61057,8 +61057,8 @@ class DevEnvironment extends Environment {
             return;
         }
         this._inited = true;
-        this._plugins = await resolveBoundedPlugins(this);
-        this._pluginContainer = await createBoundedPluginContainer(this, this._plugins);
+        this._plugins = await resolveIsolatedPlugins(this);
+        this._pluginContainer = await createIsolatedPluginContainer(this, this._plugins);
         // TODO: Should buildStart be called here? It break backward compatibility if we do,
         // and it may be better to delay it for performance
         // The deps optimizer init is delayed. TODO: add internal option?
@@ -64450,13 +64450,17 @@ const relativePathRE = /^\.{1,2}\//;
 // trailing slash too as a dynamic import statement can have comments between
 // the `import` and the `(`.
 const hasDynamicImportRE = /\bimport\s*[(/]/;
-const dynamicImportHelper = (glob, path) => {
+const dynamicImportHelper = (glob, path, segs) => {
     const v = glob[path];
     if (v) {
         return typeof v === 'function' ? v() : Promise.resolve(v);
     }
     return new Promise((_, reject) => {
-        (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(reject.bind(null, new Error('Unknown variable dynamic import: ' + path)));
+        (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(reject.bind(null, new Error('Unknown variable dynamic import: ' +
+            path +
+            (path.split('/').length !== segs
+                ? '. Note that variables only represent file names one level deep.'
+                : ''))));
     });
 };
 function parseDynamicImportPattern(strings) {
@@ -64593,7 +64597,7 @@ function dynamicImportVarsPlugin(config) {
                 }
                 const { rawPattern, glob } = result;
                 needDynamicImportHelper = true;
-                s.overwrite(expStart, expEnd, `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`)`);
+                s.overwrite(expStart, expEnd, `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`, ${rawPattern.split('/').length})`);
             }
             if (s) {
                 if (needDynamicImportHelper) {
@@ -64784,7 +64788,7 @@ function throwClosedServerError() {
  * instead of using environment.plugins to allow the creation of different
  * pipelines working with the same environment (used for createIdResolver).
  */
-async function createBoundedPluginContainer(environment, plugins, watcher) {
+async function createIsolatedPluginContainer(environment, plugins, watcher) {
     const { config, logger, options: { build: { rollupOptions }, }, } = environment;
     const { root } = config;
     // Backward compatibility
@@ -65383,7 +65387,7 @@ function createIdResolver(config, options) {
     async function resolve(environment, id, importer) {
         let pluginContainer = pluginContainerMap.get(environment);
         if (!pluginContainer) {
-            pluginContainer = await createBoundedPluginContainer(environment, [
+            pluginContainer = await createIsolatedPluginContainer(environment, [
                 alias$1({ entries: config.resolve.alias }),
                 resolvePlugin({
                     root: config.root,
@@ -65406,7 +65410,7 @@ function createIdResolver(config, options) {
     async function resolveAlias(environment, id, importer) {
         let pluginContainer = aliasOnlyPluginContainerMap.get(environment);
         if (!pluginContainer) {
-            pluginContainer = await createBoundedPluginContainer(environment, [
+            pluginContainer = await createIsolatedPluginContainer(environment, [
                 alias$1({ entries: config.resolve.alias }), // TODO: resolve.alias per environment?
             ]);
             aliasOnlyPluginContainerMap.set(environment, pluginContainer);
@@ -68649,7 +68653,7 @@ class BuildEnvironment extends Environment {
             return;
         }
         this._inited = true;
-        this._plugins = await resolveBoundedPlugins(this);
+        this._plugins = await resolveIsolatedPlugins(this);
     }
 }
 async function defaultBuildApp(builder) {
@@ -69463,7 +69467,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
                 // environment so we can safely cast to a base Environment instance to a
                 // PluginEnvironment here
                 const environment = new Environment(environmentName, this);
-                const pluginContainer = await createBoundedPluginContainer(environment, plugins);
+                const pluginContainer = await createIsolatedPluginContainer(environment, plugins);
                 await pluginContainer.buildStart({});
                 return pluginContainer;
             };

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-DhoCcTbV.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-CjFMk8-F.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-DhoCcTbV.js').then(function (n) { return n.E; });
+    const { createBuilder, buildEnvironment } = await import('./chunks/dep-CjFMk8-F.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-DhoCcTbV.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-CjFMk8-F.js').then(function (n) { return n.F; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -788,7 +788,7 @@ type CLIShortcut<Server = ViteDevServer | PreviewServer> = {
  * https://github.com/preactjs/wmr/blob/main/packages/wmr/src/lib/rollup-plugin-container.js
  */
 
-interface BoundedPluginContainer {
+interface IsolatedPluginContainer {
     options: InputOptions;
     buildStart(options: InputOptions): Promise<void>;
     resolveId(id: string, importer: string | undefined, options?: {
@@ -1381,7 +1381,7 @@ declare class Environment {
     name: string;
     config: ResolvedConfig;
     options: ResolvedEnvironmentOptions;
-    get plugins(): BoundedPlugin[];
+    get plugins(): IsolatedPlugin[];
     get logger(): Logger;
     constructor(name: string, config: ResolvedConfig, options?: ResolvedEnvironmentOptions);
 }
@@ -1398,7 +1398,7 @@ declare function fetchModule(environment: DevEnvironment, url: string, importer?
 
 declare class ScanEnvironment extends Environment {
     mode: "scan";
-    get pluginContainer(): BoundedPluginContainer;
+    get pluginContainer(): IsolatedPluginContainer;
     init(): Promise<void>;
 }
 
@@ -1587,7 +1587,7 @@ declare class DevEnvironment extends Environment {
     moduleGraph: EnvironmentModuleGraph;
     watcher?: FSWatcher;
     depsOptimizer?: DepsOptimizer;
-    get pluginContainer(): BoundedPluginContainer;
+    get pluginContainer(): IsolatedPluginContainer;
     /**
      * HMR channel for this environment. If not provided or disabled,
      * it will be a noop channel that does nothing.
@@ -3320,7 +3320,7 @@ interface BasePlugin<A = any> extends rollup.Plugin<A> {
     generateBundle?: ModifyHookContext<rollup.Plugin<A>['generateBundle'], PluginContext>;
     renderChunk?: ModifyHookContext<rollup.Plugin<A>['renderChunk'], PluginContext>;
 }
-type BoundedPlugin<A = any> = BasePlugin<A>;
+type IsolatedPlugin<A = any> = BasePlugin<A>;
 interface Plugin<A = any> extends BasePlugin<A> {
     /**
      * Opt-in this plugin into the shared plugins pipeline.
@@ -3406,13 +3406,13 @@ type HookHandler<T> = T extends ObjectHook<infer H> ? H : T;
 type PluginWithRequiredHook<K extends keyof Plugin> = Plugin & {
     [P in K]: NonNullable<Plugin[P]>;
 };
-type BoundedPluginConstructor = {
-    (environment: PluginEnvironment): BoundedPluginOption;
+type IsolatedPluginConstructor = {
+    (environment: PluginEnvironment): IsolatedPluginOption;
     sharedDuringBuild?: boolean;
 };
-type MaybeBoundedPlugin = BoundedPlugin | false | null | undefined;
-type BoundedPluginOption = MaybeBoundedPlugin | BoundedPluginOption[] | Promise<MaybeBoundedPlugin | BoundedPluginOption[]>;
-type MaybePlugin = Plugin | BoundedPluginConstructor | false | null | undefined;
+type MaybeIsolatedPlugin = IsolatedPlugin | false | null | undefined;
+type IsolatedPluginOption = MaybeIsolatedPlugin | IsolatedPluginOption[] | Promise<MaybeIsolatedPlugin | IsolatedPluginOption[]>;
+type MaybePlugin = Plugin | IsolatedPluginConstructor | false | null | undefined;
 type PluginOption = MaybePlugin | PluginOption[] | Promise<MaybePlugin | PluginOption[]>;
 
 interface JsonOptions {
@@ -3862,7 +3862,7 @@ type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'css' | 'assetsInclu
         alias: Alias[];
     };
     plugins: readonly Plugin[];
-    rawPlugins: readonly (Plugin | BoundedPluginConstructor)[];
+    rawPlugins: readonly (Plugin | IsolatedPluginConstructor)[];
     css: ResolvedCSSOptions;
     esbuild: ESBuildOptions | false;
     server: ResolvedServerOptions;
@@ -3885,7 +3885,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, patchPlugins?: ((plugins: (Plugin | BoundedPluginConstructor)[]) => 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 | IsolatedPluginConstructor)[]) => 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;
@@ -4005,4 +4005,4 @@ interface ManifestChunk {
     dynamicImports?: string[];
 }
 
-export { type Alias, type AliasOptions, type AnymatchFn, type AnymatchPattern, type AppType, type AwaitWriteFinishOptions, type BindCLIShortcutsOptions, type BoundedPlugin, type BoundedPluginConstructor, BuildEnvironment, type BuildEnvironmentOptions, type BuildOptions, type BuilderOptions, type CLIShortcut, type CSSModulesOptions, type CSSOptions, type CommonServerOptions, type ConfigEnv, Connect, type CorsOptions, type CorsOrigin, type DepOptimizationConfig, type DepOptimizationMetadata, type DepOptimizationOptions, DevEnvironment, type DevEnvironmentOptions, type DevEnvironmentSetup, type ESBuildOptions, type ESBuildTransformResult, EnvironmentModuleGraph, EnvironmentModuleNode, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HMRBroadcaster, type HMRBroadcasterClient, type HMRChannel, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotUpdateContext, type HtmlTagDescriptor, HttpProxy, type IndexHtmlTransform, type IndexHtmlTransformContext, type IndexHtmlTransformHook, type IndexHtmlTransformResult, type InlineConfig, type InternalResolveOptions, type JsonOptions, type LegacyOptions, type LibraryFormats, type LibraryOptions, type LightningCSSOptions, type LogErrorOptions, type LogLevel, type LogOptions, type LogType, type Logger, type LoggerOptions, type Manifest, type ManifestChunk, type MapToFunction, type AnymatchMatcher as Matcher, ModuleGraph, ModuleNode, type ModulePreloadOptions, type OptimizedDepInfo, type Plugin, type PluginContainer, type PluginHookUtils, type PluginOption, type PreprocessCSSResult, type PreviewOptions, type PreviewServer, type PreviewServerHook, type ProxyOptions, RemoteEnvironmentTransport, type RenderBuiltAssetUrl, type ResolveFn, type ResolveModulePreloadDependenciesFn, type ResolveOptions, type ResolvedBuildEnvironmentOptions, type ResolvedBuildOptions, type ResolvedCSSOptions, type ResolvedConfig, type ResolvedDevEnvironmentOptions, type ResolvedModulePreloadOptions, type ResolvedPreviewOptions, type ResolvedSSROptions, type ResolvedServerOptions, type ResolvedServerUrls, type ResolvedUrl, type ResolvedWorkerOptions, type ResolverFunction, type ResolverObject, type RollupCommonJSOptions, type RollupDynamicImportVarsOptions, type SSROptions, type SSRTarget, type SendOptions, type ServerHMRChannel, ServerHMRConnector, type ServerHook, type ServerModuleRunnerOptions, type ServerOptions, SplitVendorChunkCache, type SsrDepOptimizationOptions, Terser, type TerserOptions, type TransformOptions, type TransformResult, type UserConfig, type UserConfigExport, type UserConfigFn, type UserConfigFnObject, type UserConfigFnPromise, type ViteBuilder, type ViteDevServer, type WatchOptions, WebSocket, WebSocketAlias, type WebSocketClient, type WebSocketCustomListener, WebSocketServer, build, buildErrorMessage, createBuilder, createFilter, createLogger, createNodeDevEnvironment, createServer, createServerModuleRunner, defineConfig, fetchModule, formatPostcssSourceMap, isCSSRequest, isFileServingAllowed, loadConfigFromFile, loadEnv, mergeAlias, mergeConfig, normalizePath, preprocessCSS, preview, resolveConfig, resolveEnvPrefix, rollupVersion, searchForWorkspaceRoot, send, sortUserPlugins, splitVendorChunk, splitVendorChunkPlugin, transformWithEsbuild, VERSION as version };
+export { type Alias, type AliasOptions, type AnymatchFn, type AnymatchPattern, type AppType, type AwaitWriteFinishOptions, type BindCLIShortcutsOptions, BuildEnvironment, type BuildEnvironmentOptions, type BuildOptions, type BuilderOptions, type CLIShortcut, type CSSModulesOptions, type CSSOptions, type CommonServerOptions, type ConfigEnv, Connect, type CorsOptions, type CorsOrigin, type DepOptimizationConfig, type DepOptimizationMetadata, type DepOptimizationOptions, DevEnvironment, type DevEnvironmentOptions, type DevEnvironmentSetup, type ESBuildOptions, type ESBuildTransformResult, EnvironmentModuleGraph, EnvironmentModuleNode, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HMRBroadcaster, type HMRBroadcasterClient, type HMRChannel, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotUpdateContext, type HtmlTagDescriptor, HttpProxy, type IndexHtmlTransform, type IndexHtmlTransformContext, type IndexHtmlTransformHook, type IndexHtmlTransformResult, type InlineConfig, type InternalResolveOptions, type IsolatedPlugin, type IsolatedPluginConstructor, type JsonOptions, type LegacyOptions, type LibraryFormats, type LibraryOptions, type LightningCSSOptions, type LogErrorOptions, type LogLevel, type LogOptions, type LogType, type Logger, type LoggerOptions, type Manifest, type ManifestChunk, type MapToFunction, type AnymatchMatcher as Matcher, ModuleGraph, ModuleNode, type ModulePreloadOptions, type OptimizedDepInfo, type Plugin, type PluginContainer, type PluginHookUtils, type PluginOption, type PreprocessCSSResult, type PreviewOptions, type PreviewServer, type PreviewServerHook, type ProxyOptions, RemoteEnvironmentTransport, type RenderBuiltAssetUrl, type ResolveFn, type ResolveModulePreloadDependenciesFn, type ResolveOptions, type ResolvedBuildEnvironmentOptions, type ResolvedBuildOptions, type ResolvedCSSOptions, type ResolvedConfig, type ResolvedDevEnvironmentOptions, type ResolvedModulePreloadOptions, type ResolvedPreviewOptions, type ResolvedSSROptions, type ResolvedServerOptions, type ResolvedServerUrls, type ResolvedUrl, type ResolvedWorkerOptions, type ResolverFunction, type ResolverObject, type RollupCommonJSOptions, type RollupDynamicImportVarsOptions, type SSROptions, type SSRTarget, type SendOptions, type ServerHMRChannel, ServerHMRConnector, type ServerHook, type ServerModuleRunnerOptions, type ServerOptions, SplitVendorChunkCache, type SsrDepOptimizationOptions, Terser, type TerserOptions, type TransformOptions, type TransformResult, type UserConfig, type UserConfigExport, type UserConfigFn, type UserConfigFnObject, type UserConfigFnPromise, type ViteBuilder, type ViteDevServer, type WatchOptions, WebSocket, WebSocketAlias, type WebSocketClient, type WebSocketCustomListener, WebSocketServer, build, buildErrorMessage, createBuilder, createFilter, createLogger, createNodeDevEnvironment, createServer, createServerModuleRunner, defineConfig, fetchModule, formatPostcssSourceMap, isCSSRequest, isFileServingAllowed, loadConfigFromFile, loadEnv, mergeAlias, mergeConfig, normalizePath, preprocessCSS, preview, resolveConfig, resolveEnvPrefix, rollupVersion, searchForWorkspaceRoot, send, sortUserPlugins, splitVendorChunk, splitVendorChunkPlugin, transformWithEsbuild, VERSION as version };

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-DhoCcTbV.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-DhoCcTbV.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-CjFMk8-F.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-CjFMk8-F.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.10",
+  "version": "6.0.0-alpha.11",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",