@vitejs/plugin-legacy 2.0.0-alpha.0 → 2.0.0-beta.0

package/README.md

@@ -27,6 +27,12 @@ export default {
 }
 ```
 
+Terser must be installed because plugin-legacy uses Terser for minification.
+
+```sh
+npm add -D terser
+```
+
 ## Options
 
 ### `targets`
@@ -122,9 +128,9 @@ The legacy plugin offers a way to use native `import()` in the modern build whil
 
 Polyfill specifier strings for `polyfills` and `modernPolyfills` can be either of the following:
 
-- Any [`core-js` 3 sub import paths](https://unpkg.com/browse/core-js@3.8.2/) - e.g. `es/map` will import `core-js/es/map`
+- Any [`core-js` 3 sub import paths](https://unpkg.com/browse/core-js@latest/) - e.g. `es/map` will import `core-js/es/map`
 
-- Any [individual `core-js` 3 modules](https://unpkg.com/browse/core-js@3.8.2/modules/) - e.g. `es.array.iterator` will import `core-js/modules/es.array.iterator.js`
+- Any [individual `core-js` 3 modules](https://unpkg.com/browse/core-js@latest/modules/) - e.g. `es.array.iterator` will import `core-js/modules/es.array.iterator.js`
 
 **Example**
 
@@ -147,8 +153,12 @@ The legacy plugin requires inline scripts for [Safari 10.1 `nomodule` fix](https
 
 - `sha256-MS6/3FCg4WjP9gwgaBGwLpRCY6fZBgwmhVCdrPrNf3E=`
 - `sha256-tQjf8gvb2ROOMapIxFvFAYBeUJ0v1HCbOcSmDNXGtDo=`
-- `sha256-4m6wOIrq/wFDmi9Xh3mFM2mwI4ik9n3TMgHk6xDtLxk=`
-- `sha256-uS7/g9fhQwNZS1f/MqYqqKv8y9hCu36IfX9XZB5L7YY=`
+- `sha256-BoFUHKsYhJ9tbsHugtNQCmnkBbZ11pcW6kZguu+T+EU=`
+- `sha256-A18HC3jLpyEc9B8oyxq/NBFCyFBJFSsRLt0gmT9kft8=`
+
+<!--
+Run `node --input-type=module -e "import {cspHashes} from '@vitejs/plugin-legacy'; console.log(cspHashes.map(h => 'sha256-'+h))"` to retrieve the value.
+-->
 
 These values (without the `sha256-` prefix) can also be retrieved via
 

package/dist/index.cjs

@@ -2,8 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const path = require('path');
-const crypto = require('crypto');
+const path = require('node:path');
+const node_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');
 
@@ -19,15 +21,26 @@ async function loadBabel() {
   }
   return babel;
 }
+function getBaseInHTML(urlRelativePath, baseOptions, config) {
+  return baseOptions.url ?? (baseOptions.relative ? path__default.posix.join(path__default.posix.relative(urlRelativePath, "").slice(0, -2), "./") : config.base);
+}
+function getAssetsBase(urlRelativePath, config) {
+  return getBaseInHTML(urlRelativePath, config.experimental.buildAdvancedBaseOptions.assets, config);
+}
+function toAssetPathFromHtml(filename, htmlPath, config) {
+  const relativeUrlPath = vite.normalizePath(path__default.relative(config.root, htmlPath));
+  return getAssetsBase(relativeUrlPath, config) + filename;
+}
 const safari10NoModuleFix = `!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();`;
 const legacyPolyfillId = "vite-legacy-polyfill";
 const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
-const detectDynamicImportVarName = "__vite_is_dynamic_import_support";
-const detectDynamicImportCode = `try{import("_").catch(()=>1);}catch(e){}window.${detectDynamicImportVarName}=true;`;
-const dynamicFallbackInlineCode = `!function(){if(window.${detectDynamicImportVarName})return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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 detectModernBrowserVarName = "__vite_is_modern_browser";
+const detectModernBrowserCode = `try{import.meta.url;import("_").catch(()=>1);}catch(e){}window.${detectModernBrowserVarName}=true;`;
+const dynamicFallbackInlineCode = `!function(){if(window.${detectModernBrowserVarName})return;console.warn("vite: loading legacy build because dynamic import or import.meta.url is unsupported, syntax error above 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 forceDynamicImportUsage = `export function __vite_legacy_guard(){import('data:text/javascript,')};`;
 const legacyEnvVarMarker = `__VITE_IS_LEGACY__`;
+const _require = node_module.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href)));
 function viteLegacyPlugin(options = {}) {
   let config;
   const targets = options.targets || "defaults";
@@ -39,11 +52,7 @@ function viteLegacyPlugin(options = {}) {
   const facadeToLegacyPolyfillMap = /* @__PURE__ */ new Map();
   const facadeToModernPolyfillMap = /* @__PURE__ */ new Map();
   const modernPolyfills = /* @__PURE__ */ new Set();
-  const DEFAULT_LEGACY_POLYFILL = [
-    "core-js/modules/es.promise",
-    "core-js/modules/es.array.iterator"
-  ];
-  const legacyPolyfills = new Set(DEFAULT_LEGACY_POLYFILL);
+  const legacyPolyfills = /* @__PURE__ */ new Set();
   if (Array.isArray(options.modernPolyfills)) {
     options.modernPolyfills.forEach((i) => {
       modernPolyfills.add(i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`);
@@ -87,18 +96,16 @@ function viteLegacyPlugin(options = {}) {
           return;
         }
         isDebug && console.log(`[@vitejs/plugin-legacy] modern polyfills:`, modernPolyfills);
-        await buildPolyfillChunk("polyfills-modern", modernPolyfills, bundle, facadeToModernPolyfillMap, config.build, options.externalSystemJS);
+        await buildPolyfillChunk(modernPolyfills, bundle, facadeToModernPolyfillMap, config.build, "es", opts, true);
         return;
       }
       if (!genLegacy) {
         return;
       }
       if (legacyPolyfills.size || genDynamicFallback) {
-        if (!legacyPolyfills.has("es.promise")) {
-          await detectPolyfills(`Promise.resolve()`, targets, legacyPolyfills);
-        }
+        await detectPolyfills(`Promise.resolve(); Promise.all();`, targets, legacyPolyfills);
         isDebug && console.log(`[@vitejs/plugin-legacy] legacy polyfills:`, legacyPolyfills);
-        await buildPolyfillChunk("polyfills-legacy", legacyPolyfills, bundle, facadeToLegacyPolyfillMap, config.build, options.externalSystemJS);
+        await buildPolyfillChunk(legacyPolyfills, bundle, facadeToLegacyPolyfillMap, config.build, "iife", opts, options.externalSystemJS);
       }
     }
   };
@@ -185,7 +192,7 @@ function viteLegacyPlugin(options = {}) {
       const { code, map } = babel2.transform(raw, {
         babelrc: false,
         configFile: false,
-        compact: true,
+        compact: !!config.build.minify,
         sourceMaps,
         inputSourceMap: sourceMaps ? chunk.map : void 0,
         presets: [
@@ -200,19 +207,10 @@ function viteLegacyPlugin(options = {}) {
           ],
           [
             "env",
-            {
-              targets,
-              modules: false,
-              bugfixes: true,
-              loose: false,
-              useBuiltIns: needPolyfills ? "usage" : false,
-              corejs: needPolyfills ? {
-                version: require("core-js/package.json").version,
-                proposals: false
-              } : void 0,
-              shippedProposals: true,
+            createBabelPresetEnvOptions(targets, {
+              needPolyfills,
               ignoreBrowserslistConfig: options.ignoreBrowserslistConfig
-            }
+            })
           ]
         ]
       });
@@ -237,7 +235,8 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             type: "module",
-            src: `${config.base}${modernPolyfillFilename}`
+            crossorigin: true,
+            src: toAssetPathFromHtml(modernPolyfillFilename, chunk.facadeModuleId, config)
           }
         });
       } else if (modernPolyfills.size) {
@@ -258,8 +257,9 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyPolyfillId,
-            src: `${config.base}${legacyPolyfillFilename}`
+            src: toAssetPathFromHtml(legacyPolyfillFilename, chunk.facadeModuleId, config)
           },
           injectTo: "body"
         });
@@ -272,8 +272,9 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyEntryId,
-            "data-src": config.base + legacyEntryFilename
+            "data-src": toAssetPathFromHtml(legacyEntryFilename, chunk.facadeModuleId, config)
           },
           children: systemJSInlineCode,
           injectTo: "body"
@@ -285,7 +286,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: { type: "module" },
-          children: detectDynamicImportCode,
+          children: detectModernBrowserCode,
           injectTo: "head"
         });
         tags.push({
@@ -349,14 +350,7 @@ async function detectPolyfills(code, targets, list) {
     presets: [
       [
         "env",
-        {
-          targets,
-          modules: false,
-          useBuiltIns: "usage",
-          corejs: { version: 3, proposals: false },
-          shippedProposals: true,
-          ignoreBrowserslistConfig: true
-        }
+        createBabelPresetEnvOptions(targets, { ignoreBrowserslistConfig: true })
       ]
     ]
   });
@@ -369,25 +363,44 @@ async function detectPolyfills(code, targets, list) {
     }
   }
 }
-async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, buildOptions, externalSystemJS) {
+function createBabelPresetEnvOptions(targets, {
+  needPolyfills = true,
+  ignoreBrowserslistConfig
+}) {
+  return {
+    targets,
+    bugfixes: true,
+    loose: false,
+    modules: false,
+    useBuiltIns: needPolyfills ? "usage" : false,
+    corejs: needPolyfills ? {
+      version: _require("core-js/package.json").version,
+      proposals: false
+    } : void 0,
+    shippedProposals: true,
+    ignoreBrowserslistConfig
+  };
+}
+async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await vite.build({
-    root: __dirname,
+    root: path__default.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href)))),
     configFile: false,
     logLevel: "error",
-    plugins: [polyfillsPlugin(imports, externalSystemJS)],
+    plugins: [polyfillsPlugin(imports, excludeSystemJS)],
     build: {
       write: false,
-      target: false,
+      target: "es5",
       minify,
       assetsDir,
       rollupOptions: {
         input: {
-          [name]: polyfillId
+          polyfills: polyfillId
         },
         output: {
-          format: name.includes("legacy") ? "iife" : "es",
+          format,
+          entryFileNames: rollupOutputOptions.entryFileNames,
           manualChunks: void 0
         }
       }
@@ -403,10 +416,10 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
       facadeToChunkMap.set(chunk.facadeModuleId, polyfillChunk.fileName);
     }
   }
-  bundle[polyfillChunk.name] = polyfillChunk;
+  bundle[polyfillChunk.fileName] = polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
-function polyfillsPlugin(imports, externalSystemJS) {
+function polyfillsPlugin(imports, excludeSystemJS) {
   return {
     name: "vite:legacy-polyfills",
     resolveId(id) {
@@ -416,7 +429,7 @@ function polyfillsPlugin(imports, externalSystemJS) {
     },
     load(id) {
       if (id === polyfillId) {
-        return [...imports].map((i) => `import "${i}";`).join("") + (externalSystemJS ? "" : `import "systemjs/dist/s.min.js";`);
+        return [...imports].map((i) => `import "${i}";`).join("") + (excludeSystemJS ? "" : `import "systemjs/dist/s.min.js";`);
       }
     }
   };
@@ -471,10 +484,10 @@ function wrapIIFEBabelPlugin() {
   };
 }
 const cspHashes = [
-  crypto.createHash("sha256").update(safari10NoModuleFix).digest("base64"),
-  crypto.createHash("sha256").update(systemJSInlineCode).digest("base64"),
-  crypto.createHash("sha256").update(detectDynamicImportCode).digest("base64"),
-  crypto.createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
+  node_crypto.createHash("sha256").update(safari10NoModuleFix).digest("base64"),
+  node_crypto.createHash("sha256").update(systemJSInlineCode).digest("base64"),
+  node_crypto.createHash("sha256").update(detectModernBrowserCode).digest("base64"),
+  node_crypto.createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
 ];
 
 module.exports = viteLegacyPlugin;

package/dist/index.mjs

@@ -1,6 +1,8 @@
-import path from 'path';
-import { createHash } from 'crypto';
-import { build } from 'vite';
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { build, normalizePath } from 'vite';
 import MagicString from 'magic-string';
 
 let babel;
@@ -10,15 +12,26 @@ async function loadBabel() {
   }
   return babel;
 }
+function getBaseInHTML(urlRelativePath, baseOptions, config) {
+  return baseOptions.url ?? (baseOptions.relative ? path.posix.join(path.posix.relative(urlRelativePath, "").slice(0, -2), "./") : config.base);
+}
+function getAssetsBase(urlRelativePath, config) {
+  return getBaseInHTML(urlRelativePath, config.experimental.buildAdvancedBaseOptions.assets, config);
+}
+function toAssetPathFromHtml(filename, htmlPath, config) {
+  const relativeUrlPath = normalizePath(path.relative(config.root, htmlPath));
+  return getAssetsBase(relativeUrlPath, config) + filename;
+}
 const safari10NoModuleFix = `!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();`;
 const legacyPolyfillId = "vite-legacy-polyfill";
 const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
-const detectDynamicImportVarName = "__vite_is_dynamic_import_support";
-const detectDynamicImportCode = `try{import("_").catch(()=>1);}catch(e){}window.${detectDynamicImportVarName}=true;`;
-const dynamicFallbackInlineCode = `!function(){if(window.${detectDynamicImportVarName})return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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 detectModernBrowserVarName = "__vite_is_modern_browser";
+const detectModernBrowserCode = `try{import.meta.url;import("_").catch(()=>1);}catch(e){}window.${detectModernBrowserVarName}=true;`;
+const dynamicFallbackInlineCode = `!function(){if(window.${detectModernBrowserVarName})return;console.warn("vite: loading legacy build because dynamic import or import.meta.url is unsupported, syntax error above 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 forceDynamicImportUsage = `export function __vite_legacy_guard(){import('data:text/javascript,')};`;
 const legacyEnvVarMarker = `__VITE_IS_LEGACY__`;
+const _require = createRequire(import.meta.url);
 function viteLegacyPlugin(options = {}) {
   let config;
   const targets = options.targets || "defaults";
@@ -30,11 +43,7 @@ function viteLegacyPlugin(options = {}) {
   const facadeToLegacyPolyfillMap = /* @__PURE__ */ new Map();
   const facadeToModernPolyfillMap = /* @__PURE__ */ new Map();
   const modernPolyfills = /* @__PURE__ */ new Set();
-  const DEFAULT_LEGACY_POLYFILL = [
-    "core-js/modules/es.promise",
-    "core-js/modules/es.array.iterator"
-  ];
-  const legacyPolyfills = new Set(DEFAULT_LEGACY_POLYFILL);
+  const legacyPolyfills = /* @__PURE__ */ new Set();
   if (Array.isArray(options.modernPolyfills)) {
     options.modernPolyfills.forEach((i) => {
       modernPolyfills.add(i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`);
@@ -78,18 +87,16 @@ function viteLegacyPlugin(options = {}) {
           return;
         }
         isDebug && console.log(`[@vitejs/plugin-legacy] modern polyfills:`, modernPolyfills);
-        await buildPolyfillChunk("polyfills-modern", modernPolyfills, bundle, facadeToModernPolyfillMap, config.build, options.externalSystemJS);
+        await buildPolyfillChunk(modernPolyfills, bundle, facadeToModernPolyfillMap, config.build, "es", opts, true);
         return;
       }
       if (!genLegacy) {
         return;
       }
       if (legacyPolyfills.size || genDynamicFallback) {
-        if (!legacyPolyfills.has("es.promise")) {
-          await detectPolyfills(`Promise.resolve()`, targets, legacyPolyfills);
-        }
+        await detectPolyfills(`Promise.resolve(); Promise.all();`, targets, legacyPolyfills);
         isDebug && console.log(`[@vitejs/plugin-legacy] legacy polyfills:`, legacyPolyfills);
-        await buildPolyfillChunk("polyfills-legacy", legacyPolyfills, bundle, facadeToLegacyPolyfillMap, config.build, options.externalSystemJS);
+        await buildPolyfillChunk(legacyPolyfills, bundle, facadeToLegacyPolyfillMap, config.build, "iife", opts, options.externalSystemJS);
       }
     }
   };
@@ -176,7 +183,7 @@ function viteLegacyPlugin(options = {}) {
       const { code, map } = babel2.transform(raw, {
         babelrc: false,
         configFile: false,
-        compact: true,
+        compact: !!config.build.minify,
         sourceMaps,
         inputSourceMap: sourceMaps ? chunk.map : void 0,
         presets: [
@@ -191,19 +198,10 @@ function viteLegacyPlugin(options = {}) {
           ],
           [
             "env",
-            {
-              targets,
-              modules: false,
-              bugfixes: true,
-              loose: false,
-              useBuiltIns: needPolyfills ? "usage" : false,
-              corejs: needPolyfills ? {
-                version: require("core-js/package.json").version,
-                proposals: false
-              } : void 0,
-              shippedProposals: true,
+            createBabelPresetEnvOptions(targets, {
+              needPolyfills,
               ignoreBrowserslistConfig: options.ignoreBrowserslistConfig
-            }
+            })
           ]
         ]
       });
@@ -228,7 +226,8 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             type: "module",
-            src: `${config.base}${modernPolyfillFilename}`
+            crossorigin: true,
+            src: toAssetPathFromHtml(modernPolyfillFilename, chunk.facadeModuleId, config)
           }
         });
       } else if (modernPolyfills.size) {
@@ -249,8 +248,9 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyPolyfillId,
-            src: `${config.base}${legacyPolyfillFilename}`
+            src: toAssetPathFromHtml(legacyPolyfillFilename, chunk.facadeModuleId, config)
           },
           injectTo: "body"
         });
@@ -263,8 +263,9 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyEntryId,
-            "data-src": config.base + legacyEntryFilename
+            "data-src": toAssetPathFromHtml(legacyEntryFilename, chunk.facadeModuleId, config)
           },
           children: systemJSInlineCode,
           injectTo: "body"
@@ -276,7 +277,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: { type: "module" },
-          children: detectDynamicImportCode,
+          children: detectModernBrowserCode,
           injectTo: "head"
         });
         tags.push({
@@ -340,14 +341,7 @@ async function detectPolyfills(code, targets, list) {
     presets: [
       [
         "env",
-        {
-          targets,
-          modules: false,
-          useBuiltIns: "usage",
-          corejs: { version: 3, proposals: false },
-          shippedProposals: true,
-          ignoreBrowserslistConfig: true
-        }
+        createBabelPresetEnvOptions(targets, { ignoreBrowserslistConfig: true })
       ]
     ]
   });
@@ -360,25 +354,44 @@ async function detectPolyfills(code, targets, list) {
     }
   }
 }
-async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, buildOptions, externalSystemJS) {
+function createBabelPresetEnvOptions(targets, {
+  needPolyfills = true,
+  ignoreBrowserslistConfig
+}) {
+  return {
+    targets,
+    bugfixes: true,
+    loose: false,
+    modules: false,
+    useBuiltIns: needPolyfills ? "usage" : false,
+    corejs: needPolyfills ? {
+      version: _require("core-js/package.json").version,
+      proposals: false
+    } : void 0,
+    shippedProposals: true,
+    ignoreBrowserslistConfig
+  };
+}
+async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await build({
-    root: __dirname,
+    root: path.dirname(fileURLToPath(import.meta.url)),
     configFile: false,
     logLevel: "error",
-    plugins: [polyfillsPlugin(imports, externalSystemJS)],
+    plugins: [polyfillsPlugin(imports, excludeSystemJS)],
     build: {
       write: false,
-      target: false,
+      target: "es5",
       minify,
       assetsDir,
       rollupOptions: {
         input: {
-          [name]: polyfillId
+          polyfills: polyfillId
         },
         output: {
-          format: name.includes("legacy") ? "iife" : "es",
+          format,
+          entryFileNames: rollupOutputOptions.entryFileNames,
           manualChunks: void 0
         }
       }
@@ -394,10 +407,10 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
       facadeToChunkMap.set(chunk.facadeModuleId, polyfillChunk.fileName);
     }
   }
-  bundle[polyfillChunk.name] = polyfillChunk;
+  bundle[polyfillChunk.fileName] = polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
-function polyfillsPlugin(imports, externalSystemJS) {
+function polyfillsPlugin(imports, excludeSystemJS) {
   return {
     name: "vite:legacy-polyfills",
     resolveId(id) {
@@ -407,7 +420,7 @@ function polyfillsPlugin(imports, externalSystemJS) {
     },
     load(id) {
       if (id === polyfillId) {
-        return [...imports].map((i) => `import "${i}";`).join("") + (externalSystemJS ? "" : `import "systemjs/dist/s.min.js";`);
+        return [...imports].map((i) => `import "${i}";`).join("") + (excludeSystemJS ? "" : `import "systemjs/dist/s.min.js";`);
       }
     }
   };
@@ -464,7 +477,7 @@ function wrapIIFEBabelPlugin() {
 const cspHashes = [
   createHash("sha256").update(safari10NoModuleFix).digest("base64"),
   createHash("sha256").update(systemJSInlineCode).digest("base64"),
-  createHash("sha256").update(detectDynamicImportCode).digest("base64"),
+  createHash("sha256").update(detectModernBrowserCode).digest("base64"),
   createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-beta.0",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -19,11 +19,11 @@
   "scripts": {
     "dev": "unbuild --stub",
     "build": "unbuild && pnpm run patch-cjs",
-    "patch-cjs": "ts-node ../../scripts/patchCJS.ts",
+    "patch-cjs": "esno ../../scripts/patchCJS.ts",
     "prepublishOnly": "npm run build"
   },
   "engines": {
-    "node": ">=14.6.0"
+    "node": ">=14.18.0"
   },
   "repository": {
     "type": "git",
@@ -35,17 +35,18 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.17.11",
-    "core-js": "^3.22.4",
-    "magic-string": "^0.26.1",
+    "@babel/standalone": "^7.18.5",
+    "core-js": "^3.23.1",
+    "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
     "systemjs": "^6.12.1"
   },
   "peerDependencies": {
+    "terser": "^5.4.0",
     "vite": "^3.0.0-alpha"
   },
   "devDependencies": {
-    "vite": "workspace:*",
-    "@babel/core": "^7.17.10"
+    "@babel/core": "^7.18.5",
+    "vite": "workspace:*"
   }
 }