@vitejs/plugin-legacy 5.0.0-beta.0 → 5.0.0-beta.2

package/README.md

@@ -44,6 +44,8 @@ npm add -D terser
 
   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.
+
 ### `polyfills`
 
 - **Type:** `boolean | string[]`
@@ -63,18 +65,6 @@ npm add -D terser
 
   Note: if additional polyfills are needed for both the modern and legacy chunks, they can simply be imported in the application source code.
 
-### `ignoreBrowserslistConfig`
-
-- **Type:** `boolean`
-- **Default:** `false`
-
-  `@babel/preset-env` automatically detects [`browserslist` config sources](https://github.com/browserslist/browserslist#browserslist-):
-
-  - `browserslist` field in `package.json`
-  - `.browserslistrc` file in cwd.
-
-  Set to `true` to ignore these sources.
-
 ### `modernPolyfills`
 
 - **Type:** `boolean | string[]`

package/dist/index.cjs

@@ -157,6 +157,14 @@ const _require = node_module.createRequire((typeof document === 'undefined' ? re
 function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
+  const modernTargetsEsbuild = [
+    "es2020",
+    "edge79",
+    "firefox67",
+    "chrome64",
+    "safari12"
+  ];
+  const modernTargetsBabel = "edge>=80, firefox>=72, chrome>=80, safari>=13.1, chromeAndroid>=80, iOS>=13.1";
   const genLegacy = options.renderLegacyChunks !== false;
   const genModern = options.renderModernChunks !== false;
   if (!genLegacy && !genModern) {
@@ -207,13 +215,7 @@ function viteLegacyPlugin(options = {}) {
         }
         if (genLegacy) {
           overriddenBuildTarget = config2.build.target !== void 0;
-          config2.build.target = [
-            "es2020",
-            "edge79",
-            "firefox67",
-            "chrome64",
-            "safari12"
-          ];
+          config2.build.target = modernTargetsEsbuild;
         }
       }
       return {
@@ -247,7 +249,7 @@ function viteLegacyPlugin(options = {}) {
           `[@vitejs/plugin-legacy] modern polyfills:`,
           modernPolyfills
         );
-        await buildPolyfillChunk(
+        const polyfillChunk = await buildPolyfillChunk(
           config.mode,
           modernPolyfills,
           bundle,
@@ -257,17 +259,22 @@ function viteLegacyPlugin(options = {}) {
           opts,
           true
         );
+        if (genLegacy && polyfillChunk) {
+          polyfillChunk.code = modernChunkLegacyGuard + polyfillChunk.code;
+        }
         return;
       }
       if (!genLegacy) {
         return;
       }
-      if (legacyPolyfills.size) {
+      if (options.polyfills !== false) {
         await detectPolyfills(
           `Promise.resolve(); Promise.all();`,
           targets,
           legacyPolyfills
         );
+      }
+      if (legacyPolyfills.size || !options.externalSystemJS) {
         isDebug && console.log(
           `[@vitejs/plugin-legacy] legacy polyfills:`,
           legacyPolyfills
@@ -309,6 +316,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 {
             fileName = fileName.replace(/(.+)\.(.+)/, "$1-legacy.$2");
           }
@@ -343,7 +352,7 @@ function viteLegacyPlugin(options = {}) {
       }
       if (!isLegacyChunk(chunk, opts)) {
         if (options.modernPolyfills && !Array.isArray(options.modernPolyfills) && genModern) {
-          await detectPolyfills(raw, { esmodules: true }, modernPolyfills);
+          await detectPolyfills(raw, modernTargetsBabel, modernPolyfills);
         }
         const ms = new MagicString__default(raw);
         if (genLegacy && chunk.isEntry) {
@@ -400,10 +409,7 @@ function viteLegacyPlugin(options = {}) {
           ],
           [
             (await import('@babel/preset-env')).default,
-            createBabelPresetEnvOptions(targets, {
-              needPolyfills,
-              ignoreBrowserslistConfig: options.ignoreBrowserslistConfig
-            })
+            createBabelPresetEnvOptions(targets, { needPolyfills })
           ]
         ]
       });
@@ -551,12 +557,11 @@ async function detectPolyfills(code, targets, list) {
     ast: true,
     babelrc: false,
     configFile: false,
+    compact: false,
     presets: [
       [
         (await import('@babel/preset-env')).default,
-        createBabelPresetEnvOptions(targets, {
-          ignoreBrowserslistConfig: true
-        })
+        createBabelPresetEnvOptions(targets, {})
       ]
     ]
   });
@@ -569,10 +574,7 @@ async function detectPolyfills(code, targets, list) {
     }
   }
 }
-function createBabelPresetEnvOptions(targets, {
-  needPolyfills = true,
-  ignoreBrowserslistConfig
-}) {
+function createBabelPresetEnvOptions(targets, { needPolyfills = true }) {
   return {
     targets,
     bugfixes: true,
@@ -584,7 +586,7 @@ function createBabelPresetEnvOptions(targets, {
       proposals: false
     } : void 0,
     shippedProposals: true,
-    ignoreBrowserslistConfig
+    ignoreBrowserslistConfig: true
   };
 }
 async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
@@ -635,6 +637,7 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
     }
   }
   bundle[polyfillChunk.fileName] = polyfillChunk;
+  return polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
 function polyfillsPlugin(imports, excludeSystemJS) {

package/dist/index.d.cts

@@ -0,0 +1,37 @@
+import { Plugin } from 'vite';
+
+interface Options {
+    /**
+     * default: 'defaults'
+     */
+    targets?: string | string[] | {
+        [key: string]: string;
+    };
+    /**
+     * default: true
+     */
+    polyfills?: boolean | string[];
+    additionalLegacyPolyfills?: string[];
+    /**
+     * default: false
+     */
+    modernPolyfills?: boolean | string[];
+    /**
+     * default: true
+     */
+    renderLegacyChunks?: boolean;
+    /**
+     * default: false
+     */
+    externalSystemJS?: boolean;
+    /**
+     * default: true
+     */
+    renderModernChunks?: boolean;
+}
+
+declare function viteLegacyPlugin(options?: Options): Plugin[];
+declare function detectPolyfills(code: string, targets: any, list: Set<string>): Promise<void>;
+declare const cspHashes: string[];
+
+export { cspHashes, viteLegacyPlugin as default, detectPolyfills };

package/dist/index.d.mts

@@ -0,0 +1,37 @@
+import { Plugin } from 'vite';
+
+interface Options {
+    /**
+     * default: 'defaults'
+     */
+    targets?: string | string[] | {
+        [key: string]: string;
+    };
+    /**
+     * default: true
+     */
+    polyfills?: boolean | string[];
+    additionalLegacyPolyfills?: string[];
+    /**
+     * default: false
+     */
+    modernPolyfills?: boolean | string[];
+    /**
+     * default: true
+     */
+    renderLegacyChunks?: boolean;
+    /**
+     * default: false
+     */
+    externalSystemJS?: boolean;
+    /**
+     * default: true
+     */
+    renderModernChunks?: boolean;
+}
+
+declare function viteLegacyPlugin(options?: Options): Plugin[];
+declare function detectPolyfills(code: string, targets: any, list: Set<string>): Promise<void>;
+declare const cspHashes: string[];
+
+export { cspHashes, viteLegacyPlugin as default, detectPolyfills };

package/dist/index.d.ts

@@ -7,10 +7,6 @@ interface Options {
     targets?: string | string[] | {
         [key: string]: string;
     };
-    /**
-     * default: false
-     */
-    ignoreBrowserslistConfig?: boolean;
     /**
      * default: true
      */

package/dist/index.mjs

@@ -145,6 +145,14 @@ const _require = createRequire(import.meta.url);
 function viteLegacyPlugin(options = {}) {
   let config;
   let targets;
+  const modernTargetsEsbuild = [
+    "es2020",
+    "edge79",
+    "firefox67",
+    "chrome64",
+    "safari12"
+  ];
+  const modernTargetsBabel = "edge>=80, firefox>=72, chrome>=80, safari>=13.1, chromeAndroid>=80, iOS>=13.1";
   const genLegacy = options.renderLegacyChunks !== false;
   const genModern = options.renderModernChunks !== false;
   if (!genLegacy && !genModern) {
@@ -195,13 +203,7 @@ function viteLegacyPlugin(options = {}) {
         }
         if (genLegacy) {
           overriddenBuildTarget = config2.build.target !== void 0;
-          config2.build.target = [
-            "es2020",
-            "edge79",
-            "firefox67",
-            "chrome64",
-            "safari12"
-          ];
+          config2.build.target = modernTargetsEsbuild;
         }
       }
       return {
@@ -235,7 +237,7 @@ function viteLegacyPlugin(options = {}) {
           `[@vitejs/plugin-legacy] modern polyfills:`,
           modernPolyfills
         );
-        await buildPolyfillChunk(
+        const polyfillChunk = await buildPolyfillChunk(
           config.mode,
           modernPolyfills,
           bundle,
@@ -245,17 +247,22 @@ function viteLegacyPlugin(options = {}) {
           opts,
           true
         );
+        if (genLegacy && polyfillChunk) {
+          polyfillChunk.code = modernChunkLegacyGuard + polyfillChunk.code;
+        }
         return;
       }
       if (!genLegacy) {
         return;
       }
-      if (legacyPolyfills.size) {
+      if (options.polyfills !== false) {
         await detectPolyfills(
           `Promise.resolve(); Promise.all();`,
           targets,
           legacyPolyfills
         );
+      }
+      if (legacyPolyfills.size || !options.externalSystemJS) {
         isDebug && console.log(
           `[@vitejs/plugin-legacy] legacy polyfills:`,
           legacyPolyfills
@@ -297,6 +304,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 {
             fileName = fileName.replace(/(.+)\.(.+)/, "$1-legacy.$2");
           }
@@ -331,7 +340,7 @@ function viteLegacyPlugin(options = {}) {
       }
       if (!isLegacyChunk(chunk, opts)) {
         if (options.modernPolyfills && !Array.isArray(options.modernPolyfills) && genModern) {
-          await detectPolyfills(raw, { esmodules: true }, modernPolyfills);
+          await detectPolyfills(raw, modernTargetsBabel, modernPolyfills);
         }
         const ms = new MagicString(raw);
         if (genLegacy && chunk.isEntry) {
@@ -388,10 +397,7 @@ function viteLegacyPlugin(options = {}) {
           ],
           [
             (await import('@babel/preset-env')).default,
-            createBabelPresetEnvOptions(targets, {
-              needPolyfills,
-              ignoreBrowserslistConfig: options.ignoreBrowserslistConfig
-            })
+            createBabelPresetEnvOptions(targets, { needPolyfills })
           ]
         ]
       });
@@ -539,12 +545,11 @@ async function detectPolyfills(code, targets, list) {
     ast: true,
     babelrc: false,
     configFile: false,
+    compact: false,
     presets: [
       [
         (await import('@babel/preset-env')).default,
-        createBabelPresetEnvOptions(targets, {
-          ignoreBrowserslistConfig: true
-        })
+        createBabelPresetEnvOptions(targets, {})
       ]
     ]
   });
@@ -557,10 +562,7 @@ async function detectPolyfills(code, targets, list) {
     }
   }
 }
-function createBabelPresetEnvOptions(targets, {
-  needPolyfills = true,
-  ignoreBrowserslistConfig
-}) {
+function createBabelPresetEnvOptions(targets, { needPolyfills = true }) {
   return {
     targets,
     bugfixes: true,
@@ -572,7 +574,7 @@ function createBabelPresetEnvOptions(targets, {
       proposals: false
     } : void 0,
     shippedProposals: true,
-    ignoreBrowserslistConfig
+    ignoreBrowserslistConfig: true
   };
 }
 async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
@@ -623,6 +625,7 @@ async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, build
     }
   }
   bundle[polyfillChunk.fileName] = polyfillChunk;
+  return polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
 function polyfillsPlugin(imports, excludeSystemJS) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0-beta.2",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -17,7 +17,6 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     }
@@ -36,11 +35,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.20",
+    "@babel/core": "^7.23.0",
     "@babel/preset-env": "^7.22.20",
-    "browserslist": "^4.21.10",
-    "core-js": "^3.32.2",
-    "magic-string": "^0.30.3",
+    "browserslist": "^4.22.1",
+    "core-js": "^3.33.0",
+    "magic-string": "^0.30.4",
     "regenerator-runtime": "^0.14.0",
     "systemjs": "^6.14.2"
   },
@@ -51,7 +50,7 @@
   "devDependencies": {
     "acorn": "^8.10.0",
     "picocolors": "^1.0.0",
-    "vite": "5.0.0-beta.2"
+    "vite": "5.0.0-beta.5"
   },
   "scripts": {
     "dev": "unbuild --stub",