@vitejs/plugin-legacy 5.1.0 → 5.3.0

package/README.md

@@ -40,12 +40,23 @@ npm add -D terser
 - **Type:** `string | string[] | { [key: string]: string }`
 - **Default:** [`'last 2 versions and not dead, > 0.3%, Firefox ESR'`](https://browsersl.ist/#q=last+2+versions+and+not+dead%2C+%3E+0.3%25%2C+Firefox+ESR)
 
-  If explicitly set, it's passed on to [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env#targets).
+  If explicitly set, it's passed on to [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env#targets) when rendering **legacy chunks**.
 
   The query is also [Browserslist compatible](https://github.com/browserslist/browserslist). See [Browserslist Best Practices](https://github.com/browserslist/browserslist#best-practices) for more details.
 
   If it's not set, plugin-legacy will load [the browserslist config sources](https://github.com/browserslist/browserslist#queries) and then fallback to the default value.
 
+### `modernTargets`
+
+- **Type:** `string | string[]`
+- **Default:** [`'edge>=80, firefox>=72, chrome>=80, safari>=13.1, chromeAndroid>=80, iOS>=13.1'`](https://browsersl.ist/#q=edge%3E%3D80%2C+firefox%3E%3D72%2C+chrome%3E%3D80%2C+safari%3E%3D13.1%2C+chromeAndroid%3E%3D80%2C+iOS%3E%3D13.1)
+
+  If explicitly set, it's passed on to [`@babel/preset-env`](https://babeljs.io/docs/en/babel-preset-env#targets) when rendering **modern chunks**.
+
+  The query is also [Browserslist compatible](https://github.com/browserslist/browserslist). See [Browserslist Best Practices](https://github.com/browserslist/browserslist#best-practices) for more details.
+
+  If it's not set, plugin-legacy will fallback to the default value.
+
 ### `polyfills`
 
 - **Type:** `boolean | string[]`
@@ -76,7 +87,7 @@ npm add -D terser
 
   Note 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 using an on-demand service like [Polyfill.io](https://polyfill.io/v3/) 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 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!).
 
 ### `renderLegacyChunks`
 
@@ -164,7 +175,7 @@ The current values are:
 
 - `sha256-MS6/3FCg4WjP9gwgaBGwLpRCY6fZBgwmhVCdrPrNf3E=`
 - `sha256-tQjf8gvb2ROOMapIxFvFAYBeUJ0v1HCbOcSmDNXGtDo=`
-- `sha256-6gxDO54HJkJNWi7H6ipFpWWSkWSRpyuZYMGDyG6bcNE=`
+- `sha256-VA8O2hAdooB288EpSTrGLl7z3QikbWU9wwoebO/QaYk=`
 - `sha256-+5XkZFazzJo8n0iOP4ti/cLCMUudTf//Mzkb7xNPXIc=`
 
 <!--

package/dist/index.cjs

@@ -10,6 +10,7 @@ const vite = require('vite');
 const MagicString = require('magic-string');
 const require$$0 = require('tty');
 const browserslist = require('browserslist');
+const esbuildPluginBrowserslist = require('esbuild-plugin-browserslist');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -93,7 +94,7 @@ const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
 const detectModernBrowserVarName = "__vite_is_modern_browser";
 const detectModernBrowserDetector = `import.meta.url;import("_").catch(()=>1);(async function*(){})().next()`;
-const detectModernBrowserCode = `${detectModernBrowserDetector}if(location.protocol!="file:"){window.${detectModernBrowserVarName}=true}`;
+const detectModernBrowserCode = `${detectModernBrowserDetector};if(location.protocol!="file:"){window.${detectModernBrowserVarName}=true}`;
 const dynamicFallbackInlineCode = `!function(){if(window.${detectModernBrowserVarName})return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("${legacyPolyfillId}"),n=document.createElement("script");n.src=e.src,n.onload=function(){${systemJSInlineCode}},document.body.appendChild(n)}();`;
 const modernChunkLegacyGuard = `export function __vite_legacy_guard(){${detectModernBrowserDetector}};`;
 
@@ -154,9 +155,12 @@ 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 nonLeadingHashInFileNameRE = /[^/]+\[hash(?::\d+)?\]/;
+const prefixedHashInFileNameRE = /\W?\[hash(:\d+)?\]/;
 function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
+  let modernTargets;
   const modernTargetsEsbuild = [
     "es2020",
     "edge79",
@@ -203,6 +207,7 @@ function viteLegacyPlugin(options = {}) {
     });
   }
   let overriddenBuildTarget = false;
+  let overriddenDefaultModernTargets = false;
   const legacyConfigPlugin = {
     name: "vite:legacy-config",
     config(config2, env) {
@@ -215,7 +220,8 @@ function viteLegacyPlugin(options = {}) {
         }
         if (genLegacy) {
           overriddenBuildTarget = config2.build.target !== void 0;
-          config2.build.target = modernTargetsEsbuild;
+          overriddenDefaultModernTargets = options.modernTargets !== void 0;
+          config2.build.target = options.modernTargets ? esbuildPluginBrowserslist.resolveToEsbuildTarget(browserslist__default(options.modernTargets)) : modernTargetsEsbuild;
         }
       }
       return {
@@ -232,6 +238,13 @@ function viteLegacyPlugin(options = {}) {
           )
         );
       }
+      if (overriddenDefaultModernTargets) {
+        config2.logger.warn(
+          colors.yellow(
+            `plugin-legacy 'modernTargets' option overrode the builtin targets of modern chunks. Some versions of browsers between legacy and modern may not be supported.`
+          )
+        );
+      }
     }
   };
   const legacyGenerateBundlePlugin = {
@@ -308,6 +321,8 @@ function viteLegacyPlugin(options = {}) {
       }
       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);
+      modernTargets = options.modernTargets || modernTargetsBabel;
+      isDebug && console.log(`[@vitejs/plugin-legacy] modernTargets:`, modernTargets);
       const getLegacyOutputFileName = (fileNames, defaultFileName = "[name]-legacy-[hash].js") => {
         if (!fileNames) {
           return path__default.posix.join(config.build.assetsDir, defaultFileName);
@@ -316,8 +331,8 @@ function viteLegacyPlugin(options = {}) {
           let fileName = typeof fileNames === "function" ? fileNames(chunkInfo) : fileNames;
           if (fileName.includes("[name]")) {
             fileName = fileName.replace("[name]", "[name]-legacy");
-          } else if (fileName.includes("[hash]")) {
-            fileName = fileName.replace(/[.-]?\[hash\]/, "-legacy$&");
+          } else if (nonLeadingHashInFileNameRE.test(fileName)) {
+            fileName = fileName.replace(prefixedHashInFileNameRE, "-legacy$&");
           } else {
             fileName = fileName.replace(/(.+?)\.(.+)/, "$1-legacy.$2");
           }
@@ -352,7 +367,7 @@ function viteLegacyPlugin(options = {}) {
       }
       if (!isLegacyChunk(chunk, opts)) {
         if (options.modernPolyfills && !Array.isArray(options.modernPolyfills) && genModern) {
-          await detectPolyfills(raw, modernTargetsBabel, modernPolyfills);
+          await detectPolyfills(raw, modernTargets, modernPolyfills);
         }
         const ms = new MagicString__default(raw);
         if (genLegacy && chunk.isEntry) {

package/dist/index.d.cts

@@ -7,6 +7,10 @@ interface Options {
     targets?: string | string[] | {
         [key: string]: string;
     };
+    /**
+     * default: 'edge>=80, firefox>=72, chrome>=80, safari>=13.1, chromeAndroid>=80, iOS>=13.1'
+     */
+    modernTargets?: string | string[];
     /**
      * default: true
      */

package/dist/index.d.mts

@@ -7,6 +7,10 @@ interface Options {
     targets?: string | string[] | {
         [key: string]: string;
     };
+    /**
+     * default: 'edge>=80, firefox>=72, chrome>=80, safari>=13.1, chromeAndroid>=80, iOS>=13.1'
+     */
+    modernTargets?: string | string[];
     /**
      * default: true
      */

package/dist/index.d.ts

@@ -7,6 +7,10 @@ interface Options {
     targets?: string | string[] | {
         [key: string]: string;
     };
+    /**
+     * default: 'edge>=80, firefox>=72, chrome>=80, safari>=13.1, chromeAndroid>=80, iOS>=13.1'
+     */
+    modernTargets?: string | string[];
     /**
      * default: true
      */

package/dist/index.mjs

@@ -6,6 +6,7 @@ import { build, normalizePath } from 'vite';
 import MagicString from 'magic-string';
 import require$$0 from 'tty';
 import browserslist from 'browserslist';
+import { resolveToEsbuildTarget } from 'esbuild-plugin-browserslist';
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -81,7 +82,7 @@ const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
 const detectModernBrowserVarName = "__vite_is_modern_browser";
 const detectModernBrowserDetector = `import.meta.url;import("_").catch(()=>1);(async function*(){})().next()`;
-const detectModernBrowserCode = `${detectModernBrowserDetector}if(location.protocol!="file:"){window.${detectModernBrowserVarName}=true}`;
+const detectModernBrowserCode = `${detectModernBrowserDetector};if(location.protocol!="file:"){window.${detectModernBrowserVarName}=true}`;
 const dynamicFallbackInlineCode = `!function(){if(window.${detectModernBrowserVarName})return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("${legacyPolyfillId}"),n=document.createElement("script");n.src=e.src,n.onload=function(){${systemJSInlineCode}},document.body.appendChild(n)}();`;
 const modernChunkLegacyGuard = `export function __vite_legacy_guard(){${detectModernBrowserDetector}};`;
 
@@ -142,9 +143,12 @@ 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+)?\]/;
 function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
+  let modernTargets;
   const modernTargetsEsbuild = [
     "es2020",
     "edge79",
@@ -191,6 +195,7 @@ function viteLegacyPlugin(options = {}) {
     });
   }
   let overriddenBuildTarget = false;
+  let overriddenDefaultModernTargets = false;
   const legacyConfigPlugin = {
     name: "vite:legacy-config",
     config(config2, env) {
@@ -203,7 +208,8 @@ function viteLegacyPlugin(options = {}) {
         }
         if (genLegacy) {
           overriddenBuildTarget = config2.build.target !== void 0;
-          config2.build.target = modernTargetsEsbuild;
+          overriddenDefaultModernTargets = options.modernTargets !== void 0;
+          config2.build.target = options.modernTargets ? resolveToEsbuildTarget(browserslist(options.modernTargets)) : modernTargetsEsbuild;
         }
       }
       return {
@@ -220,6 +226,13 @@ function viteLegacyPlugin(options = {}) {
           )
         );
       }
+      if (overriddenDefaultModernTargets) {
+        config2.logger.warn(
+          colors.yellow(
+            `plugin-legacy 'modernTargets' option overrode the builtin targets of modern chunks. Some versions of browsers between legacy and modern may not be supported.`
+          )
+        );
+      }
     }
   };
   const legacyGenerateBundlePlugin = {
@@ -296,6 +309,8 @@ function viteLegacyPlugin(options = {}) {
       }
       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);
+      modernTargets = options.modernTargets || modernTargetsBabel;
+      isDebug && console.log(`[@vitejs/plugin-legacy] modernTargets:`, modernTargets);
       const getLegacyOutputFileName = (fileNames, defaultFileName = "[name]-legacy-[hash].js") => {
         if (!fileNames) {
           return path.posix.join(config.build.assetsDir, defaultFileName);
@@ -304,8 +319,8 @@ function viteLegacyPlugin(options = {}) {
           let fileName = typeof fileNames === "function" ? fileNames(chunkInfo) : fileNames;
           if (fileName.includes("[name]")) {
             fileName = fileName.replace("[name]", "[name]-legacy");
-          } else if (fileName.includes("[hash]")) {
-            fileName = fileName.replace(/[.-]?\[hash\]/, "-legacy$&");
+          } else if (nonLeadingHashInFileNameRE.test(fileName)) {
+            fileName = fileName.replace(prefixedHashInFileNameRE, "-legacy$&");
           } else {
             fileName = fileName.replace(/(.+?)\.(.+)/, "$1-legacy.$2");
           }
@@ -340,7 +355,7 @@ function viteLegacyPlugin(options = {}) {
       }
       if (!isLegacyChunk(chunk, opts)) {
         if (options.modernPolyfills && !Array.isArray(options.modernPolyfills) && genModern) {
-          await detectPolyfills(raw, modernTargetsBabel, modernPolyfills);
+          await detectPolyfills(raw, modernTargets, modernPolyfills);
         }
         const ms = new MagicString(raw);
         if (genLegacy && chunk.isEntry) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -35,22 +35,23 @@
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "funding": "https://github.com/vitejs/vite?sponsor=1",
   "dependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "browserslist": "^4.22.1",
-    "core-js": "^3.33.2",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
+    "browserslist": "^4.22.2",
+    "core-js": "^3.35.0",
+    "esbuild-plugin-browserslist": "^0.10.0",
     "magic-string": "^0.30.5",
-    "regenerator-runtime": "^0.14.0",
-    "systemjs": "^6.14.2"
+    "regenerator-runtime": "^0.14.1",
+    "systemjs": "^6.14.3"
   },
   "peerDependencies": {
     "terser": "^5.4.0",
     "vite": "^5.0.0"
   },
   "devDependencies": {
-    "acorn": "^8.11.2",
+    "acorn": "^8.11.3",
     "picocolors": "^1.0.0",
-    "vite": "5.0.1"
+    "vite": "5.1.0-beta.3"
   },
   "scripts": {
     "dev": "unbuild --stub",