vite 6.0.6 → 6.0.7

package/dist/node/chunks/{dep-0AosnpPU.js → dep-BJP6rrE_.js}

@@ -12276,13 +12276,17 @@ const rollupToEsbuildFormatMap = {
   // but thankfully rollup does not do this optimization now
   iife: void 0
 };
-const buildEsbuildPlugin = (config) => {
+const buildEsbuildPlugin = () => {
   return {
     name: "vite:esbuild-transpile",
+    applyToEnvironment(environment) {
+      return environment.config.esbuild !== false;
+    },
     async renderChunk(code, chunk, opts) {
       if (opts.__vite_skip_esbuild__) {
         return null;
       }
+      const config = this.environment.config;
       const options = resolveEsbuildTranspileOptions(config, opts.format);
       if (!options) {
         return null;
@@ -31297,7 +31301,7 @@ Object.defineProperty(${ssrModuleExportsKey}, "default", { enumerable: true, con
       for (let i = 0; i < statements.length - 1; i++) {
         const stmt = statements[i];
         if (code[stmt.end - 1] !== ";" && stmt.type !== "FunctionDeclaration" && stmt.type !== "ClassDeclaration" && stmt.type !== "BlockStatement" && stmt.type !== "ImportDeclaration") {
-          s.appendRight(stmt.end, ";");
+          s.appendLeft(stmt.end, ";");
         }
       }
     },
@@ -41402,7 +41406,7 @@ async function traverseHtml(html, filePath, visitor) {
 }
 function getScriptInfo(node) {
   let src;
-  let sourceCodeLocation;
+  let srcSourceCodeLocation;
   let isModule = false;
   let isAsync = false;
   let isIgnored = false;
@@ -41411,7 +41415,7 @@ function getScriptInfo(node) {
     if (p.name === "src") {
       if (!src) {
         src = p;
-        sourceCodeLocation = node.sourceCodeLocation?.attrs["src"];
+        srcSourceCodeLocation = node.sourceCodeLocation?.attrs["src"];
       }
     } else if (p.name === "type" && p.value && p.value === "module") {
       isModule = true;
@@ -41421,7 +41425,7 @@ function getScriptInfo(node) {
       isIgnored = true;
     }
   }
-  return { src, sourceCodeLocation, isModule, isAsync, isIgnored };
+  return { src, srcSourceCodeLocation, isModule, isAsync, isIgnored };
 }
 const attrValueStartRE = /=\s*(.)/;
 function overwriteAttrValue(s, sourceCodeLocation, newValue) {
@@ -41565,7 +41569,7 @@ function buildHtmlPlugin(config) {
           }
           let shouldRemove = false;
           if (node.nodeName === "script") {
-            const { src, sourceCodeLocation, isModule, isAsync, isIgnored } = getScriptInfo(node);
+            const { src, srcSourceCodeLocation, isModule, isAsync, isIgnored } = getScriptInfo(node);
             if (isIgnored) {
               removeViteIgnoreAttr(s, node.sourceCodeLocation);
             } else {
@@ -41574,7 +41578,7 @@ function buildHtmlPlugin(config) {
               if (isPublicFile) {
                 overwriteAttrValue(
                   s,
-                  sourceCodeLocation,
+                  srcSourceCodeLocation,
                   partialEncodeURIPath(toOutputPublicFilePath(url))
                 );
               }
@@ -42693,9 +42697,9 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
       return;
     }
     if (node.nodeName === "script") {
-      const { src, sourceCodeLocation, isModule, isIgnored } = getScriptInfo(node);
+      const { src, srcSourceCodeLocation, isModule, isIgnored } = getScriptInfo(node);
       if (isIgnored) {
-        removeViteIgnoreAttr(s, sourceCodeLocation);
+        removeViteIgnoreAttr(s, node.sourceCodeLocation);
       } else if (src) {
         const processedUrl = processNodeUrl(
           src.value,
@@ -42708,7 +42712,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
           !isModule
         );
         if (processedUrl !== src.value) {
-          overwriteAttrValue(s, sourceCodeLocation, processedUrl);
+          overwriteAttrValue(s, srcSourceCodeLocation, processedUrl);
         }
       } else if (isModule && node.childNodes.length) {
         addInlineModule(node, "js");
@@ -47124,7 +47128,7 @@ class EnvironmentPluginContainer {
     const ctx = new ResolveIdContext(this, skip, skipCalls, scan);
     const mergedSkip = new Set(skip);
     for (const call of skipCalls ?? []) {
-      if (call.id === rawId && call.importer === importer) {
+      if (call.called || call.id === rawId && call.importer === importer) {
         mergedSkip.add(call.plugin);
       }
     }
@@ -47292,10 +47296,26 @@ class PluginContext {
     return parseAst(code, opts);
   }
   async resolve(id, importer, options) {
-    const skipCalls = options?.skipSelf === false ? this._resolveSkipCalls : [
-      ...this._resolveSkipCalls || [],
-      { id, importer, plugin: this._plugin }
-    ];
+    let skipCalls;
+    if (options?.skipSelf === false) {
+      skipCalls = this._resolveSkipCalls;
+    } else if (this._resolveSkipCalls) {
+      const skipCallsTemp = [...this._resolveSkipCalls];
+      const sameCallIndex = this._resolveSkipCalls.findIndex(
+        (c) => c.id === id && c.importer === importer && c.plugin === this._plugin
+      );
+      if (sameCallIndex !== -1) {
+        skipCallsTemp[sameCallIndex] = {
+          ...skipCallsTemp[sameCallIndex],
+          called: true
+        };
+      } else {
+        skipCallsTemp.push({ id, importer, plugin: this._plugin });
+      }
+      skipCalls = skipCallsTemp;
+    } else {
+      skipCalls = [{ id, importer, plugin: this._plugin }];
+    }
     let out = await this._container.resolveId(id, importer, {
       attributes: options?.attributes,
       custom: options?.custom,
@@ -48617,7 +48637,7 @@ async function compileCSS(environment, id, code, workerController, urlReplacer)
         }
       } else if (message.type === "warning") {
         const warning = message;
-        let msg = `[vite:css] ${warning.text}`;
+        let msg = `[vite:css][postcss] ${warning.text}`;
         msg += `
 ${generateCodeFrame(
           code,
@@ -48682,8 +48702,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-BGGf7Pd3.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-Dt4uNHQP.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-Cpceb51t.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-DB1BmmOk.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -48903,25 +48923,44 @@ async function doImportCSSReplace(rawUrl, matched, replacer) {
 }
 async function minifyCSS(css, config, inlined) {
   if (config.build.cssMinify === "lightningcss") {
-    const { code, warnings } = (await importLightningCSS()).transform({
-      ...config.css.lightningcss,
-      targets: convertTargets(config.build.cssTarget),
-      cssModules: void 0,
-      // TODO: Pass actual filename here, which can also be passed to esbuild's
-      // `sourcefile` option below to improve error messages
-      filename: defaultCssBundleName,
-      code: Buffer.from(css),
-      minify: true
-    });
-    if (warnings.length) {
-      config.logger.warn(
-        colors$1.yellow(
-          `warnings when minifying css:
-${warnings.map((w) => w.message).join("\n")}`
-        )
-      );
+    try {
+      const { code, warnings } = (await importLightningCSS()).transform({
+        ...config.css.lightningcss,
+        targets: convertTargets(config.build.cssTarget),
+        cssModules: void 0,
+        // TODO: Pass actual filename here, which can also be passed to esbuild's
+        // `sourcefile` option below to improve error messages
+        filename: defaultCssBundleName,
+        code: Buffer.from(css),
+        minify: true
+      });
+      if (warnings.length) {
+        const messages = warnings.map(
+          (warning) => `${warning.message}
+` + generateCodeFrame(css, {
+            line: warning.loc.line,
+            column: warning.loc.column - 1
+            // 1-based
+          })
+        );
+        config.logger.warn(
+          colors$1.yellow(`warnings when minifying css:
+${messages.join("\n")}`)
+        );
+      }
+      return decoder.decode(code) + (inlined ? "" : "\n");
+    } catch (e) {
+      e.message = `[lightningcss minify] ${e.message}`;
+      if (e.loc) {
+        e.loc = {
+          line: e.loc.line,
+          column: e.loc.column - 1
+          // 1-based
+        };
+        e.frame = generateCodeFrame(css, e.loc);
+      }
+      throw e;
     }
-    return decoder.decode(code) + (inlined ? "" : "\n");
   }
   try {
     const { code, warnings } = await transform$1(css, {
@@ -49774,6 +49813,16 @@ async function compileLightningCSS(id, src, environment, urlReplacer) {
     }
     throw e;
   }
+  for (const warning of res.warnings) {
+    let msg = `[vite:css][lightningcss] ${warning.message}`;
+    msg += `
+${generateCodeFrame(src, {
+      line: warning.loc.line,
+      column: warning.loc.column - 1
+      // 1-based
+    })}`;
+    environment.logger.warn(colors$1.yellow(msg));
+  }
   let css = decoder.decode(res.code);
   for (const dep of res.dependencies) {
     switch (dep.type) {
@@ -50619,7 +50668,7 @@ async function resolveBuildPlugins(config) {
     ],
     post: [
       buildImportAnalysisPlugin(config),
-      ...config.esbuild !== false ? [buildEsbuildPlugin(config)] : [],
+      buildEsbuildPlugin(),
       terserPlugin(config),
       ...!config.isWorker ? [manifestPlugin(), ssrManifestPlugin(), buildReporterPlugin(config)] : [],
       buildLoadFallbackPlugin()
@@ -52380,12 +52429,30 @@ function fileToUrl(file, root) {
 }
 async function mapFiles(files, root) {
   if (!files.length) return [];
-  return await glob(files, {
-    absolute: true,
-    cwd: root,
-    expandDirectories: false,
-    ignore: ["**/.git/**", "**/node_modules/**"]
-  });
+  const result = [];
+  const globs = [];
+  for (const file of files) {
+    if (isDynamicPattern(file)) {
+      globs.push(file);
+    } else {
+      if (path$d.isAbsolute(file)) {
+        result.push(file);
+      } else {
+        result.push(path$d.resolve(root, file));
+      }
+    }
+  }
+  if (globs.length) {
+    result.push(
+      ...await glob(globs, {
+        absolute: true,
+        cwd: root,
+        expandDirectories: false,
+        ignore: ["**/.git/**", "**/node_modules/**"]
+      })
+    );
+  }
+  return result;
 }
 
 class DevEnvironment extends BaseEnvironment {

package/dist/node/chunks/{dep-BGGf7Pd3.js → dep-Cpceb51t.js}

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

package/dist/node/chunks/{dep-Dt4uNHQP.js → dep-DB1BmmOk.js}

@@ -1,4 +1,4 @@
-import { O as commonjsGlobal, N as getDefaultExportFromCjs } from './dep-0AosnpPU.js';
+import { O as commonjsGlobal, N as getDefaultExportFromCjs } from './dep-BJP6rrE_.js';
 import require$$0$2 from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

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 { M as colors, G as createLogger, r as resolveConfig } from './chunks/dep-0AosnpPU.js';
+import { M as colors, G as createLogger, r as resolveConfig } from './chunks/dep-BJP6rrE_.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -740,7 +740,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-0AosnpPU.js').then(function (n) { return n.Q; });
+  const { createServer } = await import('./chunks/dep-BJP6rrE_.js').then(function (n) { return n.Q; });
   try {
     const server = await createServer({
       root,
@@ -833,7 +833,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-0AosnpPU.js').then(function (n) { return n.R; });
+    const { createBuilder } = await import('./chunks/dep-BJP6rrE_.js').then(function (n) { return n.R; });
     const buildOptions = cleanGlobalCLIOptions(
       cleanBuilderCLIOptions(options)
     );
@@ -868,7 +868,7 @@ cli.command("optimize [root]", "pre-bundle dependencies").option(
 ).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-0AosnpPU.js').then(function (n) { return n.P; });
+    const { optimizeDeps } = await import('./chunks/dep-BJP6rrE_.js').then(function (n) { return n.P; });
     try {
       const config = await resolveConfig(
         {
@@ -894,7 +894,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-0AosnpPU.js').then(function (n) { return n.S; });
+    const { preview } = await import('./chunks/dep-BJP6rrE_.js').then(function (n) { return n.S; });
     try {
       const server = await preview({
         root,

package/dist/node/index.d.ts

@@ -2779,6 +2779,7 @@ type SkipInformation = {
     id: string;
     importer: string | undefined;
     plugin: Plugin;
+    called?: boolean;
 };
 declare class EnvironmentPluginContainer {
     environment: Environment;

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-0AosnpPU.js';
-export { B as BuildEnvironment, D as DevEnvironment, f as build, m as buildErrorMessage, g as createBuilder, C as createFilter, h as createIdResolver, G as createLogger, n as createRunnableDevEnvironment, c as createServer, w as createServerHotChannel, v as createServerModuleRunner, d as defineConfig, u as fetchModule, j as formatPostcssSourceMap, J as isFileLoadingAllowed, I as isFileServingAllowed, q as isRunnableDevEnvironment, l as loadConfigFromFile, K as loadEnv, A as mergeAlias, z as mergeConfig, x as moduleRunnerTransform, y as normalizePath, o as optimizeDeps, p as perEnvironmentPlugin, b as perEnvironmentState, k as preprocessCSS, e as preview, r as resolveConfig, L as resolveEnvPrefix, E as rollupVersion, H as searchForWorkspaceRoot, F as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-0AosnpPU.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-BJP6rrE_.js';
+export { B as BuildEnvironment, D as DevEnvironment, f as build, m as buildErrorMessage, g as createBuilder, C as createFilter, h as createIdResolver, G as createLogger, n as createRunnableDevEnvironment, c as createServer, w as createServerHotChannel, v as createServerModuleRunner, d as defineConfig, u as fetchModule, j as formatPostcssSourceMap, J as isFileLoadingAllowed, I as isFileServingAllowed, q as isRunnableDevEnvironment, l as loadConfigFromFile, K as loadEnv, A as mergeAlias, z as mergeConfig, x as moduleRunnerTransform, y as normalizePath, o as optimizeDeps, p as perEnvironmentPlugin, b as perEnvironmentState, k as preprocessCSS, e as preview, r as resolveConfig, L as resolveEnvPrefix, E as rollupVersion, H as searchForWorkspaceRoot, F as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-BJP6rrE_.js';
 export { 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.6",
+  "version": "6.0.7",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",