@vitejs/plugin-legacy 5.4.1 → 5.4.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
+Copyright (c) 2019-present, VoidZero Inc. and Vite contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -91,7 +91,7 @@ npm add -D terser
 
   If `modernTargets` is not set, it is **not recommended** to use the `true` value (which uses auto-detection) because `core-js@3` is very aggressive in polyfill inclusions due to all the bleeding edge features it supports. Even when targeting native ESM support, it injects 15kb of polyfills!
 
-  If you don't have hard reliance on bleeding edge runtime features, it is not that hard to avoid having to use polyfills in the modern build altogether. Alternatively, consider setting `modernTargets` or using an on-demand service like [Polyfill.io](https://polyfill.io) to only inject necessary polyfills based on actual browser user-agents (most modern browsers will need nothing!).
+  If you don't have hard reliance on bleeding edge runtime features, it is not that hard to avoid having to use polyfills in the modern build altogether. Alternatively, consider setting `modernTargets` or using an on-demand service like https://cdnjs.cloudflare.com/polyfill/ to only inject necessary polyfills based on actual browser user-agents (most modern browsers will need nothing!).
 
 ### `renderLegacyChunks`
 

package/dist/index.cjs

@@ -3,55 +3,40 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const path = require('node:path');
-const node_crypto = require('node:crypto');
+const crypto = require('node:crypto');
 const node_module = require('node:module');
 const node_url = require('node:url');
 const vite = require('vite');
 const MagicString = require('magic-string');
-const require$$0 = require('tty');
 const browserslist = require('browserslist');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
+const crypto__default = /*#__PURE__*/_interopDefaultCompat(crypto);
 const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
-const require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);
 const browserslist__default = /*#__PURE__*/_interopDefaultCompat(browserslist);
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-function commonjsRequire(path) {
-	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-}
-
 var picocolors = {exports: {}};
 
-let argv = process.argv || [],
-	env = process.env;
+let p = process || {}, argv = p.argv || [], env = p.env || {};
 let isColorSupported =
-	!("NO_COLOR" in env || argv.includes("--no-color")) &&
-	("FORCE_COLOR" in env ||
-		argv.includes("--color") ||
-		process.platform === "win32" ||
-		(commonjsRequire != null && require$$0__default.isatty(1) && env.TERM !== "dumb") ||
-		"CI" in env);
+	!(!!env.NO_COLOR || argv.includes("--no-color")) &&
+	(!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || ((p.stdout || {}).isTTY && env.TERM !== "dumb") || !!env.CI);
 
-let formatter =
-	(open, close, replace = open) =>
+let formatter = (open, close, replace = open) =>
 	input => {
-		let string = "" + input;
-		let index = string.indexOf(close, open.length);
-		return ~index
-			? open + replaceClose(string, close, replace, index) + close
-			: open + string + close
+		let string = "" + input, index = string.indexOf(close, open.length);
+		return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close
 	};
 
 let replaceClose = (string, close, replace, index) => {
-	let result = "";
-	let cursor = 0;
+	let result = "", cursor = 0;
 	do {
 		result += string.substring(cursor, index) + replace;
 		cursor = index + close.length;
@@ -61,34 +46,54 @@ let replaceClose = (string, close, replace, index) => {
 };
 
 let createColors = (enabled = isColorSupported) => {
-	let init = enabled ? formatter : () => String;
+	let f = enabled ? formatter : () => String;
 	return {
 		isColorSupported: enabled,
-		reset: init("\x1b[0m", "\x1b[0m"),
-		bold: init("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m"),
-		dim: init("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m"),
-		italic: init("\x1b[3m", "\x1b[23m"),
-		underline: init("\x1b[4m", "\x1b[24m"),
-		inverse: init("\x1b[7m", "\x1b[27m"),
-		hidden: init("\x1b[8m", "\x1b[28m"),
-		strikethrough: init("\x1b[9m", "\x1b[29m"),
-		black: init("\x1b[30m", "\x1b[39m"),
-		red: init("\x1b[31m", "\x1b[39m"),
-		green: init("\x1b[32m", "\x1b[39m"),
-		yellow: init("\x1b[33m", "\x1b[39m"),
-		blue: init("\x1b[34m", "\x1b[39m"),
-		magenta: init("\x1b[35m", "\x1b[39m"),
-		cyan: init("\x1b[36m", "\x1b[39m"),
-		white: init("\x1b[37m", "\x1b[39m"),
-		gray: init("\x1b[90m", "\x1b[39m"),
-		bgBlack: init("\x1b[40m", "\x1b[49m"),
-		bgRed: init("\x1b[41m", "\x1b[49m"),
-		bgGreen: init("\x1b[42m", "\x1b[49m"),
-		bgYellow: init("\x1b[43m", "\x1b[49m"),
-		bgBlue: init("\x1b[44m", "\x1b[49m"),
-		bgMagenta: init("\x1b[45m", "\x1b[49m"),
-		bgCyan: init("\x1b[46m", "\x1b[49m"),
-		bgWhite: init("\x1b[47m", "\x1b[49m"),
+		reset: f("\x1b[0m", "\x1b[0m"),
+		bold: f("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m"),
+		dim: f("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m"),
+		italic: f("\x1b[3m", "\x1b[23m"),
+		underline: f("\x1b[4m", "\x1b[24m"),
+		inverse: f("\x1b[7m", "\x1b[27m"),
+		hidden: f("\x1b[8m", "\x1b[28m"),
+		strikethrough: f("\x1b[9m", "\x1b[29m"),
+
+		black: f("\x1b[30m", "\x1b[39m"),
+		red: f("\x1b[31m", "\x1b[39m"),
+		green: f("\x1b[32m", "\x1b[39m"),
+		yellow: f("\x1b[33m", "\x1b[39m"),
+		blue: f("\x1b[34m", "\x1b[39m"),
+		magenta: f("\x1b[35m", "\x1b[39m"),
+		cyan: f("\x1b[36m", "\x1b[39m"),
+		white: f("\x1b[37m", "\x1b[39m"),
+		gray: f("\x1b[90m", "\x1b[39m"),
+
+		bgBlack: f("\x1b[40m", "\x1b[49m"),
+		bgRed: f("\x1b[41m", "\x1b[49m"),
+		bgGreen: f("\x1b[42m", "\x1b[49m"),
+		bgYellow: f("\x1b[43m", "\x1b[49m"),
+		bgBlue: f("\x1b[44m", "\x1b[49m"),
+		bgMagenta: f("\x1b[45m", "\x1b[49m"),
+		bgCyan: f("\x1b[46m", "\x1b[49m"),
+		bgWhite: f("\x1b[47m", "\x1b[49m"),
+
+		blackBright: f("\x1b[90m", "\x1b[39m"),
+		redBright: f("\x1b[91m", "\x1b[39m"),
+		greenBright: f("\x1b[92m", "\x1b[39m"),
+		yellowBright: f("\x1b[93m", "\x1b[39m"),
+		blueBright: f("\x1b[94m", "\x1b[39m"),
+		magentaBright: f("\x1b[95m", "\x1b[39m"),
+		cyanBright: f("\x1b[96m", "\x1b[39m"),
+		whiteBright: f("\x1b[97m", "\x1b[39m"),
+
+		bgBlackBright: f("\x1b[100m", "\x1b[49m"),
+		bgRedBright: f("\x1b[101m", "\x1b[49m"),
+		bgGreenBright: f("\x1b[102m", "\x1b[49m"),
+		bgYellowBright: f("\x1b[103m", "\x1b[49m"),
+		bgBlueBright: f("\x1b[104m", "\x1b[49m"),
+		bgMagentaBright: f("\x1b[105m", "\x1b[49m"),
+		bgCyanBright: f("\x1b[106m", "\x1b[49m"),
+		bgWhiteBright: f("\x1b[107m", "\x1b[49m"),
 	}
 };
 
@@ -142,7 +147,7 @@ function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRela
   if (relative && !config.build.ssr) {
     return toRelative(filename, hostId);
   } else {
-    return config.base + filename;
+    return joinUrlSegments(config.decodedBase, filename);
   }
 }
 function getBaseInHTML(urlRelativePath, config) {
@@ -151,9 +156,21 @@ function getBaseInHTML(urlRelativePath, config) {
     "./"
   ) : config.base;
 }
+function joinUrlSegments(a, b) {
+  if (!a || !b) {
+    return a || b || "";
+  }
+  if (a[a.length - 1] === "/") {
+    a = a.substring(0, a.length - 1);
+  }
+  if (b[0] !== "/") {
+    b = "/" + b;
+  }
+  return a + b;
+}
 function toAssetPathFromHtml(filename, htmlPath, config) {
   const relativeUrlPath = vite.normalizePath(path__default.relative(config.root, htmlPath));
-  const toRelative = (filename2, hostId) => getBaseInHTML(relativeUrlPath, config) + filename2;
+  const toRelative = (filename2, _hostId) => getBaseInHTML(relativeUrlPath, config) + filename2;
   return toOutputFilePathInHtml(
     filename,
     "asset",
@@ -164,9 +181,9 @@ function toAssetPathFromHtml(filename, htmlPath, config) {
   );
 }
 const legacyEnvVarMarker = `__VITE_IS_LEGACY__`;
-const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
+const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
 const nonLeadingHashInFileNameRE = /[^/]+\[hash(?::\d+)?\]/;
-const prefixedHashInFileNameRE = /\W?\[hash(:\d+)?\]/;
+const prefixedHashInFileNameRE = /\W?\[hash(?::\d+)?\]/;
 function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
@@ -288,11 +305,13 @@ function viteLegacyPlugin(options = {}) {
         if (!modernPolyfills.size) {
           return;
         }
-        isDebug && console.log(
-          `[@vitejs/plugin-legacy] modern polyfills:`,
-          modernPolyfills
-        );
-        const polyfillChunk = await buildPolyfillChunk(
+        if (isDebug) {
+          console.log(
+            `[@vitejs/plugin-legacy] modern polyfills:`,
+            modernPolyfills
+          );
+        }
+        await buildPolyfillChunk(
           config.mode,
           modernPolyfills,
           bundle,
@@ -300,11 +319,9 @@ function viteLegacyPlugin(options = {}) {
           config.build,
           "es",
           opts,
-          true
+          true,
+          genLegacy
         );
-        if (genLegacy && polyfillChunk) {
-          polyfillChunk.code = modernChunkLegacyGuard + polyfillChunk.code;
-        }
         return;
       }
       if (!genLegacy) {
@@ -321,10 +338,12 @@ function viteLegacyPlugin(options = {}) {
         );
       }
       if (legacyPolyfills.size || !options.externalSystemJS) {
-        isDebug && console.log(
-          `[@vitejs/plugin-legacy] legacy polyfills:`,
-          legacyPolyfills
-        );
+        if (isDebug) {
+          console.log(
+            `[@vitejs/plugin-legacy] legacy polyfills:`,
+            legacyPolyfills
+          );
+        }
         await buildPolyfillChunk(
           config.mode,
           legacyPolyfills,
@@ -353,12 +372,16 @@ function viteLegacyPlugin(options = {}) {
       }
       config = _config;
       modernTargets = options.modernTargets || modernTargetsBabel;
-      isDebug && console.log(`[@vitejs/plugin-legacy] modernTargets:`, modernTargets);
+      if (isDebug) {
+        console.log(`[@vitejs/plugin-legacy] modernTargets:`, modernTargets);
+      }
       if (!genLegacy || config.build.ssr) {
         return;
       }
       targets = options.targets || browserslistLoadConfig({ path: config.root }) || "last 2 versions and not dead, > 0.3%, Firefox ESR";
-      isDebug && console.log(`[@vitejs/plugin-legacy] targets:`, targets);
+      if (isDebug) {
+        console.log(`[@vitejs/plugin-legacy] targets:`, targets);
+      }
       const getLegacyOutputFileName = (fileNames, defaultFileName = "[name]-legacy-[hash].js") => {
         if (!fileNames) {
           return path__default.posix.join(config.build.assetsDir, defaultFileName);
@@ -462,7 +485,6 @@ function viteLegacyPlugin(options = {}) {
         compact: !!config.build.minify,
         sourceMaps,
         inputSourceMap: void 0,
-        // sourceMaps ? chunk.map : undefined, `.map` TODO: moved to OutputChunk?
         presets: [
           // forcing our plugin to run before preset-env by wrapping it in a
           // preset so we can catch the injected import statements...
@@ -657,20 +679,24 @@ function createBabelPresetEnvOptions(targets, { needPolyfills = true }) {
     ignoreBrowserslistConfig: true
   };
 }
-async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
-  let { minify, assetsDir } = buildOptions;
+async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS, prependModenChunkLegacyGuard) {
+  let { minify, assetsDir, sourcemap } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await vite.build({
     mode,
     // so that everything is resolved from here
-    root: path__default.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)))),
+    root: path__default.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)))),
     configFile: false,
     logLevel: "error",
-    plugins: [polyfillsPlugin(imports, excludeSystemJS)],
+    plugins: [
+      polyfillsPlugin(imports, excludeSystemJS),
+      prependModenChunkLegacyGuard && prependModenChunkLegacyGuardPlugin()
+    ],
     build: {
       write: false,
       minify,
       assetsDir,
+      sourcemap,
       rollupOptions: {
         input: {
           polyfills: polyfillId
@@ -697,7 +723,9 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
   const _polyfillChunk = Array.isArray(res) ? res[0] : res;
   if (!("output" in _polyfillChunk))
     return;
-  const polyfillChunk = _polyfillChunk.output[0];
+  const polyfillChunk = _polyfillChunk.output.find(
+    (chunk) => chunk.type === "chunk" && chunk.isEntry
+  );
   for (const key in bundle) {
     const chunk = bundle[key];
     if (chunk.type === "chunk" && chunk.facadeModuleId) {
@@ -705,7 +733,14 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
     }
   }
   bundle[polyfillChunk.fileName] = polyfillChunk;
-  return polyfillChunk;
+  if (polyfillChunk.sourcemapFileName) {
+    const polyfillChunkMapAsset = _polyfillChunk.output.find(
+      (chunk) => chunk.type === "asset" && chunk.fileName === polyfillChunk.sourcemapFileName
+    );
+    if (polyfillChunkMapAsset) {
+      bundle[polyfillChunk.sourcemapFileName] = polyfillChunkMapAsset;
+    }
+  }
 }
 const polyfillId = "\0vite/legacy-polyfills";
 function polyfillsPlugin(imports, excludeSystemJS) {
@@ -723,6 +758,26 @@ function polyfillsPlugin(imports, excludeSystemJS) {
     }
   };
 }
+function prependModenChunkLegacyGuardPlugin() {
+  let sourceMapEnabled;
+  return {
+    name: "vite:legacy-prepend-moden-chunk-legacy-guard",
+    configResolved(config) {
+      sourceMapEnabled = !!config.build.sourcemap;
+    },
+    renderChunk(code) {
+      if (!sourceMapEnabled) {
+        return modernChunkLegacyGuard + code;
+      }
+      const ms = new MagicString__default(code);
+      ms.prepend(modernChunkLegacyGuard);
+      return {
+        code: ms.toString(),
+        map: ms.generateMap({ hires: "boundary" })
+      };
+    }
+  };
+}
 function isLegacyChunk(chunk, options) {
   return options.format === "system" && chunk.fileName.includes("-legacy");
 }
@@ -774,12 +829,16 @@ function wrapIIFEBabelPlugin() {
     };
   };
 }
+const hash = (
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins -- crypto.hash is supported in Node 21.7.0+, 20.12.0+
+  crypto__default.hash ?? ((algorithm, data, outputEncoding) => crypto__default.createHash(algorithm).update(data).digest(outputEncoding))
+);
 const cspHashes = [
   safari10NoModuleFix,
   systemJSInlineCode,
   detectModernBrowserCode,
   dynamicFallbackInlineCode
-].map((i) => node_crypto.createHash("sha256").update(i).digest("base64"));
+].map((i) => hash("sha256", i, "base64"));
 
 module.exports = viteLegacyPlugin;
 module.exports.cspHashes = cspHashes;

package/dist/index.d.cts

@@ -4,9 +4,7 @@ interface Options {
     /**
      * default: 'defaults'
      */
-    targets?: string | string[] | {
-        [key: string]: string;
-    };
+    targets?: string | string[] | Record<string, string>;
     /**
      * default: 'edge>=79, firefox>=67, chrome>=64, safari>=12, chromeAndroid>=64, iOS>=12'
      */

package/dist/index.d.mts

@@ -4,9 +4,7 @@ interface Options {
     /**
      * default: 'defaults'
      */
-    targets?: string | string[] | {
-        [key: string]: string;
-    };
+    targets?: string | string[] | Record<string, string>;
     /**
      * default: 'edge>=79, firefox>=67, chrome>=64, safari>=12, chromeAndroid>=64, iOS>=12'
      */

package/dist/index.d.ts

@@ -4,9 +4,7 @@ interface Options {
     /**
      * default: 'defaults'
      */
-    targets?: string | string[] | {
-        [key: string]: string;
-    };
+    targets?: string | string[] | Record<string, string>;
     /**
      * default: 'edge>=79, firefox>=67, chrome>=64, safari>=12, chromeAndroid>=64, iOS>=12'
      */

package/dist/index.mjs

@@ -1,45 +1,30 @@
 import path from 'node:path';
-import { createHash } from 'node:crypto';
+import crypto from 'node:crypto';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { build, normalizePath } from 'vite';
 import MagicString from 'magic-string';
-import require$$0 from 'tty';
 import browserslist from 'browserslist';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-function commonjsRequire(path) {
-	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-}
-
 var picocolors = {exports: {}};
 
-let argv = process.argv || [],
-	env = process.env;
+let p = process || {}, argv = p.argv || [], env = p.env || {};
 let isColorSupported =
-	!("NO_COLOR" in env || argv.includes("--no-color")) &&
-	("FORCE_COLOR" in env ||
-		argv.includes("--color") ||
-		process.platform === "win32" ||
-		(commonjsRequire != null && require$$0.isatty(1) && env.TERM !== "dumb") ||
-		"CI" in env);
+	!(!!env.NO_COLOR || argv.includes("--no-color")) &&
+	(!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || ((p.stdout || {}).isTTY && env.TERM !== "dumb") || !!env.CI);
 
-let formatter =
-	(open, close, replace = open) =>
+let formatter = (open, close, replace = open) =>
 	input => {
-		let string = "" + input;
-		let index = string.indexOf(close, open.length);
-		return ~index
-			? open + replaceClose(string, close, replace, index) + close
-			: open + string + close
+		let string = "" + input, index = string.indexOf(close, open.length);
+		return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close
 	};
 
 let replaceClose = (string, close, replace, index) => {
-	let result = "";
-	let cursor = 0;
+	let result = "", cursor = 0;
 	do {
 		result += string.substring(cursor, index) + replace;
 		cursor = index + close.length;
@@ -49,34 +34,54 @@ let replaceClose = (string, close, replace, index) => {
 };
 
 let createColors = (enabled = isColorSupported) => {
-	let init = enabled ? formatter : () => String;
+	let f = enabled ? formatter : () => String;
 	return {
 		isColorSupported: enabled,
-		reset: init("\x1b[0m", "\x1b[0m"),
-		bold: init("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m"),
-		dim: init("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m"),
-		italic: init("\x1b[3m", "\x1b[23m"),
-		underline: init("\x1b[4m", "\x1b[24m"),
-		inverse: init("\x1b[7m", "\x1b[27m"),
-		hidden: init("\x1b[8m", "\x1b[28m"),
-		strikethrough: init("\x1b[9m", "\x1b[29m"),
-		black: init("\x1b[30m", "\x1b[39m"),
-		red: init("\x1b[31m", "\x1b[39m"),
-		green: init("\x1b[32m", "\x1b[39m"),
-		yellow: init("\x1b[33m", "\x1b[39m"),
-		blue: init("\x1b[34m", "\x1b[39m"),
-		magenta: init("\x1b[35m", "\x1b[39m"),
-		cyan: init("\x1b[36m", "\x1b[39m"),
-		white: init("\x1b[37m", "\x1b[39m"),
-		gray: init("\x1b[90m", "\x1b[39m"),
-		bgBlack: init("\x1b[40m", "\x1b[49m"),
-		bgRed: init("\x1b[41m", "\x1b[49m"),
-		bgGreen: init("\x1b[42m", "\x1b[49m"),
-		bgYellow: init("\x1b[43m", "\x1b[49m"),
-		bgBlue: init("\x1b[44m", "\x1b[49m"),
-		bgMagenta: init("\x1b[45m", "\x1b[49m"),
-		bgCyan: init("\x1b[46m", "\x1b[49m"),
-		bgWhite: init("\x1b[47m", "\x1b[49m"),
+		reset: f("\x1b[0m", "\x1b[0m"),
+		bold: f("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m"),
+		dim: f("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m"),
+		italic: f("\x1b[3m", "\x1b[23m"),
+		underline: f("\x1b[4m", "\x1b[24m"),
+		inverse: f("\x1b[7m", "\x1b[27m"),
+		hidden: f("\x1b[8m", "\x1b[28m"),
+		strikethrough: f("\x1b[9m", "\x1b[29m"),
+
+		black: f("\x1b[30m", "\x1b[39m"),
+		red: f("\x1b[31m", "\x1b[39m"),
+		green: f("\x1b[32m", "\x1b[39m"),
+		yellow: f("\x1b[33m", "\x1b[39m"),
+		blue: f("\x1b[34m", "\x1b[39m"),
+		magenta: f("\x1b[35m", "\x1b[39m"),
+		cyan: f("\x1b[36m", "\x1b[39m"),
+		white: f("\x1b[37m", "\x1b[39m"),
+		gray: f("\x1b[90m", "\x1b[39m"),
+
+		bgBlack: f("\x1b[40m", "\x1b[49m"),
+		bgRed: f("\x1b[41m", "\x1b[49m"),
+		bgGreen: f("\x1b[42m", "\x1b[49m"),
+		bgYellow: f("\x1b[43m", "\x1b[49m"),
+		bgBlue: f("\x1b[44m", "\x1b[49m"),
+		bgMagenta: f("\x1b[45m", "\x1b[49m"),
+		bgCyan: f("\x1b[46m", "\x1b[49m"),
+		bgWhite: f("\x1b[47m", "\x1b[49m"),
+
+		blackBright: f("\x1b[90m", "\x1b[39m"),
+		redBright: f("\x1b[91m", "\x1b[39m"),
+		greenBright: f("\x1b[92m", "\x1b[39m"),
+		yellowBright: f("\x1b[93m", "\x1b[39m"),
+		blueBright: f("\x1b[94m", "\x1b[39m"),
+		magentaBright: f("\x1b[95m", "\x1b[39m"),
+		cyanBright: f("\x1b[96m", "\x1b[39m"),
+		whiteBright: f("\x1b[97m", "\x1b[39m"),
+
+		bgBlackBright: f("\x1b[100m", "\x1b[49m"),
+		bgRedBright: f("\x1b[101m", "\x1b[49m"),
+		bgGreenBright: f("\x1b[102m", "\x1b[49m"),
+		bgYellowBright: f("\x1b[103m", "\x1b[49m"),
+		bgBlueBright: f("\x1b[104m", "\x1b[49m"),
+		bgMagentaBright: f("\x1b[105m", "\x1b[49m"),
+		bgCyanBright: f("\x1b[106m", "\x1b[49m"),
+		bgWhiteBright: f("\x1b[107m", "\x1b[49m"),
 	}
 };
 
@@ -130,7 +135,7 @@ function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRela
   if (relative && !config.build.ssr) {
     return toRelative(filename, hostId);
   } else {
-    return config.base + filename;
+    return joinUrlSegments(config.decodedBase, filename);
   }
 }
 function getBaseInHTML(urlRelativePath, config) {
@@ -139,9 +144,21 @@ function getBaseInHTML(urlRelativePath, config) {
     "./"
   ) : config.base;
 }
+function joinUrlSegments(a, b) {
+  if (!a || !b) {
+    return a || b || "";
+  }
+  if (a[a.length - 1] === "/") {
+    a = a.substring(0, a.length - 1);
+  }
+  if (b[0] !== "/") {
+    b = "/" + b;
+  }
+  return a + b;
+}
 function toAssetPathFromHtml(filename, htmlPath, config) {
   const relativeUrlPath = normalizePath(path.relative(config.root, htmlPath));
-  const toRelative = (filename2, hostId) => getBaseInHTML(relativeUrlPath, config) + filename2;
+  const toRelative = (filename2, _hostId) => getBaseInHTML(relativeUrlPath, config) + filename2;
   return toOutputFilePathInHtml(
     filename,
     "asset",
@@ -154,7 +171,7 @@ function toAssetPathFromHtml(filename, htmlPath, config) {
 const legacyEnvVarMarker = `__VITE_IS_LEGACY__`;
 const _require = createRequire(import.meta.url);
 const nonLeadingHashInFileNameRE = /[^/]+\[hash(?::\d+)?\]/;
-const prefixedHashInFileNameRE = /\W?\[hash(:\d+)?\]/;
+const prefixedHashInFileNameRE = /\W?\[hash(?::\d+)?\]/;
 function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
@@ -276,11 +293,13 @@ function viteLegacyPlugin(options = {}) {
         if (!modernPolyfills.size) {
           return;
         }
-        isDebug && console.log(
-          `[@vitejs/plugin-legacy] modern polyfills:`,
-          modernPolyfills
-        );
-        const polyfillChunk = await buildPolyfillChunk(
+        if (isDebug) {
+          console.log(
+            `[@vitejs/plugin-legacy] modern polyfills:`,
+            modernPolyfills
+          );
+        }
+        await buildPolyfillChunk(
           config.mode,
           modernPolyfills,
           bundle,
@@ -288,11 +307,9 @@ function viteLegacyPlugin(options = {}) {
           config.build,
           "es",
           opts,
-          true
+          true,
+          genLegacy
         );
-        if (genLegacy && polyfillChunk) {
-          polyfillChunk.code = modernChunkLegacyGuard + polyfillChunk.code;
-        }
         return;
       }
       if (!genLegacy) {
@@ -309,10 +326,12 @@ function viteLegacyPlugin(options = {}) {
         );
       }
       if (legacyPolyfills.size || !options.externalSystemJS) {
-        isDebug && console.log(
-          `[@vitejs/plugin-legacy] legacy polyfills:`,
-          legacyPolyfills
-        );
+        if (isDebug) {
+          console.log(
+            `[@vitejs/plugin-legacy] legacy polyfills:`,
+            legacyPolyfills
+          );
+        }
         await buildPolyfillChunk(
           config.mode,
           legacyPolyfills,
@@ -341,12 +360,16 @@ function viteLegacyPlugin(options = {}) {
       }
       config = _config;
       modernTargets = options.modernTargets || modernTargetsBabel;
-      isDebug && console.log(`[@vitejs/plugin-legacy] modernTargets:`, modernTargets);
+      if (isDebug) {
+        console.log(`[@vitejs/plugin-legacy] modernTargets:`, modernTargets);
+      }
       if (!genLegacy || config.build.ssr) {
         return;
       }
       targets = options.targets || browserslistLoadConfig({ path: config.root }) || "last 2 versions and not dead, > 0.3%, Firefox ESR";
-      isDebug && console.log(`[@vitejs/plugin-legacy] targets:`, targets);
+      if (isDebug) {
+        console.log(`[@vitejs/plugin-legacy] targets:`, targets);
+      }
       const getLegacyOutputFileName = (fileNames, defaultFileName = "[name]-legacy-[hash].js") => {
         if (!fileNames) {
           return path.posix.join(config.build.assetsDir, defaultFileName);
@@ -450,7 +473,6 @@ function viteLegacyPlugin(options = {}) {
         compact: !!config.build.minify,
         sourceMaps,
         inputSourceMap: void 0,
-        // sourceMaps ? chunk.map : undefined, `.map` TODO: moved to OutputChunk?
         presets: [
           // forcing our plugin to run before preset-env by wrapping it in a
           // preset so we can catch the injected import statements...
@@ -645,8 +667,8 @@ function createBabelPresetEnvOptions(targets, { needPolyfills = true }) {
     ignoreBrowserslistConfig: true
   };
 }
-async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
-  let { minify, assetsDir } = buildOptions;
+async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS, prependModenChunkLegacyGuard) {
+  let { minify, assetsDir, sourcemap } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await build({
     mode,
@@ -654,11 +676,15 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
     root: path.dirname(fileURLToPath(import.meta.url)),
     configFile: false,
     logLevel: "error",
-    plugins: [polyfillsPlugin(imports, excludeSystemJS)],
+    plugins: [
+      polyfillsPlugin(imports, excludeSystemJS),
+      prependModenChunkLegacyGuard && prependModenChunkLegacyGuardPlugin()
+    ],
     build: {
       write: false,
       minify,
       assetsDir,
+      sourcemap,
       rollupOptions: {
         input: {
           polyfills: polyfillId
@@ -685,7 +711,9 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
   const _polyfillChunk = Array.isArray(res) ? res[0] : res;
   if (!("output" in _polyfillChunk))
     return;
-  const polyfillChunk = _polyfillChunk.output[0];
+  const polyfillChunk = _polyfillChunk.output.find(
+    (chunk) => chunk.type === "chunk" && chunk.isEntry
+  );
   for (const key in bundle) {
     const chunk = bundle[key];
     if (chunk.type === "chunk" && chunk.facadeModuleId) {
@@ -693,7 +721,14 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
     }
   }
   bundle[polyfillChunk.fileName] = polyfillChunk;
-  return polyfillChunk;
+  if (polyfillChunk.sourcemapFileName) {
+    const polyfillChunkMapAsset = _polyfillChunk.output.find(
+      (chunk) => chunk.type === "asset" && chunk.fileName === polyfillChunk.sourcemapFileName
+    );
+    if (polyfillChunkMapAsset) {
+      bundle[polyfillChunk.sourcemapFileName] = polyfillChunkMapAsset;
+    }
+  }
 }
 const polyfillId = "\0vite/legacy-polyfills";
 function polyfillsPlugin(imports, excludeSystemJS) {
@@ -711,6 +746,26 @@ function polyfillsPlugin(imports, excludeSystemJS) {
     }
   };
 }
+function prependModenChunkLegacyGuardPlugin() {
+  let sourceMapEnabled;
+  return {
+    name: "vite:legacy-prepend-moden-chunk-legacy-guard",
+    configResolved(config) {
+      sourceMapEnabled = !!config.build.sourcemap;
+    },
+    renderChunk(code) {
+      if (!sourceMapEnabled) {
+        return modernChunkLegacyGuard + code;
+      }
+      const ms = new MagicString(code);
+      ms.prepend(modernChunkLegacyGuard);
+      return {
+        code: ms.toString(),
+        map: ms.generateMap({ hires: "boundary" })
+      };
+    }
+  };
+}
 function isLegacyChunk(chunk, options) {
   return options.format === "system" && chunk.fileName.includes("-legacy");
 }
@@ -762,11 +817,15 @@ function wrapIIFEBabelPlugin() {
     };
   };
 }
+const hash = (
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins -- crypto.hash is supported in Node 21.7.0+, 20.12.0+
+  crypto.hash ?? ((algorithm, data, outputEncoding) => crypto.createHash(algorithm).update(data).digest(outputEncoding))
+);
 const cspHashes = [
   safari10NoModuleFix,
   systemJSInlineCode,
   detectModernBrowserCode,
   dynamicFallbackInlineCode
-].map((i) => createHash("sha256").update(i).digest("base64"));
+].map((i) => hash("sha256", i, "base64"));
 
 export { cspHashes, viteLegacyPlugin as default, detectPolyfills };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "5.4.1",
+  "version": "5.4.3",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -35,12 +35,12 @@
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "funding": "https://github.com/vitejs/vite?sponsor=1",
   "dependencies": {
-    "@babel/core": "^7.24.6",
-    "@babel/preset-env": "^7.24.6",
-    "browserslist": "^4.23.0",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
+    "browserslist": "^4.24.0",
     "browserslist-to-esbuild": "^2.1.1",
-    "core-js": "^3.37.1",
-    "magic-string": "^0.30.10",
+    "core-js": "^3.38.1",
+    "magic-string": "^0.30.12",
     "regenerator-runtime": "^0.14.1",
     "systemjs": "^6.15.1"
   },
@@ -49,10 +49,10 @@
     "vite": "^5.0.0"
   },
   "devDependencies": {
-    "acorn": "^8.11.3",
-    "picocolors": "^1.0.1",
+    "acorn": "^8.13.0",
+    "picocolors": "^1.1.1",
     "unbuild": "^2.0.0",
-    "vite": "5.2.12"
+    "vite": "6.0.0-beta.5"
   },
   "scripts": {
     "dev": "unbuild --stub",