@vitejs/plugin-legacy 4.0.5 → 4.1.1

package/README.md

@@ -117,6 +117,13 @@ npm add -D terser
 
   Defaults to `false`. Enabling this option will exclude `systemjs/dist/s.min.js` inside polyfills-legacy chunk.
 
+### `renderModernChunks`
+
+- **Type:** `boolean`
+- **Default:** `true`
+
+  Set to `false` to only output the legacy bundles that support all target browsers.
+
 ## Browsers that supports ESM but does not support widely-available features
 
 The legacy plugin offers a way to use widely-available features natively in the modern build, while falling back to the legacy build in browsers with native ESM but without those features supported (e.g. Legacy Edge). This feature works by injecting a runtime check and loading the legacy bundle with SystemJs runtime if needed. There are the following drawbacks:

package/dist/index.cjs

@@ -157,6 +157,12 @@ function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
   const genLegacy = options.renderLegacyChunks !== false;
+  const genModern = options.renderModernChunks !== false;
+  if (!genLegacy && !genModern) {
+    throw new Error(
+      "`renderLegacyChunks` and `renderModernChunks` cannot be both false"
+    );
+  }
   const debugFlags = (process.env.DEBUG || "").split(",");
   const isDebug = debugFlags.includes("vite:*") || debugFlags.includes("vite:legacy");
   const facadeToLegacyChunkMap = /* @__PURE__ */ new Map();
@@ -164,7 +170,7 @@ function viteLegacyPlugin(options = {}) {
   const facadeToModernPolyfillMap = /* @__PURE__ */ new Map();
   const modernPolyfills = /* @__PURE__ */ new Set();
   const legacyPolyfills = /* @__PURE__ */ new Set();
-  if (Array.isArray(options.modernPolyfills)) {
+  if (Array.isArray(options.modernPolyfills) && genModern) {
     options.modernPolyfills.forEach((i) => {
       modernPolyfills.add(
         i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`
@@ -319,9 +325,15 @@ function viteLegacyPlugin(options = {}) {
       const { rollupOptions } = config.build;
       const { output } = rollupOptions;
       if (Array.isArray(output)) {
-        rollupOptions.output = [...output.map(createLegacyOutput), ...output];
+        rollupOptions.output = [
+          ...output.map(createLegacyOutput),
+          ...genModern ? output : []
+        ];
       } else {
-        rollupOptions.output = [createLegacyOutput(output), output || {}];
+        rollupOptions.output = [
+          createLegacyOutput(output),
+          ...genModern ? [output || {}] : []
+        ];
       }
     },
     async renderChunk(raw, chunk, opts) {
@@ -329,7 +341,7 @@ function viteLegacyPlugin(options = {}) {
         return null;
       }
       if (!isLegacyChunk(chunk, opts)) {
-        if (options.modernPolyfills && !Array.isArray(options.modernPolyfills)) {
+        if (options.modernPolyfills && !Array.isArray(options.modernPolyfills) && genModern) {
           await detectPolyfills(raw, { esmodules: true }, modernPolyfills);
         }
         const ms = new MagicString__default(raw);
@@ -405,40 +417,49 @@ function viteLegacyPlugin(options = {}) {
         return;
       if (chunk.fileName.includes("-legacy")) {
         facadeToLegacyChunkMap.set(chunk.facadeModuleId, chunk.fileName);
-        return;
+        if (genModern) {
+          return;
+        }
+      }
+      if (!genModern) {
+        html = html.replace(/<script type="module".*?<\/script>/g, "");
       }
       const tags = [];
       const htmlFilename = chunk.facadeModuleId?.replace(/\?.*$/, "");
-      const modernPolyfillFilename = facadeToModernPolyfillMap.get(
-        chunk.facadeModuleId
-      );
-      if (modernPolyfillFilename) {
-        tags.push({
-          tag: "script",
-          attrs: {
-            type: "module",
-            crossorigin: true,
-            src: toAssetPathFromHtml(
-              modernPolyfillFilename,
-              chunk.facadeModuleId,
-              config
-            )
-          }
-        });
-      } else if (modernPolyfills.size) {
-        throw new Error(
-          `No corresponding modern polyfill chunk found for ${htmlFilename}`
+      if (genModern) {
+        const modernPolyfillFilename = facadeToModernPolyfillMap.get(
+          chunk.facadeModuleId
         );
+        if (modernPolyfillFilename) {
+          tags.push({
+            tag: "script",
+            attrs: {
+              type: "module",
+              crossorigin: true,
+              src: toAssetPathFromHtml(
+                modernPolyfillFilename,
+                chunk.facadeModuleId,
+                config
+              )
+            }
+          });
+        } else if (modernPolyfills.size) {
+          throw new Error(
+            `No corresponding modern polyfill chunk found for ${htmlFilename}`
+          );
+        }
       }
       if (!genLegacy) {
         return { html, tags };
       }
-      tags.push({
-        tag: "script",
-        attrs: { nomodule: true },
-        children: safari10NoModuleFix,
-        injectTo: "body"
-      });
+      if (genModern) {
+        tags.push({
+          tag: "script",
+          attrs: { nomodule: genModern },
+          children: safari10NoModuleFix,
+          injectTo: "body"
+        });
+      }
       const legacyPolyfillFilename = facadeToLegacyPolyfillMap.get(
         chunk.facadeModuleId
       );
@@ -446,7 +467,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: {
-            nomodule: true,
+            nomodule: genModern,
             crossorigin: true,
             id: legacyPolyfillId,
             src: toAssetPathFromHtml(
@@ -469,7 +490,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: {
-            nomodule: true,
+            nomodule: genModern,
             crossorigin: true,
             // we set the entry path on the element as an attribute so that the
             // script content will stay consistent - which allows using a constant
@@ -489,7 +510,7 @@ function viteLegacyPlugin(options = {}) {
           `No corresponding legacy entry chunk found for ${htmlFilename}`
         );
       }
-      if (genLegacy && legacyPolyfillFilename && legacyEntryFilename) {
+      if (legacyPolyfillFilename && legacyEntryFilename && genModern) {
         tags.push({
           tag: "script",
           attrs: { type: "module" },
@@ -512,7 +533,7 @@ function viteLegacyPlugin(options = {}) {
       if (config.build.ssr) {
         return;
       }
-      if (isLegacyBundle(bundle, opts)) {
+      if (isLegacyBundle(bundle, opts) && genModern) {
         for (const name in bundle) {
           if (bundle[name].type === "asset" && !/.+\.map$/.test(name)) {
             delete bundle[name];

package/dist/index.d.ts

@@ -28,6 +28,10 @@ interface Options {
      * default: false
      */
     externalSystemJS?: boolean;
+    /**
+     * default: true
+     */
+    renderModernChunks?: boolean;
 }
 
 declare function viteLegacyPlugin(options?: Options): Plugin[];

package/dist/index.mjs

@@ -146,6 +146,12 @@ function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
   const genLegacy = options.renderLegacyChunks !== false;
+  const genModern = options.renderModernChunks !== false;
+  if (!genLegacy && !genModern) {
+    throw new Error(
+      "`renderLegacyChunks` and `renderModernChunks` cannot be both false"
+    );
+  }
   const debugFlags = (process.env.DEBUG || "").split(",");
   const isDebug = debugFlags.includes("vite:*") || debugFlags.includes("vite:legacy");
   const facadeToLegacyChunkMap = /* @__PURE__ */ new Map();
@@ -153,7 +159,7 @@ function viteLegacyPlugin(options = {}) {
   const facadeToModernPolyfillMap = /* @__PURE__ */ new Map();
   const modernPolyfills = /* @__PURE__ */ new Set();
   const legacyPolyfills = /* @__PURE__ */ new Set();
-  if (Array.isArray(options.modernPolyfills)) {
+  if (Array.isArray(options.modernPolyfills) && genModern) {
     options.modernPolyfills.forEach((i) => {
       modernPolyfills.add(
         i.includes("/") ? `core-js/${i}` : `core-js/modules/${i}.js`
@@ -308,9 +314,15 @@ function viteLegacyPlugin(options = {}) {
       const { rollupOptions } = config.build;
       const { output } = rollupOptions;
       if (Array.isArray(output)) {
-        rollupOptions.output = [...output.map(createLegacyOutput), ...output];
+        rollupOptions.output = [
+          ...output.map(createLegacyOutput),
+          ...genModern ? output : []
+        ];
       } else {
-        rollupOptions.output = [createLegacyOutput(output), output || {}];
+        rollupOptions.output = [
+          createLegacyOutput(output),
+          ...genModern ? [output || {}] : []
+        ];
       }
     },
     async renderChunk(raw, chunk, opts) {
@@ -318,7 +330,7 @@ function viteLegacyPlugin(options = {}) {
         return null;
       }
       if (!isLegacyChunk(chunk, opts)) {
-        if (options.modernPolyfills && !Array.isArray(options.modernPolyfills)) {
+        if (options.modernPolyfills && !Array.isArray(options.modernPolyfills) && genModern) {
           await detectPolyfills(raw, { esmodules: true }, modernPolyfills);
         }
         const ms = new MagicString(raw);
@@ -394,40 +406,49 @@ function viteLegacyPlugin(options = {}) {
         return;
       if (chunk.fileName.includes("-legacy")) {
         facadeToLegacyChunkMap.set(chunk.facadeModuleId, chunk.fileName);
-        return;
+        if (genModern) {
+          return;
+        }
+      }
+      if (!genModern) {
+        html = html.replace(/<script type="module".*?<\/script>/g, "");
       }
       const tags = [];
       const htmlFilename = chunk.facadeModuleId?.replace(/\?.*$/, "");
-      const modernPolyfillFilename = facadeToModernPolyfillMap.get(
-        chunk.facadeModuleId
-      );
-      if (modernPolyfillFilename) {
-        tags.push({
-          tag: "script",
-          attrs: {
-            type: "module",
-            crossorigin: true,
-            src: toAssetPathFromHtml(
-              modernPolyfillFilename,
-              chunk.facadeModuleId,
-              config
-            )
-          }
-        });
-      } else if (modernPolyfills.size) {
-        throw new Error(
-          `No corresponding modern polyfill chunk found for ${htmlFilename}`
+      if (genModern) {
+        const modernPolyfillFilename = facadeToModernPolyfillMap.get(
+          chunk.facadeModuleId
         );
+        if (modernPolyfillFilename) {
+          tags.push({
+            tag: "script",
+            attrs: {
+              type: "module",
+              crossorigin: true,
+              src: toAssetPathFromHtml(
+                modernPolyfillFilename,
+                chunk.facadeModuleId,
+                config
+              )
+            }
+          });
+        } else if (modernPolyfills.size) {
+          throw new Error(
+            `No corresponding modern polyfill chunk found for ${htmlFilename}`
+          );
+        }
       }
       if (!genLegacy) {
         return { html, tags };
       }
-      tags.push({
-        tag: "script",
-        attrs: { nomodule: true },
-        children: safari10NoModuleFix,
-        injectTo: "body"
-      });
+      if (genModern) {
+        tags.push({
+          tag: "script",
+          attrs: { nomodule: genModern },
+          children: safari10NoModuleFix,
+          injectTo: "body"
+        });
+      }
       const legacyPolyfillFilename = facadeToLegacyPolyfillMap.get(
         chunk.facadeModuleId
       );
@@ -435,7 +456,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: {
-            nomodule: true,
+            nomodule: genModern,
             crossorigin: true,
             id: legacyPolyfillId,
             src: toAssetPathFromHtml(
@@ -458,7 +479,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: {
-            nomodule: true,
+            nomodule: genModern,
             crossorigin: true,
             // we set the entry path on the element as an attribute so that the
             // script content will stay consistent - which allows using a constant
@@ -478,7 +499,7 @@ function viteLegacyPlugin(options = {}) {
           `No corresponding legacy entry chunk found for ${htmlFilename}`
         );
       }
-      if (genLegacy && legacyPolyfillFilename && legacyEntryFilename) {
+      if (legacyPolyfillFilename && legacyEntryFilename && genModern) {
         tags.push({
           tag: "script",
           attrs: { type: "module" },
@@ -501,7 +522,7 @@ function viteLegacyPlugin(options = {}) {
       if (config.build.ssr) {
         return;
       }
-      if (isLegacyBundle(bundle, opts)) {
+      if (isLegacyBundle(bundle, opts) && genModern) {
         for (const name in bundle) {
           if (bundle[name].type === "asset" && !/.+\.map$/.test(name)) {
             delete bundle[name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "4.0.5",
+  "version": "4.1.1",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -42,11 +42,11 @@
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "funding": "https://github.com/vitejs/vite?sponsor=1",
   "dependencies": {
-    "@babel/core": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
+    "@babel/core": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
     "browserslist": "^4.21.9",
-    "core-js": "^3.31.0",
-    "magic-string": "^0.30.0",
+    "core-js": "^3.31.1",
+    "magic-string": "^0.30.1",
     "regenerator-runtime": "^0.13.11",
     "systemjs": "^6.14.1"
   },
@@ -55,7 +55,7 @@
     "vite": "^4.0.0"
   },
   "devDependencies": {
-    "acorn": "^8.9.0",
+    "acorn": "^8.10.0",
     "picocolors": "^1.0.0",
     "vite": "workspace:*"
   }