@vitejs/plugin-legacy 2.0.0-alpha.2 → 2.0.0

package/README.md

@@ -163,7 +163,7 @@ Run `node --input-type=module -e "import {cspHashes} from '@vitejs/plugin-legacy
 These values (without the `sha256-` prefix) can also be retrieved via
 
 ```js
-const { cspHashes } = require('@vitejs/plugin-legacy')
+import { cspHashes } from '@vitejs/plugin-legacy'
 ```
 
 When using the `regenerator-runtime` polyfill, it will attempt to use the `globalThis` object to register itself. If `globalThis` is not available (it is [fairly new](https://caniuse.com/?search=globalThis) and not widely supported, including IE 11), it attempts to perform dynamic `Function(...)` call which violates the CSP. To avoid dynamic `eval` in the absence of `globalThis` consider adding `core-js/proposals/global-this` to `additionalLegacyPolyfills` to define it.

package/dist/index.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const path = require('path');
-const crypto = require('crypto');
-const module$1 = require('module');
-const url = require('url');
+const path = require('node:path');
+const node_crypto = require('node:crypto');
+const node_module = require('node:module');
+const node_url = require('node:url');
 const vite = require('vite');
 const MagicString = require('magic-string');
 
@@ -21,6 +21,41 @@ async function loadBabel() {
   }
   return babel;
 }
+function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRelative) {
+  const { renderBuiltUrl } = config.experimental;
+  let relative = config.base === "" || config.base === "./";
+  if (renderBuiltUrl) {
+    const result = renderBuiltUrl(filename, {
+      hostId,
+      hostType,
+      type,
+      ssr: !!config.build.ssr
+    });
+    if (typeof result === "object") {
+      if (result.runtime) {
+        throw new Error(`{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`);
+      }
+      if (typeof result.relative === "boolean") {
+        relative = result.relative;
+      }
+    } else if (result) {
+      return result;
+    }
+  }
+  if (relative && !config.build.ssr) {
+    return toRelative(filename, hostId);
+  } else {
+    return config.base + filename;
+  }
+}
+function getBaseInHTML(urlRelativePath, config) {
+  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);
+}
 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";
 const legacyEntryId = "vite-legacy-entry";
@@ -30,7 +65,7 @@ const detectModernBrowserCode = `try{import.meta.url;import("_").catch(()=>1);}c
 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__`;
-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 _require = node_module.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href)));
 function viteLegacyPlugin(options = {}) {
   let config;
   const targets = options.targets || "defaults";
@@ -226,7 +261,7 @@ function viteLegacyPlugin(options = {}) {
           attrs: {
             type: "module",
             crossorigin: true,
-            src: `${config.base}${modernPolyfillFilename}`
+            src: toAssetPathFromHtml(modernPolyfillFilename, chunk.facadeModuleId, config)
           }
         });
       } else if (modernPolyfills.size) {
@@ -249,7 +284,7 @@ function viteLegacyPlugin(options = {}) {
             nomodule: true,
             crossorigin: true,
             id: legacyPolyfillId,
-            src: `${config.base}${legacyPolyfillFilename}`
+            src: toAssetPathFromHtml(legacyPolyfillFilename, chunk.facadeModuleId, config)
           },
           injectTo: "body"
         });
@@ -258,14 +293,13 @@ function viteLegacyPlugin(options = {}) {
       }
       const legacyEntryFilename = facadeToLegacyChunkMap.get(chunk.facadeModuleId);
       if (legacyEntryFilename) {
-        const nonBareBase = config.base === "" ? "./" : config.base;
         tags.push({
           tag: "script",
           attrs: {
             nomodule: true,
             crossorigin: true,
             id: legacyEntryId,
-            "data-src": nonBareBase + legacyEntryFilename
+            "data-src": toAssetPathFromHtml(legacyEntryFilename, chunk.facadeModuleId, config)
           },
           children: systemJSInlineCode,
           injectTo: "body"
@@ -376,13 +410,13 @@ async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOption
   let { minify, assetsDir } = buildOptions;
   minify = minify ? "terser" : false;
   const res = await vite.build({
-    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)))),
+    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: false,
+      target: "es5",
       minify,
       assetsDir,
       rollupOptions: {
@@ -475,10 +509,10 @@ function wrapIIFEBabelPlugin() {
   };
 }
 const cspHashes = [
-  crypto.createHash("sha256").update(safari10NoModuleFix).digest("base64"),
-  crypto.createHash("sha256").update(systemJSInlineCode).digest("base64"),
-  crypto.createHash("sha256").update(detectModernBrowserCode).digest("base64"),
-  crypto.createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
+  node_crypto.createHash("sha256").update(safari10NoModuleFix).digest("base64"),
+  node_crypto.createHash("sha256").update(systemJSInlineCode).digest("base64"),
+  node_crypto.createHash("sha256").update(detectModernBrowserCode).digest("base64"),
+  node_crypto.createHash("sha256").update(dynamicFallbackInlineCode).digest("base64")
 ];
 
 module.exports = viteLegacyPlugin;

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import path from 'path';
-import { createHash } from 'crypto';
-import { createRequire } from 'module';
-import { fileURLToPath } from 'url';
-import { build } from 'vite';
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { build, normalizePath } from 'vite';
 import MagicString from 'magic-string';
 
 let babel;
@@ -12,6 +12,41 @@ async function loadBabel() {
   }
   return babel;
 }
+function toOutputFilePathInHtml(filename, type, hostId, hostType, config, toRelative) {
+  const { renderBuiltUrl } = config.experimental;
+  let relative = config.base === "" || config.base === "./";
+  if (renderBuiltUrl) {
+    const result = renderBuiltUrl(filename, {
+      hostId,
+      hostType,
+      type,
+      ssr: !!config.build.ssr
+    });
+    if (typeof result === "object") {
+      if (result.runtime) {
+        throw new Error(`{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`);
+      }
+      if (typeof result.relative === "boolean") {
+        relative = result.relative;
+      }
+    } else if (result) {
+      return result;
+    }
+  }
+  if (relative && !config.build.ssr) {
+    return toRelative(filename, hostId);
+  } else {
+    return config.base + filename;
+  }
+}
+function getBaseInHTML(urlRelativePath, config) {
+  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);
+}
 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";
 const legacyEntryId = "vite-legacy-entry";
@@ -217,7 +252,7 @@ function viteLegacyPlugin(options = {}) {
           attrs: {
             type: "module",
             crossorigin: true,
-            src: `${config.base}${modernPolyfillFilename}`
+            src: toAssetPathFromHtml(modernPolyfillFilename, chunk.facadeModuleId, config)
           }
         });
       } else if (modernPolyfills.size) {
@@ -240,7 +275,7 @@ function viteLegacyPlugin(options = {}) {
             nomodule: true,
             crossorigin: true,
             id: legacyPolyfillId,
-            src: `${config.base}${legacyPolyfillFilename}`
+            src: toAssetPathFromHtml(legacyPolyfillFilename, chunk.facadeModuleId, config)
           },
           injectTo: "body"
         });
@@ -249,14 +284,13 @@ function viteLegacyPlugin(options = {}) {
       }
       const legacyEntryFilename = facadeToLegacyChunkMap.get(chunk.facadeModuleId);
       if (legacyEntryFilename) {
-        const nonBareBase = config.base === "" ? "./" : config.base;
         tags.push({
           tag: "script",
           attrs: {
             nomodule: true,
             crossorigin: true,
             id: legacyEntryId,
-            "data-src": nonBareBase + legacyEntryFilename
+            "data-src": toAssetPathFromHtml(legacyEntryFilename, chunk.facadeModuleId, config)
           },
           children: systemJSInlineCode,
           injectTo: "body"
@@ -373,7 +407,7 @@ async function buildPolyfillChunk(imports, bundle, facadeToChunkMap, buildOption
     plugins: [polyfillsPlugin(imports, excludeSystemJS)],
     build: {
       write: false,
-      target: false,
+      target: "es5",
       minify,
       assetsDir,
       rollupOptions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -19,11 +19,11 @@
   "scripts": {
     "dev": "unbuild --stub",
     "build": "unbuild && pnpm run patch-cjs",
-    "patch-cjs": "esno ../../scripts/patchCJS.ts",
+    "patch-cjs": "tsx ../../scripts/patchCJS.ts",
     "prepublishOnly": "npm run build"
   },
   "engines": {
-    "node": ">=14.6.0"
+    "node": ">=14.18.0"
   },
   "repository": {
     "type": "git",
@@ -35,18 +35,18 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.18.5",
-    "core-js": "^3.22.8",
+    "@babel/standalone": "^7.18.8",
+    "core-js": "^3.23.4",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
     "systemjs": "^6.12.1"
   },
   "peerDependencies": {
     "terser": "^5.4.0",
-    "vite": "^3.0.0-alpha"
+    "vite": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.5",
+    "@babel/core": "^7.18.6",
     "vite": "workspace:*"
   }
 }