@vitejs/plugin-legacy 2.0.0 → 2.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You 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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.cjs

@@ -33,7 +33,9 @@ function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRela
     });
     if (typeof result === "object") {
       if (result.runtime) {
-        throw new Error(`{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`);
+        throw new Error(
+          `{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`
+        );
       }
       if (typeof result.relative === "boolean") {
         relative = result.relative;
@@ -49,12 +51,22 @@ function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRela
   }
 }
 function getBaseInHTML(urlRelativePath, config) {
-  return config.base === "./" || config.base === "" ? path__default.posix.join(path__default.posix.relative(urlRelativePath, "").slice(0, -2), "./") : config.base;
+  return config.base === "./" || config.base === "" ? path__default.posix.join(
+    path__default.posix.relative(urlRelativePath, "").slice(0, -2),
+    "./"
+  ) : config.base;
 }
 function toAssetPathFromHtml(filename, htmlPath, config) {
   const relativeUrlPath = vite.normalizePath(path__default.relative(config.root, htmlPath));
   const toRelative = (filename2, hostId) => getBaseInHTML(relativeUrlPath, config) + filename2;
-  return toOutputFilePathInHtml(filename, "asset", htmlPath, "html", config, toRelative);
+  return toOutputFilePathInHtml(
+    filename,
+    "asset",
+    htmlPath,
+    "html",
+    config,
+    toRelative
+  );
 }
 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";
@@ -80,7 +92,9 @@ function viteLegacyPlugin(options = {}) {
   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`);
+      modernPolyfills.add(
+        i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`
+      );
     });
   }
   if (Array.isArray(options.polyfills)) {
@@ -88,7 +102,9 @@ function viteLegacyPlugin(options = {}) {
       if (i.startsWith(`regenerator`)) {
         legacyPolyfills.add(`regenerator-runtime/runtime.js`);
       } else {
-        legacyPolyfills.add(i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`);
+        legacyPolyfills.add(
+          i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`
+        );
       }
     });
   }
@@ -120,17 +136,43 @@ function viteLegacyPlugin(options = {}) {
         if (!modernPolyfills.size) {
           return;
         }
-        isDebug && console.log(`[@vitejs/plugin-legacy] modern polyfills:`, modernPolyfills);
-        await buildPolyfillChunk(modernPolyfills, bundle, facadeToModernPolyfillMap, config.build, "es", opts, true);
+        isDebug && console.log(
+          `[@vitejs/plugin-legacy] modern polyfills:`,
+          modernPolyfills
+        );
+        await buildPolyfillChunk(
+          modernPolyfills,
+          bundle,
+          facadeToModernPolyfillMap,
+          config.build,
+          "es",
+          opts,
+          true
+        );
         return;
       }
       if (!genLegacy) {
         return;
       }
       if (legacyPolyfills.size || genDynamicFallback) {
-        await detectPolyfills(`Promise.resolve(); Promise.all();`, targets, legacyPolyfills);
-        isDebug && console.log(`[@vitejs/plugin-legacy] legacy polyfills:`, legacyPolyfills);
-        await buildPolyfillChunk(legacyPolyfills, bundle, facadeToLegacyPolyfillMap, config.build, "iife", opts, options.externalSystemJS);
+        await detectPolyfills(
+          `Promise.resolve(); Promise.all();`,
+          targets,
+          legacyPolyfills
+        );
+        isDebug && console.log(
+          `[@vitejs/plugin-legacy] legacy polyfills:`,
+          legacyPolyfills
+        );
+        await buildPolyfillChunk(
+          legacyPolyfills,
+          bundle,
+          facadeToLegacyPolyfillMap,
+          config.build,
+          "iife",
+          opts,
+          options.externalSystemJS
+        );
       }
     }
   };
@@ -192,7 +234,11 @@ function viteLegacyPlugin(options = {}) {
           const re = new RegExp(legacyEnvVarMarker, "g");
           let match;
           while (match = re.exec(raw)) {
-            ms.overwrite(match.index, match.index + legacyEnvVarMarker.length, `false`);
+            ms.overwrite(
+              match.index,
+              match.index + legacyEnvVarMarker.length,
+              `false`
+            );
           }
         }
         if (config.build.sourcemap) {
@@ -254,18 +300,26 @@ function viteLegacyPlugin(options = {}) {
       }
       const tags = [];
       const htmlFilename = chunk.facadeModuleId?.replace(/\?.*$/, "");
-      const modernPolyfillFilename = facadeToModernPolyfillMap.get(chunk.facadeModuleId);
+      const modernPolyfillFilename = facadeToModernPolyfillMap.get(
+        chunk.facadeModuleId
+      );
       if (modernPolyfillFilename) {
         tags.push({
           tag: "script",
           attrs: {
             type: "module",
             crossorigin: true,
-            src: toAssetPathFromHtml(modernPolyfillFilename, chunk.facadeModuleId, config)
+            src: toAssetPathFromHtml(
+              modernPolyfillFilename,
+              chunk.facadeModuleId,
+              config
+            )
           }
         });
       } else if (modernPolyfills.size) {
-        throw new Error(`No corresponding modern polyfill chunk found for ${htmlFilename}`);
+        throw new Error(
+          `No corresponding modern polyfill chunk found for ${htmlFilename}`
+        );
       }
       if (!genLegacy) {
         return { html, tags };
@@ -276,7 +330,9 @@ function viteLegacyPlugin(options = {}) {
         children: safari10NoModuleFix,
         injectTo: "body"
       });
-      const legacyPolyfillFilename = facadeToLegacyPolyfillMap.get(chunk.facadeModuleId);
+      const legacyPolyfillFilename = facadeToLegacyPolyfillMap.get(
+        chunk.facadeModuleId
+      );
       if (legacyPolyfillFilename) {
         tags.push({
           tag: "script",
@@ -284,14 +340,22 @@ function viteLegacyPlugin(options = {}) {
             nomodule: true,
             crossorigin: true,
             id: legacyPolyfillId,
-            src: toAssetPathFromHtml(legacyPolyfillFilename, chunk.facadeModuleId, config)
+            src: toAssetPathFromHtml(
+              legacyPolyfillFilename,
+              chunk.facadeModuleId,
+              config
+            )
           },
           injectTo: "body"
         });
       } else if (legacyPolyfills.size) {
-        throw new Error(`No corresponding legacy polyfill chunk found for ${htmlFilename}`);
+        throw new Error(
+          `No corresponding legacy polyfill chunk found for ${htmlFilename}`
+        );
       }
-      const legacyEntryFilename = facadeToLegacyChunkMap.get(chunk.facadeModuleId);
+      const legacyEntryFilename = facadeToLegacyChunkMap.get(
+        chunk.facadeModuleId
+      );
       if (legacyEntryFilename) {
         tags.push({
           tag: "script",
@@ -299,13 +363,19 @@ function viteLegacyPlugin(options = {}) {
             nomodule: true,
             crossorigin: true,
             id: legacyEntryId,
-            "data-src": toAssetPathFromHtml(legacyEntryFilename, chunk.facadeModuleId, config)
+            "data-src": toAssetPathFromHtml(
+              legacyEntryFilename,
+              chunk.facadeModuleId,
+              config
+            )
           },
           children: systemJSInlineCode,
           injectTo: "body"
         });
       } else {
-        throw new Error(`No corresponding legacy entry chunk found for ${htmlFilename}`);
+        throw new Error(
+          `No corresponding legacy entry chunk found for ${htmlFilename}`
+        );
       }
       if (genDynamicFallback && legacyPolyfillFilename && legacyEntryFilename) {
         tags.push({
@@ -355,7 +425,9 @@ function viteLegacyPlugin(options = {}) {
     },
     configResolved(config2) {
       if (envInjectionFailed) {
-        config2.logger.warn(`[@vitejs/plugin-legacy] import.meta.env.LEGACY was not injected due to incompatible vite version (requires vite@^2.0.0-beta.69).`);
+        config2.logger.warn(
+          `[@vitejs/plugin-legacy] import.meta.env.LEGACY was not injected due to incompatible vite version (requires vite@^2.0.0-beta.69).`
+        );
       }
     }
   };
@@ -456,6 +528,13 @@ function polyfillsPlugin(imports, excludeSystemJS) {
       if (id === polyfillId) {
         return [...imports].map((i) => `import "${i}";`).join("") + (excludeSystemJS ? "" : `import "systemjs/dist/s.min.js";`);
       }
+    },
+    renderChunk(_, __, opts) {
+      if (!excludeSystemJS) {
+        opts.__vite_skip_esbuild__ = true;
+        opts.__vite_force_terser__ = true;
+      }
+      return null;
     }
   };
 }
@@ -464,7 +543,9 @@ function isLegacyChunk(chunk, options) {
 }
 function isLegacyBundle(bundle, options) {
   if (options.format === "system") {
-    const entryChunk = Object.values(bundle).find((output) => output.type === "chunk" && output.isEntry);
+    const entryChunk = Object.values(bundle).find(
+      (output) => output.type === "chunk" && output.isEntry
+    );
     return !!entryChunk && entryChunk.fileName.includes("-legacy");
   }
   return false;

package/dist/index.mjs

@@ -24,7 +24,9 @@ function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRela
     });
     if (typeof result === "object") {
       if (result.runtime) {
-        throw new Error(`{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`);
+        throw new Error(
+          `{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`
+        );
       }
       if (typeof result.relative === "boolean") {
         relative = result.relative;
@@ -40,12 +42,22 @@ function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRela
   }
 }
 function getBaseInHTML(urlRelativePath, config) {
-  return config.base === "./" || config.base === "" ? path.posix.join(path.posix.relative(urlRelativePath, "").slice(0, -2), "./") : config.base;
+  return config.base === "./" || config.base === "" ? path.posix.join(
+    path.posix.relative(urlRelativePath, "").slice(0, -2),
+    "./"
+  ) : config.base;
 }
 function toAssetPathFromHtml(filename, htmlPath, config) {
   const relativeUrlPath = normalizePath(path.relative(config.root, htmlPath));
   const toRelative = (filename2, hostId) => getBaseInHTML(relativeUrlPath, config) + filename2;
-  return toOutputFilePathInHtml(filename, "asset", htmlPath, "html", config, toRelative);
+  return toOutputFilePathInHtml(
+    filename,
+    "asset",
+    htmlPath,
+    "html",
+    config,
+    toRelative
+  );
 }
 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";
@@ -71,7 +83,9 @@ function viteLegacyPlugin(options = {}) {
   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`);
+      modernPolyfills.add(
+        i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`
+      );
     });
   }
   if (Array.isArray(options.polyfills)) {
@@ -79,7 +93,9 @@ function viteLegacyPlugin(options = {}) {
       if (i.startsWith(`regenerator`)) {
         legacyPolyfills.add(`regenerator-runtime/runtime.js`);
       } else {
-        legacyPolyfills.add(i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`);
+        legacyPolyfills.add(
+          i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`
+        );
       }
     });
   }
@@ -111,17 +127,43 @@ function viteLegacyPlugin(options = {}) {
         if (!modernPolyfills.size) {
           return;
         }
-        isDebug && console.log(`[@vitejs/plugin-legacy] modern polyfills:`, modernPolyfills);
-        await buildPolyfillChunk(modernPolyfills, bundle, facadeToModernPolyfillMap, config.build, "es", opts, true);
+        isDebug && console.log(
+          `[@vitejs/plugin-legacy] modern polyfills:`,
+          modernPolyfills
+        );
+        await buildPolyfillChunk(
+          modernPolyfills,
+          bundle,
+          facadeToModernPolyfillMap,
+          config.build,
+          "es",
+          opts,
+          true
+        );
         return;
       }
       if (!genLegacy) {
         return;
       }
       if (legacyPolyfills.size || genDynamicFallback) {
-        await detectPolyfills(`Promise.resolve(); Promise.all();`, targets, legacyPolyfills);
-        isDebug && console.log(`[@vitejs/plugin-legacy] legacy polyfills:`, legacyPolyfills);
-        await buildPolyfillChunk(legacyPolyfills, bundle, facadeToLegacyPolyfillMap, config.build, "iife", opts, options.externalSystemJS);
+        await detectPolyfills(
+          `Promise.resolve(); Promise.all();`,
+          targets,
+          legacyPolyfills
+        );
+        isDebug && console.log(
+          `[@vitejs/plugin-legacy] legacy polyfills:`,
+          legacyPolyfills
+        );
+        await buildPolyfillChunk(
+          legacyPolyfills,
+          bundle,
+          facadeToLegacyPolyfillMap,
+          config.build,
+          "iife",
+          opts,
+          options.externalSystemJS
+        );
       }
     }
   };
@@ -183,7 +225,11 @@ function viteLegacyPlugin(options = {}) {
           const re = new RegExp(legacyEnvVarMarker, "g");
           let match;
           while (match = re.exec(raw)) {
-            ms.overwrite(match.index, match.index + legacyEnvVarMarker.length, `false`);
+            ms.overwrite(
+              match.index,
+              match.index + legacyEnvVarMarker.length,
+              `false`
+            );
           }
         }
         if (config.build.sourcemap) {
@@ -245,18 +291,26 @@ function viteLegacyPlugin(options = {}) {
       }
       const tags = [];
       const htmlFilename = chunk.facadeModuleId?.replace(/\?.*$/, "");
-      const modernPolyfillFilename = facadeToModernPolyfillMap.get(chunk.facadeModuleId);
+      const modernPolyfillFilename = facadeToModernPolyfillMap.get(
+        chunk.facadeModuleId
+      );
       if (modernPolyfillFilename) {
         tags.push({
           tag: "script",
           attrs: {
             type: "module",
             crossorigin: true,
-            src: toAssetPathFromHtml(modernPolyfillFilename, chunk.facadeModuleId, config)
+            src: toAssetPathFromHtml(
+              modernPolyfillFilename,
+              chunk.facadeModuleId,
+              config
+            )
           }
         });
       } else if (modernPolyfills.size) {
-        throw new Error(`No corresponding modern polyfill chunk found for ${htmlFilename}`);
+        throw new Error(
+          `No corresponding modern polyfill chunk found for ${htmlFilename}`
+        );
       }
       if (!genLegacy) {
         return { html, tags };
@@ -267,7 +321,9 @@ function viteLegacyPlugin(options = {}) {
         children: safari10NoModuleFix,
         injectTo: "body"
       });
-      const legacyPolyfillFilename = facadeToLegacyPolyfillMap.get(chunk.facadeModuleId);
+      const legacyPolyfillFilename = facadeToLegacyPolyfillMap.get(
+        chunk.facadeModuleId
+      );
       if (legacyPolyfillFilename) {
         tags.push({
           tag: "script",
@@ -275,14 +331,22 @@ function viteLegacyPlugin(options = {}) {
             nomodule: true,
             crossorigin: true,
             id: legacyPolyfillId,
-            src: toAssetPathFromHtml(legacyPolyfillFilename, chunk.facadeModuleId, config)
+            src: toAssetPathFromHtml(
+              legacyPolyfillFilename,
+              chunk.facadeModuleId,
+              config
+            )
           },
           injectTo: "body"
         });
       } else if (legacyPolyfills.size) {
-        throw new Error(`No corresponding legacy polyfill chunk found for ${htmlFilename}`);
+        throw new Error(
+          `No corresponding legacy polyfill chunk found for ${htmlFilename}`
+        );
       }
-      const legacyEntryFilename = facadeToLegacyChunkMap.get(chunk.facadeModuleId);
+      const legacyEntryFilename = facadeToLegacyChunkMap.get(
+        chunk.facadeModuleId
+      );
       if (legacyEntryFilename) {
         tags.push({
           tag: "script",
@@ -290,13 +354,19 @@ function viteLegacyPlugin(options = {}) {
             nomodule: true,
             crossorigin: true,
             id: legacyEntryId,
-            "data-src": toAssetPathFromHtml(legacyEntryFilename, chunk.facadeModuleId, config)
+            "data-src": toAssetPathFromHtml(
+              legacyEntryFilename,
+              chunk.facadeModuleId,
+              config
+            )
           },
           children: systemJSInlineCode,
           injectTo: "body"
         });
       } else {
-        throw new Error(`No corresponding legacy entry chunk found for ${htmlFilename}`);
+        throw new Error(
+          `No corresponding legacy entry chunk found for ${htmlFilename}`
+        );
       }
       if (genDynamicFallback && legacyPolyfillFilename && legacyEntryFilename) {
         tags.push({
@@ -346,7 +416,9 @@ function viteLegacyPlugin(options = {}) {
     },
     configResolved(config2) {
       if (envInjectionFailed) {
-        config2.logger.warn(`[@vitejs/plugin-legacy] import.meta.env.LEGACY was not injected due to incompatible vite version (requires vite@^2.0.0-beta.69).`);
+        config2.logger.warn(
+          `[@vitejs/plugin-legacy] import.meta.env.LEGACY was not injected due to incompatible vite version (requires vite@^2.0.0-beta.69).`
+        );
       }
     }
   };
@@ -447,6 +519,13 @@ function polyfillsPlugin(imports, excludeSystemJS) {
       if (id === polyfillId) {
         return [...imports].map((i) => `import "${i}";`).join("") + (excludeSystemJS ? "" : `import "systemjs/dist/s.min.js";`);
       }
+    },
+    renderChunk(_, __, opts) {
+      if (!excludeSystemJS) {
+        opts.__vite_skip_esbuild__ = true;
+        opts.__vite_force_terser__ = true;
+      }
+      return null;
     }
   };
 }
@@ -455,7 +534,9 @@ function isLegacyChunk(chunk, options) {
 }
 function isLegacyBundle(bundle, options) {
   if (options.format === "system") {
-    const entryChunk = Object.values(bundle).find((output) => output.type === "chunk" && output.isEntry);
+    const entryChunk = Object.values(bundle).find(
+      (output) => output.type === "chunk" && output.isEntry
+    );
     return !!entryChunk && entryChunk.fileName.includes("-legacy");
   }
   return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -23,7 +23,7 @@
     "prepublishOnly": "npm run build"
   },
   "engines": {
-    "node": ">=14.18.0"
+    "node": "^14.18.0 || >=16.0.0"
   },
   "repository": {
     "type": "git",
@@ -35,8 +35,8 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.18.8",
-    "core-js": "^3.23.4",
+    "@babel/standalone": "^7.18.12",
+    "core-js": "^3.24.1",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
     "systemjs": "^6.12.1"
@@ -46,7 +46,7 @@
     "vite": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.6",
+    "@babel/core": "^7.18.10",
     "vite": "workspace:*"
   }
 }