vite 6.0.0-alpha.7 → 6.0.0-alpha.8

package/dist/node/chunks/{dep-o_W9DKGE.js → dep-8PNdpITG.js}

@@ -15161,6 +15161,7 @@ function terserPlugin(config) {
 async function resolveBoundedPlugins(environment) {
     const resolvedPlugins = [];
     for (const plugin of environment.config.plugins) {
+        resolvedPlugins.push(plugin);
         if (plugin.create) {
             const boundedPlugin = await plugin.create(environment);
             if (boundedPlugin) {
@@ -15168,9 +15169,6 @@ async function resolveBoundedPlugins(environment) {
                 resolvedPlugins.push(...flatPlugins);
             }
         }
-        else {
-            resolvedPlugins.push(plugin);
-        }
     }
     return resolvedPlugins;
 }
@@ -15735,12 +15733,10 @@ function assetPlugin(config) {
     return {
         name: 'vite:asset',
         buildStart() {
-            const { environment } = this;
-            if (!environment) {
+            if (!this.environment)
                 return;
-            }
-            assetCache.set(environment, new Map());
-            generatedAssetsMap.set(environment, new Map());
+            assetCache.set(this.environment, new Map());
+            generatedAssetsMap.set(this.environment, new Map());
         },
         resolveId(id) {
             if (!config.assetsInclude(cleanUrl(id)) && !urlRE.test(id)) {
@@ -16012,12 +16008,10 @@ function manifestPlugin() {
             outputCount = 0;
         },
         generateBundle({ format }, bundle) {
-            const { environment } = this;
-            if (!environment) {
+            if (!this.environment)
                 return;
-            }
-            const { root } = environment.config;
-            const buildOptions = environment.options.build;
+            const { root } = this.environment.config;
+            const buildOptions = this.environment.options.build;
             function getChunkName(chunk) {
                 return getChunkOriginalFileName(chunk, root, format);
             }
@@ -16075,7 +16069,7 @@ function manifestPlugin() {
                 return manifestChunk;
             }
             const fileNameToAssetMeta = new Map();
-            const assets = generatedAssetsMap.get(environment);
+            const assets = generatedAssetsMap.get(this.environment);
             assets.forEach((asset, referenceId) => {
                 try {
                     const fileName = this.getFileName(referenceId);
@@ -58052,6 +58046,9 @@ function buildHtmlPlugin(config) {
         name: 'vite:build-html',
         async transform(html, id) {
             if (id.endsWith('.html')) {
+                if (!this.environment)
+                    return;
+                const { modulePreload } = this.environment.options.build;
                 id = normalizePath$3(id);
                 const relativeUrlPath = path$o.posix.relative(config.root, id);
                 const publicPath = `/${relativeUrlPath}`;
@@ -58297,7 +58294,6 @@ function buildHtmlPlugin(config) {
                 }
                 processedHtml.set(id, s.toString());
                 // inject module preload polyfill only when configured and needed
-                const { modulePreload } = config.build;
                 if (modulePreload !== false &&
                     modulePreload.polyfill &&
                     (someScriptsAreAsync || someScriptsAreDefer)) {
@@ -58309,6 +58305,9 @@ function buildHtmlPlugin(config) {
             }
         },
         async generateBundle(options, bundle) {
+            if (!this.environment)
+                return;
+            const { modulePreload } = this.environment.options.build;
             const analyzedChunk = new Map();
             const inlineEntryChunk = new Set();
             const getImportedChunks = (chunk, seen = new Set()) => {
@@ -58410,7 +58409,6 @@ function buildHtmlPlugin(config) {
                     }
                     else {
                         assetTags = [toScriptTag(chunk, toOutputAssetFilePath, isAsync)];
-                        const { modulePreload } = config.build;
                         if (modulePreload !== false) {
                             const resolveDependencies = typeof modulePreload === 'object' &&
                                 modulePreload.resolveDependencies;
@@ -62597,11 +62595,9 @@ function definePlugin(config) {
     return {
         name: 'vite:define',
         async transform(code, id) {
-            const { environment } = this;
-            if (!environment) {
+            if (!this.environment)
                 return;
-            }
-            if (environment.name === 'client' && !isBuild) {
+            if (this.environment.name === 'client' && !isBuild) {
                 // for dev we inject actual global defines in the vite client to
                 // avoid the transform cost. see the `clientInjection` and
                 // `importAnalysis` plugin.
@@ -62615,18 +62611,18 @@ function definePlugin(config) {
                 config.assetsInclude(id)) {
                 return;
             }
-            const [define, pattern] = getPattern(environment);
+            const [define, pattern] = getPattern(this.environment);
             if (!pattern)
                 return;
             // Check if our code needs any replacements before running esbuild
             pattern.lastIndex = 0;
             if (!pattern.test(code))
                 return;
-            return await replaceDefine(code, id, define, config);
+            return await replaceDefine(this.environment, code, id, define);
         },
     };
 }
-async function replaceDefine(code, id, define, config) {
+async function replaceDefine(environment, code, id, define) {
     // Because esbuild only allows JSON-serializable values, and `import.meta.env`
     // may contain values with raw identifiers, making it non-JSON-serializable,
     // we replace it with a temporary marker and then replace it back after to
@@ -62639,14 +62635,16 @@ async function replaceDefine(code, id, define, config) {
         replacementMarkers[marker] = env;
         define = { ...define, 'import.meta.env': marker };
     }
-    const esbuildOptions = config.esbuild || {};
+    const esbuildOptions = environment.config.esbuild || {};
     const result = await transform$1(code, {
         loader: 'js',
         charset: esbuildOptions.charset ?? 'utf8',
         platform: 'neutral',
         define,
         sourcefile: id,
-        sourcemap: config.command === 'build' ? !!config.build.sourcemap : true,
+        sourcemap: environment.config.command === 'build'
+            ? !!environment.options.build.sourcemap
+            : true,
     });
     // remove esbuild's <define:...> source entries
     // since they would confuse source map remapping/collapsing which expects a single source
@@ -63263,12 +63261,11 @@ function importAnalysisPlugin(config) {
     }
     return {
         name: 'vite:import-analysis',
-        async transform(source, importer, options) {
-            const ssr = options?.ssr === true;
-            const environment = this.environment;
-            if (!environment) {
+        async transform(source, importer) {
+            if (!this.environment)
                 return;
-            }
+            const environment = this.environment;
+            const ssr = environment.name !== 'client'; // TODO
             const moduleGraph = environment.moduleGraph;
             if (canSkipImportAnalysis(importer)) {
                 debug$1?.(colors$1.dim(`[skipped] ${prettifyUrl(importer, root)}`));
@@ -63909,21 +63906,25 @@ function clientInjectionsPlugin(config) {
                     .replace(`__HMR_CONFIG_NAME__`, hmrConfigNameReplacement);
             };
         },
-        async transform(code, id, options) {
+        async transform(code, id) {
+            if (!this.environment)
+                return;
+            // TODO: !environment.options.nodeCompatible ?
+            const ssr = this.environment.name !== 'client';
             if (id === normalizedClientEntry || id === normalizedEnvEntry) {
                 return injectConfigValues(code);
             }
-            else if (!options?.ssr && code.includes('process.env.NODE_ENV')) {
+            else if (!ssr && code.includes('process.env.NODE_ENV')) {
                 // replace process.env.NODE_ENV instead of defining a global
                 // for it to avoid shimming a `process` object during dev,
                 // avoiding inconsistencies between dev and build
                 const nodeEnv = config.define?.['process.env.NODE_ENV'] ||
                     JSON.stringify(process.env.NODE_ENV || config.mode);
-                return await replaceDefine(code, id, {
+                return await replaceDefine(this.environment, code, id, {
                     'process.env.NODE_ENV': nodeEnv,
                     'global.process.env.NODE_ENV': nodeEnv,
                     'globalThis.process.env.NODE_ENV': nodeEnv,
-                }, config);
+                });
             }
         },
     };
@@ -65705,11 +65706,9 @@ function cssPostPlugin(config) {
             };
         },
         async renderChunk(code, chunk, opts) {
-            const { environment } = this;
-            if (!environment) {
+            if (!this.environment)
                 return;
-            }
-            const generatedAssets = generatedAssetsMap.get(environment);
+            const generatedAssets = generatedAssetsMap.get(this.environment);
             let chunkCSS = '';
             let isPureCssChunk = true;
             const ids = Object.keys(chunk.modules);
@@ -67584,14 +67583,15 @@ function buildImportAnalysisPlugin(config) {
             return null;
         },
         generateBundle({ format }, bundle) {
-            const { environment } = this;
-            const ssr = environment?.options.build.ssr;
-            if (!environment || format !== 'es' || ssr || isWorker) {
+            if (!this.environment)
+                return;
+            const ssr = this.environment.name !== 'client'; // TODO
+            if (format !== 'es' || ssr || isWorker) {
                 return;
             }
-            const buildSourcemap = environment.options.build.sourcemap;
-            const { modulePreload } = environment.options.build;
-            const { customModulePreloadPaths, optimizeModulePreloadRelativePaths } = getModulePreloadData(environment);
+            const buildSourcemap = this.environment.options.build.sourcemap;
+            const { modulePreload } = this.environment.options.build;
+            const { customModulePreloadPaths, optimizeModulePreloadRelativePaths } = getModulePreloadData(this.environment);
             for (const file in bundle) {
                 const chunk = bundle[file];
                 // can't use chunk.dynamicImports.length here since some modules e.g.

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

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