@vitejs/plugin-legacy 2.0.1 → 2.1.0-beta.0

package/dist/index.cjs

@@ -115,14 +115,20 @@ function viteLegacyPlugin(options = {}) {
   }
   const legacyConfigPlugin = {
     name: "vite:legacy-config",
-    apply: "build",
-    config(config2) {
-      if (!config2.build) {
-        config2.build = {};
-      }
-      if (!config2.build.cssTarget) {
-        config2.build.cssTarget = "chrome61";
+    config(config2, env) {
+      if (env.command === "build") {
+        if (!config2.build) {
+          config2.build = {};
+        }
+        if (!config2.build.cssTarget) {
+          config2.build.cssTarget = "chrome61";
+        }
       }
+      return {
+        define: {
+          "import.meta.env.LEGACY": env.command === "serve" || config2.build?.ssr ? false : legacyEnvVarMarker
+        }
+      };
     }
   };
   const legacyGenerateBundlePlugin = {
@@ -141,6 +147,7 @@ function viteLegacyPlugin(options = {}) {
           modernPolyfills
         );
         await buildPolyfillChunk(
+          config.mode,
           modernPolyfills,
           bundle,
           facadeToModernPolyfillMap,
@@ -165,6 +172,7 @@ function viteLegacyPlugin(options = {}) {
           legacyPolyfills
         );
         await buildPolyfillChunk(
+          config.mode,
           legacyPolyfills,
           bundle,
           facadeToLegacyPolyfillMap,
@@ -409,34 +417,7 @@ function viteLegacyPlugin(options = {}) {
       }
     }
   };
-  let envInjectionFailed = false;
-  const legacyEnvPlugin = {
-    name: "vite:legacy-env",
-    config(config2, env) {
-      if (env) {
-        return {
-          define: {
-            "import.meta.env.LEGACY": env.command === "serve" || config2.build?.ssr ? false : legacyEnvVarMarker
-          }
-        };
-      } else {
-        envInjectionFailed = true;
-      }
-    },
-    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).`
-        );
-      }
-    }
-  };
-  return [
-    legacyConfigPlugin,
-    legacyGenerateBundlePlugin,
-    legacyPostPlugin,
-    legacyEnvPlugin
-  ];
+  return [legacyConfigPlugin, legacyGenerateBundlePlugin, legacyPostPlugin];
 }
 async function detectPolyfills(code, targets, list) {
   const babel2 = await loadBabel();
@@ -478,17 +459,17 @@ function createBabelPresetEnvOptions(targets, {
     ignoreBrowserslistConfig
   };
 }
-async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
+async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await vite.build({
+    mode,
     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, excludeSystemJS)],
     build: {
       write: false,
-      target: "es5",
       minify,
       assetsDir,
       rollupOptions: {
@@ -497,10 +478,15 @@ async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOption
         },
         output: {
           format,
-          entryFileNames: rollupOutputOptions.entryFileNames,
-          manualChunks: void 0
+          entryFileNames: rollupOutputOptions.entryFileNames
         }
       }
+    },
+    esbuild: false,
+    optimizeDeps: {
+      esbuildOptions: {
+        target: "es5"
+      }
     }
   });
   const _polyfillChunk = Array.isArray(res) ? res[0] : res;
@@ -528,13 +514,6 @@ 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;
     }
   };
 }

package/dist/index.mjs

@@ -106,14 +106,20 @@ function viteLegacyPlugin(options = {}) {
   }
   const legacyConfigPlugin = {
     name: "vite:legacy-config",
-    apply: "build",
-    config(config2) {
-      if (!config2.build) {
-        config2.build = {};
-      }
-      if (!config2.build.cssTarget) {
-        config2.build.cssTarget = "chrome61";
+    config(config2, env) {
+      if (env.command === "build") {
+        if (!config2.build) {
+          config2.build = {};
+        }
+        if (!config2.build.cssTarget) {
+          config2.build.cssTarget = "chrome61";
+        }
       }
+      return {
+        define: {
+          "import.meta.env.LEGACY": env.command === "serve" || config2.build?.ssr ? false : legacyEnvVarMarker
+        }
+      };
     }
   };
   const legacyGenerateBundlePlugin = {
@@ -132,6 +138,7 @@ function viteLegacyPlugin(options = {}) {
           modernPolyfills
         );
         await buildPolyfillChunk(
+          config.mode,
           modernPolyfills,
           bundle,
           facadeToModernPolyfillMap,
@@ -156,6 +163,7 @@ function viteLegacyPlugin(options = {}) {
           legacyPolyfills
         );
         await buildPolyfillChunk(
+          config.mode,
           legacyPolyfills,
           bundle,
           facadeToLegacyPolyfillMap,
@@ -400,34 +408,7 @@ function viteLegacyPlugin(options = {}) {
       }
     }
   };
-  let envInjectionFailed = false;
-  const legacyEnvPlugin = {
-    name: "vite:legacy-env",
-    config(config2, env) {
-      if (env) {
-        return {
-          define: {
-            "import.meta.env.LEGACY": env.command === "serve" || config2.build?.ssr ? false : legacyEnvVarMarker
-          }
-        };
-      } else {
-        envInjectionFailed = true;
-      }
-    },
-    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).`
-        );
-      }
-    }
-  };
-  return [
-    legacyConfigPlugin,
-    legacyGenerateBundlePlugin,
-    legacyPostPlugin,
-    legacyEnvPlugin
-  ];
+  return [legacyConfigPlugin, legacyGenerateBundlePlugin, legacyPostPlugin];
 }
 async function detectPolyfills(code, targets, list) {
   const babel2 = await loadBabel();
@@ -469,17 +450,17 @@ function createBabelPresetEnvOptions(targets, {
     ignoreBrowserslistConfig
   };
 }
-async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
+async function buildPolyfillChunk(mode, imports, bundle, facadeToChunkMap, buildOptions, format, rollupOutputOptions, excludeSystemJS) {
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await build({
+    mode,
     root: path.dirname(fileURLToPath(import.meta.url)),
     configFile: false,
     logLevel: "error",
     plugins: [polyfillsPlugin(imports, excludeSystemJS)],
     build: {
       write: false,
-      target: "es5",
       minify,
       assetsDir,
       rollupOptions: {
@@ -488,10 +469,15 @@ async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOption
         },
         output: {
           format,
-          entryFileNames: rollupOutputOptions.entryFileNames,
-          manualChunks: void 0
+          entryFileNames: rollupOutputOptions.entryFileNames
         }
       }
+    },
+    esbuild: false,
+    optimizeDeps: {
+      esbuildOptions: {
+        target: "es5"
+      }
     }
   });
   const _polyfillChunk = Array.isArray(res) ? res[0] : res;
@@ -519,13 +505,6 @@ 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;
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.1",
+  "version": "2.1.0-beta.0",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -35,18 +35,18 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.18.12",
-    "core-js": "^3.24.1",
+    "@babel/standalone": "^7.18.13",
+    "core-js": "^3.25.0",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
-    "systemjs": "^6.12.1"
+    "systemjs": "^6.12.4"
   },
   "peerDependencies": {
     "terser": "^5.4.0",
     "vite": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.10",
+    "@babel/core": "^7.18.13",
     "vite": "workspace:*"
   }
 }