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

package/README.md

@@ -122,9 +122,9 @@ The legacy plugin offers a way to use native `import()` in the modern build whil
 
 Polyfill specifier strings for `polyfills` and `modernPolyfills` can be either of the following:
 
-- Any [`core-js` 3 sub import paths](https://unpkg.com/browse/core-js@3.8.2/) - e.g. `es/map` will import `core-js/es/map`
+- Any [`core-js` 3 sub import paths](https://unpkg.com/browse/core-js@latest/) - e.g. `es/map` will import `core-js/es/map`
 
-- Any [individual `core-js` 3 modules](https://unpkg.com/browse/core-js@3.8.2/modules/) - e.g. `es.array.iterator` will import `core-js/modules/es.array.iterator.js`
+- Any [individual `core-js` 3 modules](https://unpkg.com/browse/core-js@latest/modules/) - e.g. `es.array.iterator` will import `core-js/modules/es.array.iterator.js`
 
 **Example**
 

package/dist/index.cjs

@@ -4,6 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const path = require('path');
 const crypto = require('crypto');
+const module$1 = require('module');
+const url = require('url');
 const vite = require('vite');
 const MagicString = require('magic-string');
 
@@ -23,9 +25,9 @@ const safari10NoModuleFix = `!function(){var e=document,t=e.createElement("scrip
 const legacyPolyfillId = "vite-legacy-polyfill";
 const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
-const detectDynamicImportVarName = "__vite_is_dynamic_import_support";
-const detectDynamicImportCode = `try{import("_").catch(()=>1);}catch(e){}window.${detectDynamicImportVarName}=true;`;
-const dynamicFallbackInlineCode = `!function(){if(window.${detectDynamicImportVarName})return;console.warn("vite: loading legacy build because dynamic import 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 detectModernBrowserVarName = "__vite_is_modern_browser";
+const detectModernBrowserCode = `try{import(new URL(import.meta.url).href).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__`;
 function viteLegacyPlugin(options = {}) {
@@ -102,6 +104,7 @@ function viteLegacyPlugin(options = {}) {
       }
     }
   };
+  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",
@@ -207,7 +210,7 @@ function viteLegacyPlugin(options = {}) {
               loose: false,
               useBuiltIns: needPolyfills ? "usage" : false,
               corejs: needPolyfills ? {
-                version: require("core-js/package.json").version,
+                version: _require("core-js/package.json").version,
                 proposals: false
               } : void 0,
               shippedProposals: true,
@@ -285,7 +288,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: { type: "module" },
-          children: detectDynamicImportCode,
+          children: detectModernBrowserCode,
           injectTo: "head"
         });
         tags.push({
@@ -373,7 +376,7 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await vite.build({
-    root: __dirname,
+    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)],
@@ -403,7 +406,7 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
       facadeToChunkMap.set(chunk.facadeModuleId, polyfillChunk.fileName);
     }
   }
-  bundle[polyfillChunk.name] = polyfillChunk;
+  bundle[polyfillChunk.fileName] = polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
 function polyfillsPlugin(imports, externalSystemJS) {
@@ -473,7 +476,7 @@ function wrapIIFEBabelPlugin() {
 const cspHashes = [
   crypto.createHash("sha256").update(safari10NoModuleFix).digest("base64"),
   crypto.createHash("sha256").update(systemJSInlineCode).digest("base64"),
-  crypto.createHash("sha256").update(detectDynamicImportCode).digest("base64"),
+  crypto.createHash("sha256").update(detectModernBrowserCode).digest("base64"),
   crypto.createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
 ];
 

package/dist/index.mjs

@@ -1,5 +1,7 @@
 import path from 'path';
 import { createHash } from 'crypto';
+import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
 import { build } from 'vite';
 import MagicString from 'magic-string';
 
@@ -14,9 +16,9 @@ const safari10NoModuleFix = `!function(){var e=document,t=e.createElement("scrip
 const legacyPolyfillId = "vite-legacy-polyfill";
 const legacyEntryId = "vite-legacy-entry";
 const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`;
-const detectDynamicImportVarName = "__vite_is_dynamic_import_support";
-const detectDynamicImportCode = `try{import("_").catch(()=>1);}catch(e){}window.${detectDynamicImportVarName}=true;`;
-const dynamicFallbackInlineCode = `!function(){if(window.${detectDynamicImportVarName})return;console.warn("vite: loading legacy build because dynamic import 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 detectModernBrowserVarName = "__vite_is_modern_browser";
+const detectModernBrowserCode = `try{import(new URL(import.meta.url).href).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__`;
 function viteLegacyPlugin(options = {}) {
@@ -93,6 +95,7 @@ function viteLegacyPlugin(options = {}) {
       }
     }
   };
+  const _require = createRequire(import.meta.url);
   const legacyPostPlugin = {
     name: "vite:legacy-post-process",
     enforce: "post",
@@ -198,7 +201,7 @@ function viteLegacyPlugin(options = {}) {
               loose: false,
               useBuiltIns: needPolyfills ? "usage" : false,
               corejs: needPolyfills ? {
-                version: require("core-js/package.json").version,
+                version: _require("core-js/package.json").version,
                 proposals: false
               } : void 0,
               shippedProposals: true,
@@ -276,7 +279,7 @@ function viteLegacyPlugin(options = {}) {
         tags.push({
           tag: "script",
           attrs: { type: "module" },
-          children: detectDynamicImportCode,
+          children: detectModernBrowserCode,
           injectTo: "head"
         });
         tags.push({
@@ -364,7 +367,7 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await build({
-    root: __dirname,
+    root: path.dirname(fileURLToPath(import.meta.url)),
     configFile: false,
     logLevel: "error",
     plugins: [polyfillsPlugin(imports, externalSystemJS)],
@@ -394,7 +397,7 @@ async function buildPolyfillChunk(name, imports, bundle, facadeToChunkMap, build
       facadeToChunkMap.set(chunk.facadeModuleId, polyfillChunk.fileName);
     }
   }
-  bundle[polyfillChunk.name] = polyfillChunk;
+  bundle[polyfillChunk.fileName] = polyfillChunk;
 }
 const polyfillId = "\0vite/legacy-polyfills";
 function polyfillsPlugin(imports, externalSystemJS) {
@@ -464,7 +467,7 @@ function wrapIIFEBabelPlugin() {
 const cspHashes = [
   createHash("sha256").update(safari10NoModuleFix).digest("base64"),
   createHash("sha256").update(systemJSInlineCode).digest("base64"),
-  createHash("sha256").update(detectDynamicImportCode).digest("base64"),
+  createHash("sha256").update(detectModernBrowserCode).digest("base64"),
   createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "license": "MIT",
   "author": "Evan You",
   "files": [