vite 6.0.0-alpha.1 → 6.0.0-alpha.2

package/dist/node/chunks/{dep-DPzWXNBe.js → dep-DK04Q0H9.js}

@@ -1,4 +1,4 @@
-import { G as getDefaultExportFromCjs } from './dep-gq9_cnPm.js';
+import { G as getDefaultExportFromCjs } from './dep-E4cF1RpV.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-IQS-Za7F.js';

package/dist/node/chunks/{dep-BD8Vf02W.js → dep-DKZVy3_n.js}

@@ -1,4 +1,4 @@
-import { H as commonjsGlobal, G as getDefaultExportFromCjs } from './dep-gq9_cnPm.js';
+import { H as commonjsGlobal, G as getDefaultExportFromCjs } from './dep-E4cF1RpV.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-gq9_cnPm.js → dep-E4cF1RpV.js}

@@ -59587,8 +59587,13 @@ function definePlugin(config) {
             userDefineEnv[key.slice(16)] = config.define[key];
         }
     }
-    function generatePattern(ssr) {
-        const replaceProcessEnv = !ssr || config.ssr?.target === 'webworker';
+    function generatePattern(environment) {
+        // This is equivalent to the old `!ssr || config.ssr?.target === 'webworker'`
+        // TODO: We shouldn't keep options.nodeCompatible and options.webCompatible
+        // This is a place where using `!options.nodeCompatible` fails and it is confusing why
+        // Do we need a per-environment replaceProcessEnv option?
+        // Is it useful to have define be configured per-environment?
+        const replaceProcessEnv = environment.options.webCompatible;
         const define = {
             ...(replaceProcessEnv ? processEnv : {}),
             ...importMetaKeys,
@@ -59596,6 +59601,10 @@ function definePlugin(config) {
             ...importMetaFallbackKeys,
         };
         // Additional define fixes based on `ssr` value
+        // Backward compatibility. Any non client environment will get import.meta.env.SSR = true
+        // TODO: Check if we should only do this for the SSR environment and how to abstract
+        // maybe we need import.meta.env.environmentName ?
+        const ssr = environment.name !== 'client';
         if ('import.meta.env.SSR' in define) {
             define['import.meta.env.SSR'] = ssr + '';
         }
@@ -59619,13 +59628,23 @@ function definePlugin(config) {
             : null;
         return [define, pattern];
     }
-    const defaultPattern = generatePattern(false);
-    const ssrPattern = generatePattern(true);
+    const patternsCache = new WeakMap();
+    function getPattern(environment) {
+        let pattern = patternsCache.get(environment);
+        if (!pattern) {
+            pattern = generatePattern(environment);
+            patternsCache.set(environment, pattern);
+        }
+        return pattern;
+    }
     return {
         name: 'vite:define',
-        async transform(code, id, options) {
-            const ssr = options?.ssr === true;
-            if (!ssr && !isBuild) {
+        async transform(code, id) {
+            const { environment } = this;
+            if (!environment) {
+                return;
+            }
+            if (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.
@@ -59639,7 +59658,7 @@ function definePlugin(config) {
                 config.assetsInclude(id)) {
                 return;
             }
-            const [define, pattern] = ssr ? ssrPattern : defaultPattern;
+            const [define, pattern] = getPattern(environment);
             if (!pattern)
                 return;
             // Check if our code needs any replacements before running esbuild
@@ -60144,7 +60163,7 @@ function preAliasPlugin(config) {
         },
     };
 }
-// TODO: ?
+// TODO: environment?
 function optimizeAliasReplacementForSSR(id, optimizeDeps) {
     if (optimizeDeps.include?.includes(id)) {
         return true;
@@ -61124,9 +61143,12 @@ function workerImportMetaUrlPlugin(config) {
                 return true;
             }
         },
-        async transform(code, id, options) {
+        async transform(code, id) {
             const { environment } = this;
-            if (environment && !options?.ssr && isIncludeWorkerImportMetaUrl(code)) {
+            // TODO: environment, same as with assetImportMetaUrlPlugin
+            if (environment &&
+                environment.name === 'client' &&
+                isIncludeWorkerImportMetaUrl(code)) {
                 let s;
                 const cleanString = stripLiteral(code);
                 const workerImportMetaUrlRE = /\bnew\s+(?:Worker|SharedWorker)\s*\(\s*(new\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\))/dg;
@@ -61212,7 +61234,8 @@ function assetImportMetaUrlPlugin(config) {
         async transform(code, id, options) {
             const { environment } = this;
             if (environment &&
-                !options?.ssr &&
+                // TODO: Should this be done only for the client or for any webCompatible environment?
+                environment.name === 'client' &&
                 id !== preloadHelperId &&
                 id !== CLIENT_ENTRY &&
                 code.includes('new URL') &&
@@ -64139,8 +64162,7 @@ async function prepareEsbuildOptimizerRun(environment, depsInfo, processingCache
     const define = {
         'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || config.mode),
     };
-    const ssr = environment.name !== 'client'; // TODO:depsOptimizer
-    const platform = ssr && config.ssr?.target !== 'webworker' ? 'node' : 'browser';
+    const platform = environment.options.webCompatible ? 'browser' : 'node';
     const external = [...(optimizeDeps?.exclude ?? [])];
     const plugins = [...pluginsFromConfig];
     if (external.length) {
@@ -65728,7 +65750,7 @@ function cssPostPlugin(config) {
                 if (isDirectCSSRequest(id)) {
                     return null;
                 }
-                // server only
+                // server only, TODO: environment
                 if (options?.ssr) {
                     return modulesCode || `export default ${JSON.stringify(css)}`;
                 }
@@ -66405,8 +66427,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-DPzWXNBe.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-BD8Vf02W.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-DK04Q0H9.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-DKZVy3_n.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -68209,17 +68231,8 @@ async function buildEnvironment(config, environment, libOptions = false) {
                 config.logger.warnOnce(colors$1.yellow(`Vite does not support "rollupOptions.output.sourcemap". ` +
                     `Please use "build.sourcemap" instead.`));
             }
-            /**
-             * TODO:
-             * if (ssr.target === 'webworker') {
-             *   build.rollupOptions.entryFileNames = '[name].js'
-             *   build.rollupOptions.inlineDynamicImports = (typeof input === 'string' || Object.keys(input).length === 1))
-             * }
-             */
-            const ssrNodeBuild = ssr && config.ssr.target === 'node';
-            const ssrWorkerBuild = ssr && config.ssr.target === 'webworker';
             const format = output.format || 'es';
-            const jsExt = ssrNodeBuild || libOptions
+            const jsExt = !environment.options.webCompatible || libOptions
                 ? resolveOutputJsExtension(format, findNearestPackageData(config.root, config.packageCache)?.data
                     .type)
                 : 'js';
@@ -68248,7 +68261,11 @@ async function buildEnvironment(config, environment, libOptions = false) {
                     : path$o.posix.join(options.assetsDir, `[name]-[hash].[ext]`),
                 inlineDynamicImports: output.format === 'umd' ||
                     output.format === 'iife' ||
-                    (ssrWorkerBuild &&
+                    // TODO: We need an abstraction for non-client environments?
+                    // We should remove the explicit 'client' hcek here.
+                    // Or maybe `inlineDynamicImports` should be an environment option?
+                    (environment.name !== 'client' &&
+                        environment.options.webCompatible &&
                         (typeof input === 'string' || Object.keys(input).length === 1)),
                 ...output,
             };

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { E as colors, x as createLogger, r as resolveConfig, F as Environment } from './chunks/dep-gq9_cnPm.js';
+import { E as colors, x as createLogger, r as resolveConfig, F as Environment } from './chunks/dep-E4cF1RpV.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -766,7 +766,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-gq9_cnPm.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-E4cF1RpV.js').then(function (n) { return n.I; });
     try {
         const server = await createServer({
             root,
@@ -847,7 +847,7 @@ cli
     .option('--all', `[boolean] build all environments`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build, createViteBuilder } = await import('./chunks/dep-gq9_cnPm.js').then(function (n) { return n.K; });
+    const { build, createViteBuilder } = await import('./chunks/dep-E4cF1RpV.js').then(function (n) { return n.K; });
     const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
     const config = {
         root,
@@ -891,7 +891,7 @@ cli
     .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-gq9_cnPm.js').then(function (n) { return n.J; });
+    const { optimizeDeps } = await import('./chunks/dep-E4cF1RpV.js').then(function (n) { return n.J; });
     try {
         const config = await resolveConfig({
             root,
@@ -918,7 +918,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-gq9_cnPm.js').then(function (n) { return n.L; });
+    const { preview } = await import('./chunks/dep-E4cF1RpV.js').then(function (n) { return n.L; });
     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-gq9_cnPm.js';
-export { B as BuildEnvironment, D as DevEnvironment, b as build, h as buildErrorMessage, u as createFilter, x as createLogger, j as createNodeDevEnvironment, c as createServer, e as createViteBuilder, d as defineConfig, k as fetchModule, f as formatPostcssSourceMap, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, g as preprocessCSS, p as preview, r as resolveConfig, C as resolveEnvPrefix, v as rollupVersion, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-gq9_cnPm.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-E4cF1RpV.js';
+export { B as BuildEnvironment, D as DevEnvironment, b as build, h as buildErrorMessage, u as createFilter, x as createLogger, j as createNodeDevEnvironment, c as createServer, e as createViteBuilder, d as defineConfig, k as fetchModule, f as formatPostcssSourceMap, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, g as preprocessCSS, p as preview, r as resolveConfig, C as resolveEnvPrefix, v as rollupVersion, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-E4cF1RpV.js';
 import { existsSync, readFileSync } from 'node:fs';
 import { ModuleRunner, ESModulesEvaluator } from 'vite/module-runner';
 export { VERSION as version } from './constants.js';

package/package.json

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