vite 5.1.5 → 5.1.6

package/dist/node/chunks/{dep-WMYkPWs9.js → dep-pxQDj-UY.js}

@@ -1,4 +1,4 @@
-import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-G-px366b.js';
+import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-jvB8WLp9.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-OHeF5w5D.js → dep-sFlFG1c_.js}

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-G-px366b.js';
+import { B as getDefaultExportFromCjs } from './dep-jvB8WLp9.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-8a-6Quh6.js';

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 { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-G-px366b.js';
+import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-jvB8WLp9.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -757,7 +757,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-G-px366b.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-jvB8WLp9.js').then(function (n) { return n.E; });
     try {
         const server = await createServer({
             root,
@@ -836,7 +836,7 @@ cli
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build } = await import('./chunks/dep-G-px366b.js').then(function (n) { return n.F; });
+    const { build } = await import('./chunks/dep-jvB8WLp9.js').then(function (n) { return n.F; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -863,7 +863,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-G-px366b.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-jvB8WLp9.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
@@ -889,7 +889,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-G-px366b.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-jvB8WLp9.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -15,8 +15,8 @@ import * as url from 'node:url';
 import { URL } from 'node:url';
 import * as stream from 'node:stream';
 import { Duplex, DuplexOptions } from 'node:stream';
-import { F as FetchResult, H as HMRLogger } from './types.d-AKzkD8vd.js';
-export { a as FetchFunction } from './types.d-AKzkD8vd.js';
+import { F as FetchResult, H as HMRLogger } from './types.d-FdqQ54oU.js';
+export { a as FetchFunction } from './types.d-FdqQ54oU.js';
 import { SecureContextOptions } from 'node:tls';
 import { ZlibOptions } from 'node:zlib';
 import { HMRPayload, CustomPayload } from '../../types/hmrPayload.js';
@@ -1615,9 +1615,9 @@ interface ServerOptions extends CommonServerOptions {
      */
     sourcemapIgnoreList?: false | ((sourcePath: string, sourcemapPath: string) => boolean);
 }
-interface ResolvedServerOptions extends ServerOptions {
+interface ResolvedServerOptions extends Omit<ServerOptions, 'fs' | 'middlewareMode' | 'sourcemapIgnoreList'> {
     fs: Required<FileSystemServeOptions>;
-    middlewareMode: boolean;
+    middlewareMode: NonNullable<ServerOptions['middlewareMode']>;
     sourcemapIgnoreList: Exclude<ServerOptions['sourcemapIgnoreList'], false | undefined>;
 }
 interface FileSystemServeOptions {
@@ -3341,7 +3341,7 @@ interface LegacyOptions {
 }
 interface ResolvedWorkerOptions {
     format: 'es' | 'iife';
-    plugins: () => Promise<Plugin[]>;
+    plugins: (bundleChain: string[]) => Promise<Plugin[]>;
     rollupOptions: RollupOptions;
 }
 interface InlineConfig extends UserConfig {

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-G-px366b.js';
-export { b as build, g as buildErrorMessage, k as createFilter, v as createLogger, c as createServer, d as defineConfig, h as fetchModule, f as formatPostcssSourceMap, x as isFileServingAllowed, l as loadConfigFromFile, y as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, e as preprocessCSS, p as preview, r as resolveConfig, z as resolveEnvPrefix, q as rollupVersion, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-G-px366b.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-jvB8WLp9.js';
+export { b as build, g as buildErrorMessage, k as createFilter, v as createLogger, c as createServer, d as defineConfig, h as fetchModule, f as formatPostcssSourceMap, x as isFileServingAllowed, l as loadConfigFromFile, y as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, e as preprocessCSS, p as preview, r as resolveConfig, z as resolveEnvPrefix, q as rollupVersion, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-jvB8WLp9.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import { existsSync, readFileSync } from 'node:fs';

package/dist/node/runtime.d.ts

@@ -1,5 +1,5 @@
-import { V as ViteRuntimeOptions, b as ViteModuleRunner, M as ModuleCacheMap, c as HMRClient, R as ResolvedResult, d as ViteRuntimeModuleContext } from './types.d-AKzkD8vd.js';
-export { a as FetchFunction, F as FetchResult, e as HMRConnection, H as HMRLogger, g as HMRRuntimeConnection, f as ModuleCache, S as SSRImportMetadata, h as ViteRuntimeImportMeta, s as ssrDynamicImportKey, i as ssrExportAllKey, j as ssrImportKey, k as ssrImportMetaKey, l as ssrModuleExportsKey } from './types.d-AKzkD8vd.js';
+import { V as ViteRuntimeOptions, b as ViteModuleRunner, M as ModuleCacheMap, c as HMRClient, R as ResolvedResult, d as ViteRuntimeModuleContext } from './types.d-FdqQ54oU.js';
+export { a as FetchFunction, F as FetchResult, e as HMRConnection, H as HMRLogger, g as HMRRuntimeConnection, f as ModuleCache, S as SSRImportMetadata, h as ViteRuntimeImportMeta, s as ssrDynamicImportKey, i as ssrExportAllKey, j as ssrImportKey, k as ssrImportMetaKey, l as ssrModuleExportsKey } from './types.d-FdqQ54oU.js';
 import '../../types/hot.js';
 import '../../types/hmrPayload.js';
 import '../../types/customEvent.js';

package/dist/node/runtime.js

@@ -1,13 +1,17 @@
 const VALID_ID_PREFIX = "/@id/", NULL_BYTE_PLACEHOLDER = "__x00__";
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
-const VITE_RUNTIME_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`, isWindows = typeof process < "u" && process.platform === "win32";
+const isWindows = typeof process < "u" && process.platform === "win32";
 function wrapId(id) {
   return id.startsWith(VALID_ID_PREFIX) ? id : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
 }
 function unwrapId(id) {
   return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, "\0") : id;
 }
+const windowsSlashRE = /\\/g;
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
 const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
   return url.replace(postfixRE, "");
@@ -18,7 +22,8 @@ function isPrimitive(value) {
 function withTrailingSlash(path) {
   return path[path.length - 1] !== "/" ? `${path}/` : path;
 }
-const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
+const AsyncFunction = async function() {
+}.constructor, _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
   return input && input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
 }
@@ -215,7 +220,7 @@ function getOriginalPosition(map, needle) {
   const result = originalPositionFor(map, needle);
   return result.column == null ? null : result;
 }
-const VITE_RUNTIME_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_RUNTIME_SOURCEMAPPING_URL};base64,(.+)`);
+const VITE_RUNTIME_SOURCEMAPPING_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json;base64,(.+)`);
 class ModuleCacheMap extends Map {
   root;
   constructor(root, entries) {
@@ -321,7 +326,7 @@ const prefixedBuiltins = /* @__PURE__ */ new Set(["node:test"]);
 function normalizeModuleId(file, root) {
   if (prefixedBuiltins.has(file))
     return file;
-  let unixFile = file.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
+  let unixFile = slash(file).replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
   return unixFile.startsWith(root) && (unixFile = unixFile.slice(root.length - 1)), unixFile.replace(/^file:\//, "/");
 }
 class HMRContext {
@@ -493,6 +498,29 @@ class HMRClient {
     };
   }
 }
+function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
+  if (!metadata?.isDynamicImport && moduleType !== "module" && metadata?.importedNames?.length) {
+    const missingBindings = metadata.importedNames.filter((s) => !(s in mod));
+    if (missingBindings.length) {
+      const lastBinding = missingBindings[missingBindings.length - 1];
+      throw new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
+CommonJS modules can always be imported via the default export, for example using:
+
+import pkg from '${rawId}';
+const {${missingBindings.join(", ")}} = pkg;
+`);
+    }
+  }
+}
+function proxyGuardOnlyEsm(mod, rawId, metadata) {
+  return metadata?.importedNames?.length ? new Proxy(mod, {
+    get(mod2, prop) {
+      if (prop !== "then" && !(prop in mod2))
+        throw new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
+      return mod2[prop];
+    }
+  }) : mod;
+}
 const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrImportMetaKey = "__vite_ssr_import_meta__", noop = () => {
 }, silentConsole = {
   debug: noop,
@@ -575,22 +603,22 @@ const sourceMapCache = {}, fileContentsCache = {}, moduleGraphs = /* @__PURE__ *
       return result;
   }
   return null;
-}, retrieveFileFromHandlers = createExecHandlers(retrieveFileHandlers), retrievSourceMapFromHandlers = createExecHandlers(retrieveSourceMapHandlers);
-let overriden = !1;
+}, retrieveFileFromHandlers = createExecHandlers(retrieveFileHandlers), retrieveSourceMapFromHandlers = createExecHandlers(retrieveSourceMapHandlers);
+let overridden = !1;
 const originalPrepare = Error.prepareStackTrace;
 function resetInterceptor(runtime, options) {
-  moduleGraphs.delete(runtime.moduleCache), options.retrieveFile && retrieveFileHandlers.delete(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.delete(options.retrieveSourceMap), moduleGraphs.size === 0 && (Error.prepareStackTrace = originalPrepare, overriden = !1);
+  moduleGraphs.delete(runtime.moduleCache), options.retrieveFile && retrieveFileHandlers.delete(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.delete(options.retrieveSourceMap), moduleGraphs.size === 0 && (Error.prepareStackTrace = originalPrepare, overridden = !1);
 }
 function interceptStackTrace(runtime, options = {}) {
-  return overriden || (Error.prepareStackTrace = prepareStackTrace, overriden = !0), moduleGraphs.add(runtime.moduleCache), options.retrieveFile && retrieveFileHandlers.add(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.add(options.retrieveSourceMap), () => resetInterceptor(runtime, options);
+  return overridden || (Error.prepareStackTrace = prepareStackTrace, overridden = !0), moduleGraphs.add(runtime.moduleCache), options.retrieveFile && retrieveFileHandlers.add(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.add(options.retrieveSourceMap), () => resetInterceptor(runtime, options);
 }
 function supportRelativeURL(file, url) {
   if (!file)
     return url;
-  const dir = posixDirname(file.replace(/\\/g, "/")), match = /^\w+:\/\/[^/]*/.exec(dir);
+  const dir = posixDirname(slash(file)), match = /^\w+:\/\/[^/]*/.exec(dir);
   let protocol = match ? match[0] : "";
   const startPath = dir.slice(protocol.length);
-  return protocol && /^\/\w:/.test(startPath) ? (protocol += "/", protocol + posixResolve(dir.slice(protocol.length), url).replace(/\\/g, "/")) : protocol + posixResolve(dir.slice(protocol.length), url);
+  return protocol && /^\/\w:/.test(startPath) ? (protocol += "/", protocol + slash(posixResolve(startPath, url))) : protocol + posixResolve(startPath, url);
 }
 function getRuntimeSourceMap(position) {
   for (const moduleCache of moduleGraphs) {
@@ -622,7 +650,7 @@ function retrieveSourceMapURL(source) {
 }
 const reSourceMap = /^data:application\/json[^,]+base64,/;
 function retrieveSourceMap(source) {
-  const urlAndMap = retrievSourceMapFromHandlers(source);
+  const urlAndMap = retrieveSourceMapFromHandlers(source);
   if (urlAndMap)
     return urlAndMap;
   let sourceMappingURL = retrieveSourceMapURL(source);
@@ -847,7 +875,7 @@ class ViteRuntime {
   normalizeEntryUrl(url) {
     if (url[0] === ".")
       return url;
-    url.startsWith("file://") && (url = url.slice(isWindows ? 8 : 7)), url = url.replace(/\\/g, "/");
+    url.startsWith("file://") && (url = url.slice(isWindows ? 8 : 7)), url = slash(url);
     const _root = this.options.root, root = _root[_root.length - 1] === "/" ? _root : `${_root}/`;
     return url.startsWith(root) ? url.slice(root.length - 1) : url[0] === "/" ? url : wrapId(url);
   }
@@ -968,31 +996,6 @@ function exportAll(exports, sourceModule) {
         }
   }
 }
-function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
-  if (!metadata?.isDynamicImport && moduleType !== "module" && metadata?.importedNames?.length) {
-    const missingBindings = metadata.importedNames.filter((s) => !(s in mod));
-    if (missingBindings.length) {
-      const lastBinding = missingBindings[missingBindings.length - 1];
-      throw new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
-CommonJS modules can always be imported via the default export, for example using:
-
-import pkg from '${rawId}';
-const {${missingBindings.join(", ")}} = pkg;
-`);
-    }
-  }
-}
-function proxyGuardOnlyEsm(mod, rawId, metadata) {
-  return metadata?.importedNames?.length ? new Proxy(mod, {
-    get(mod2, prop) {
-      if (prop !== "then" && !(prop in mod2))
-        throw new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
-      return mod2[prop];
-    }
-  }) : mod;
-}
-const AsyncFunction = async function() {
-}.constructor;
 class ESModulesRunner {
   async runViteModule(context, code) {
     await new AsyncFunction(

package/dist/node/{types.d-AKzkD8vd.d.ts → types.d-FdqQ54oU.d.ts}

@@ -58,6 +58,22 @@ declare class HMRClient {
     private fetchUpdate;
 }
 
+interface DefineImportMetadata {
+    /**
+     * Imported names before being transformed to `ssrImportKey`
+     *
+     * import foo, { bar as baz, qux } from 'hello'
+     * => ['default', 'bar', 'qux']
+     *
+     * import * as namespace from 'world
+     * => undefined
+     */
+    importedNames?: string[];
+}
+interface SSRImportBaseMetadata extends DefineImportMetadata {
+    isDynamicImport?: boolean;
+}
+
 interface SourceMapLike {
     version: number;
     mappings?: string;
@@ -132,17 +148,8 @@ interface InterceptorOptions {
     retrieveSourceMap?: RetrieveSourceMapHandler;
 }
 
-interface DefineImportMetadata {
-    /**
-     * Imported names before being transformed to `ssrImportKey`
-     *
-     * import foo, { bar as baz, qux } from 'hello'
-     * => ['default', 'bar', 'qux']
-     *
-     * import * as namespace from 'world
-     * => undefined
-     */
-    importedNames?: string[];
+interface SSRImportMetadata extends SSRImportBaseMetadata {
+    entrypoint?: boolean;
 }
 interface HMRRuntimeConnection extends HMRConnection {
     /**
@@ -151,10 +158,6 @@ interface HMRRuntimeConnection extends HMRConnection {
      */
     onUpdate(callback: (payload: HMRPayload) => void): void;
 }
-interface SSRImportMetadata extends DefineImportMetadata {
-    isDynamicImport?: boolean;
-    entrypoint?: boolean;
-}
 interface ViteRuntimeImportMeta extends ImportMeta {
     url: string;
     env: ImportMetaEnv;

package/dist/node-cjs/publicUtils.cjs

@@ -3524,7 +3524,7 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
             continue;
         }
         if (Array.isArray(existing) || Array.isArray(value)) {
-            merged[key] = [...arraify(existing ?? []), ...arraify(value ?? [])];
+            merged[key] = [...arraify(existing), ...arraify(value)];
             continue;
         }
         if (isObject$1(existing) && isObject$1(value)) {
@@ -4383,9 +4383,12 @@ class Mappings {
 
 	addEdit(sourceIndex, content, loc, nameIndex) {
 		if (content.length) {
+			const contentLengthMinusOne = content.length - 1;
 			let contentLineEnd = content.indexOf('\n', 0);
 			let previousContentLineEnd = -1;
-			while (contentLineEnd >= 0) {
+			// Loop through each line in the content and add a segment, but stop if the last line is empty,
+			// else code afterwards would fill one line too many
+			while (contentLineEnd >= 0 && contentLengthMinusOne > contentLineEnd) {
 				const segment = [this.generatedCodeColumn, sourceIndex, loc.line, loc.column];
 				if (nameIndex >= 0) {
 					segment.push(nameIndex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -80,9 +80,9 @@
     "fsevents": "~2.3.3"
   },
   "devDependencies": {
-    "@ampproject/remapping": "^2.2.1",
-    "@babel/parser": "^7.23.9",
-    "@jridgewell/trace-mapping": "^0.3.23",
+    "@ampproject/remapping": "^2.3.0",
+    "@babel/parser": "^7.24.0",
+    "@jridgewell/trace-mapping": "^0.3.25",
     "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-dynamic-import-vars": "^2.1.2",
@@ -113,7 +113,7 @@
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.6.1",
     "lightningcss": "^1.24.0",
-    "magic-string": "^0.30.7",
+    "magic-string": "^0.30.8",
     "micromatch": "^4.0.5",
     "mlly": "^1.6.1",
     "mrmime": "^2.0.0",
@@ -129,12 +129,12 @@
     "resolve.exports": "^2.0.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.1",
-    "rollup-plugin-license": "^3.2.0",
+    "rollup-plugin-license": "^3.3.1",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^2.0.0",
-    "tsconfck": "^3.0.2",
+    "tsconfck": "^3.0.3",
     "tslib": "^2.6.2",
     "types": "link:./types",
     "ufo": "^1.4.0",