@vitejs/plugin-legacy 2.0.0-alpha.1 → 2.0.0-alpha.2

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`
@@ -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

@@ -26,10 +26,11 @@ const legacyPolyfillId = "vite-legacy-polyfill";
 const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
 const detectModernBrowserVarName = "__vite_is_modern_browser";
-const detectModernBrowserCode = `try{import(new URL(import.meta.url).href).catch(()=>1);}catch(e){}window.${detectModernBrowserVarName}=true;`;
+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 = module$1.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";
@@ -41,11 +42,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`);
@@ -89,22 +86,19 @@ 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);
       }
     }
   };
-  const _require = module$1.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href)));
   const legacyPostPlugin = {
     name: "vite:legacy-post-process",
     enforce: "post",
@@ -188,7 +182,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: [
@@ -203,19 +197,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
-            }
+            })
           ]
         ]
       });
@@ -240,6 +225,7 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             type: "module",
+            crossorigin: true,
             src: `${config.base}${modernPolyfillFilename}`
           }
         });
@@ -261,6 +247,7 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyPolyfillId,
             src: `${config.base}${legacyPolyfillFilename}`
           },
@@ -271,12 +258,14 @@ function viteLegacyPlugin(options = {}) {
       }
       const legacyEntryFilename = facadeToLegacyChunkMap.get(chunk.facadeModuleId);
       if (legacyEntryFilename) {
+        const nonBareBase = config.base === "" ? "./" : config.base;
         tags.push({
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyEntryId,
-            "data-src": config.base + legacyEntryFilename
+            "data-src": nonBareBase + legacyEntryFilename
           },
           children: systemJSInlineCode,
           injectTo: "body"
@@ -352,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 })
       ]
     ]
   });
@@ -372,14 +354,32 @@ 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: path__default.dirname(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,
@@ -387,10 +387,11 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
       assetsDir,
       rollupOptions: {
         input: {
-          [name]: polyfillId
+          polyfills: polyfillId
         },
         output: {
-          format: name.includes("legacy") ? "iife" : "es",
+          format,
+          entryFileNames: rollupOutputOptions.entryFileNames,
           manualChunks: void 0
         }
       }
@@ -409,7 +410,7 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
   bundle[polyfillChunk.fileName] = polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
-function polyfillsPlugin(imports, externalSystemJS) {
+function polyfillsPlugin(imports, excludeSystemJS) {
   return {
     name: "vite:legacy-polyfills",
     resolveId(id) {
@@ -419,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";`);
       }
     }
   };

package/dist/index.mjs

@@ -17,10 +17,11 @@ const legacyPolyfillId = "vite-legacy-polyfill";
 const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
 const detectModernBrowserVarName = "__vite_is_modern_browser";
-const detectModernBrowserCode = `try{import(new URL(import.meta.url).href).catch(()=>1);}catch(e){}window.${detectModernBrowserVarName}=true;`;
+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";
@@ -32,11 +33,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`);
@@ -80,22 +77,19 @@ 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);
       }
     }
   };
-  const _require = createRequire(import.meta.url);
   const legacyPostPlugin = {
     name: "vite:legacy-post-process",
     enforce: "post",
@@ -179,7 +173,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: [
@@ -194,19 +188,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
-            }
+            })
           ]
         ]
       });
@@ -231,6 +216,7 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             type: "module",
+            crossorigin: true,
             src: `${config.base}${modernPolyfillFilename}`
           }
         });
@@ -252,6 +238,7 @@ function viteLegacyPlugin(options = {}) {
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyPolyfillId,
             src: `${config.base}${legacyPolyfillFilename}`
           },
@@ -262,12 +249,14 @@ function viteLegacyPlugin(options = {}) {
       }
       const legacyEntryFilename = facadeToLegacyChunkMap.get(chunk.facadeModuleId);
       if (legacyEntryFilename) {
+        const nonBareBase = config.base === "" ? "./" : config.base;
         tags.push({
           tag: "script",
           attrs: {
             nomodule: true,
+            crossorigin: true,
             id: legacyEntryId,
-            "data-src": config.base + legacyEntryFilename
+            "data-src": nonBareBase + legacyEntryFilename
           },
           children: systemJSInlineCode,
           injectTo: "body"
@@ -343,14 +332,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 })
       ]
     ]
   });
@@ -363,14 +345,32 @@ 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: path.dirname(fileURLToPath(import.meta.url)),
     configFile: false,
     logLevel: "error",
-    plugins: [polyfillsPlugin(imports, externalSystemJS)],
+    plugins: [polyfillsPlugin(imports, excludeSystemJS)],
     build: {
       write: false,
       target: false,
@@ -378,10 +378,11 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
       assetsDir,
       rollupOptions: {
         input: {
-          [name]: polyfillId
+          polyfills: polyfillId
         },
         output: {
-          format: name.includes("legacy") ? "iife" : "es",
+          format,
+          entryFileNames: rollupOutputOptions.entryFileNames,
           manualChunks: void 0
         }
       }
@@ -400,7 +401,7 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
   bundle[polyfillChunk.fileName] = polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
-function polyfillsPlugin(imports, externalSystemJS) {
+function polyfillsPlugin(imports, excludeSystemJS) {
   return {
     name: "vite:legacy-polyfills",
     resolveId(id) {
@@ -410,7 +411,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";`);
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -19,7 +19,7 @@
   "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": {
@@ -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.22.8",
+    "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:*"
   }
 }