vite 6.1.0-beta.1 → 6.1.0-beta.2

package/dist/node/chunks/{dep-B0BOsDX1.js → dep-B-U7Afbv.js}

@@ -1,4 +1,4 @@
-import { Q as commonjsGlobal, P as getDefaultExportFromCjs } from './dep-ChTE610F.js';
+import { Q as commonjsGlobal, P as getDefaultExportFromCjs } from './dep-De0zV__s.js';
 import require$$0$2 from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-BFhA-Un-.js → dep-C64BF_qg.js}

@@ -1,4 +1,4 @@
-import { P as getDefaultExportFromCjs } from './dep-ChTE610F.js';
+import { P as getDefaultExportFromCjs } from './dep-De0zV__s.js';
 import require$$0 from 'path';
 import { l as lib } from './dep-3RmXg9uo.js';
 

package/dist/node/chunks/{dep-ChTE610F.js → dep-De0zV__s.js}

@@ -20146,7 +20146,7 @@ function expandValue (value, processEnv, runningParsed) {
 
 function expand$2 (options) {
   // for use with progressive expansion
-  const runningParsed = {};
+  // const runningParsed = {}
 
   let processEnv = process.env;
   if (options && options.processEnv != null) {
@@ -20161,13 +20161,15 @@ function expand$2 (options) {
     if (processEnv[key] && processEnv[key] !== value) {
       value = processEnv[key];
     } else {
-      value = expandValue(value, processEnv, runningParsed);
+      // PATCH: we pass options.parsed instead of runningParsed
+      //        to allow variables declared in other files to be used
+      value = expandValue(value, processEnv, options.parsed);
     }
 
     options.parsed[key] = _resolveEscapeSequences(value);
 
     // for use with progressive expansion
-    runningParsed[key] = _resolveEscapeSequences(value);
+    // runningParsed[key] = _resolveEscapeSequences(value)
   }
 
   for (const processKey in options.parsed) {
@@ -20241,7 +20243,7 @@ function resolveEnvPrefix({
   return envPrefix;
 }
 
-const docsURL = "https://main.vite.dev";
+const docsURL = "https://vite.dev";
 const deprecationCode = {
   removePluginHookSsrArgument: "changes/this-environment-in-hooks",
   removePluginHookHandleHotUpdate: "changes/hotupdate-hook",
@@ -42014,7 +42016,7 @@ ${js}`;
       }
     },
     async generateBundle(options, bundle) {
-      const analyzedChunk = /* @__PURE__ */ new Map();
+      const analyzedImportedCssFiles = /* @__PURE__ */ new Map();
       const inlineEntryChunk = /* @__PURE__ */ new Set();
       const getImportedChunks = (chunk, seen = /* @__PURE__ */ new Set()) => {
         const chunks = [];
@@ -42055,32 +42057,44 @@ ${js}`;
           href: toOutputPath(filename)
         }
       });
-      const getCssTagsForChunk = (chunk, toOutputPath, seen = /* @__PURE__ */ new Set()) => {
-        const tags = [];
-        if (!analyzedChunk.has(chunk)) {
-          analyzedChunk.set(chunk, 1);
-          chunk.imports.forEach((file) => {
-            const importee = bundle[file];
-            if (importee?.type === "chunk") {
-              tags.push(...getCssTagsForChunk(importee, toOutputPath, seen));
-            }
-          });
+      const toStyleSheetLinkTag = (file, toOutputPath) => ({
+        tag: "link",
+        attrs: {
+          rel: "stylesheet",
+          crossorigin: true,
+          href: toOutputPath(file)
         }
+      });
+      const getCssFilesForChunk = (chunk, seenChunks = /* @__PURE__ */ new Set(), seenCss = /* @__PURE__ */ new Set()) => {
+        if (seenChunks.has(chunk.fileName)) {
+          return [];
+        }
+        seenChunks.add(chunk.fileName);
+        if (analyzedImportedCssFiles.has(chunk)) {
+          const files2 = analyzedImportedCssFiles.get(chunk);
+          const additionals = files2.filter((file) => !seenCss.has(file));
+          additionals.forEach((file) => seenCss.add(file));
+          return additionals;
+        }
+        const files = [];
+        chunk.imports.forEach((file) => {
+          const importee = bundle[file];
+          if (importee?.type === "chunk") {
+            files.push(...getCssFilesForChunk(importee, seenChunks, seenCss));
+          }
+        });
+        analyzedImportedCssFiles.set(chunk, files);
         chunk.viteMetadata.importedCss.forEach((file) => {
-          if (!seen.has(file)) {
-            seen.add(file);
-            tags.push({
-              tag: "link",
-              attrs: {
-                rel: "stylesheet",
-                crossorigin: true,
-                href: toOutputPath(file)
-              }
-            });
+          if (!seenCss.has(file)) {
+            seenCss.add(file);
+            files.push(file);
           }
         });
-        return tags;
+        return files;
       };
+      const getCssTagsForChunk = (chunk, toOutputPath) => getCssFilesForChunk(chunk).map(
+        (file) => toStyleSheetLinkTag(file, toOutputPath)
+      );
       for (const [normalizedId, html] of processedHtml(this)) {
         const relativeUrlPath = normalizePath$3(
           path$d.relative(config.root, normalizedId)
@@ -49048,8 +49062,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-BFhA-Un-.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-B0BOsDX1.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-C64BF_qg.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-B-U7Afbv.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -50319,7 +50333,7 @@ function resolveLibCssFilename(libOptions, root, packageCache) {
   } else if (typeof libOptions.fileName === "string") {
     return `${libOptions.fileName}.css`;
   }
-  const packageJson = findNearestPackageData(root, packageCache)?.data;
+  const packageJson = findNearestMainPackageData(root, packageCache)?.data;
   const name = packageJson ? getPkgName(packageJson.name) : undefined;
   if (!name)
     throw new Error(
@@ -51345,7 +51359,7 @@ function resolveLibFilename(libOptions, format, entryName, root, extension, pack
   if (typeof libOptions.fileName === "function") {
     return libOptions.fileName(format, entryName);
   }
-  const packageJson = findNearestPackageData(root, packageCache)?.data;
+  const packageJson = findNearestMainPackageData(root, packageCache)?.data;
   const name = libOptions.fileName || (packageJson && typeof libOptions.entry === "string" ? getPkgName(packageJson.name) : entryName);
   if (!name)
     throw new Error(

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs__default from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { O as colors, I as createLogger, r as resolveConfig } from './chunks/dep-ChTE610F.js';
+import { O as colors, I as createLogger, r as resolveConfig } from './chunks/dep-De0zV__s.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -745,7 +745,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   `[boolean] force the optimizer to ignore the cache and re-bundle`
 ).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { createServer } = await import('./chunks/dep-ChTE610F.js').then(function (n) { return n.S; });
+  const { createServer } = await import('./chunks/dep-De0zV__s.js').then(function (n) { return n.S; });
   try {
     const server = await createServer({
       root,
@@ -839,7 +839,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
 ).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--app", `[boolean] same as \`builder: {}\``).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { createBuilder } = await import('./chunks/dep-ChTE610F.js').then(function (n) { return n.T; });
+    const { createBuilder } = await import('./chunks/dep-De0zV__s.js').then(function (n) { return n.T; });
     const buildOptions = cleanGlobalCLIOptions(
       cleanBuilderCLIOptions(options)
     );
@@ -875,7 +875,7 @@ cli.command("optimize [root]", "pre-bundle dependencies").option(
 ).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-ChTE610F.js').then(function (n) { return n.R; });
+    const { optimizeDeps } = await import('./chunks/dep-De0zV__s.js').then(function (n) { return n.R; });
     try {
       const config = await resolveConfig(
         {
@@ -902,7 +902,7 @@ ${e.stack}`),
 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-ChTE610F.js').then(function (n) { return n.U; });
+    const { preview } = await import('./chunks/dep-De0zV__s.js').then(function (n) { return n.U; });
     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-ChTE610F.js';
-export { B as BuildEnvironment, D as DevEnvironment, f as build, m as buildErrorMessage, g as createBuilder, F as createFilter, h as createIdResolver, I as createLogger, n as createRunnableDevEnvironment, c as createServer, y as createServerHotChannel, w as createServerModuleRunner, x as createServerModuleRunnerTransport, d as defineConfig, v as fetchModule, j as formatPostcssSourceMap, L as isFileLoadingAllowed, K as isFileServingAllowed, q as isRunnableDevEnvironment, l as loadConfigFromFile, M as loadEnv, E as mergeAlias, C as mergeConfig, z as moduleRunnerTransform, A as normalizePath, o as optimizeDeps, p as perEnvironmentPlugin, b as perEnvironmentState, k as preprocessCSS, e as preview, r as resolveConfig, N as resolveEnvPrefix, G as rollupVersion, u as runnerImport, J as searchForWorkspaceRoot, H as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-ChTE610F.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-De0zV__s.js';
+export { B as BuildEnvironment, D as DevEnvironment, f as build, m as buildErrorMessage, g as createBuilder, F as createFilter, h as createIdResolver, I as createLogger, n as createRunnableDevEnvironment, c as createServer, y as createServerHotChannel, w as createServerModuleRunner, x as createServerModuleRunnerTransport, d as defineConfig, v as fetchModule, j as formatPostcssSourceMap, L as isFileLoadingAllowed, K as isFileServingAllowed, q as isRunnableDevEnvironment, l as loadConfigFromFile, M as loadEnv, E as mergeAlias, C as mergeConfig, z as moduleRunnerTransform, A as normalizePath, o as optimizeDeps, p as perEnvironmentPlugin, b as perEnvironmentState, k as preprocessCSS, e as preview, r as resolveConfig, N as resolveEnvPrefix, G as rollupVersion, u as runnerImport, J as searchForWorkspaceRoot, H as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-De0zV__s.js';
 export { defaultAllowedOrigins, DEFAULT_CLIENT_CONDITIONS as defaultClientConditions, DEFAULT_CLIENT_MAIN_FIELDS as defaultClientMainFields, DEFAULT_SERVER_CONDITIONS as defaultServerConditions, DEFAULT_SERVER_MAIN_FIELDS as defaultServerMainFields, VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import 'node:fs';

package/dist/node-cjs/publicUtils.cjs

@@ -6311,7 +6311,7 @@ function expandValue (value, processEnv, runningParsed) {
 
 function expand (options) {
   // for use with progressive expansion
-  const runningParsed = {};
+  // const runningParsed = {}
 
   let processEnv = process.env;
   if (options && options.processEnv != null) {
@@ -6326,13 +6326,15 @@ function expand (options) {
     if (processEnv[key] && processEnv[key] !== value) {
       value = processEnv[key];
     } else {
-      value = expandValue(value, processEnv, runningParsed);
+      // PATCH: we pass options.parsed instead of runningParsed
+      //        to allow variables declared in other files to be used
+      value = expandValue(value, processEnv, options.parsed);
     }
 
     options.parsed[key] = _resolveEscapeSequences(value);
 
     // for use with progressive expansion
-    runningParsed[key] = _resolveEscapeSequences(value);
+    // runningParsed[key] = _resolveEscapeSequences(value)
   }
 
   for (const processKey in options.parsed) {

package/package.json

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