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

package/dist/index.cjs

@@ -21,15 +21,40 @@ async function loadBabel() {
   }
   return babel;
 }
-function getBaseInHTML(urlRelativePath, baseOptions, config) {
-  return baseOptions.url ?? (baseOptions.relative ? path__default.posix.join(path__default.posix.relative(urlRelativePath, "").slice(0, -2), "./") : config.base);
+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 getAssetsBase(urlRelativePath, config) {
-  return getBaseInHTML(urlRelativePath, config.experimental.buildAdvancedBaseOptions.assets, config);
+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));
-  return getAssetsBase(relativeUrlPath, config) + filename;
+  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";

package/dist/index.mjs

@@ -12,15 +12,40 @@ async function loadBabel() {
   }
   return babel;
 }
-function getBaseInHTML(urlRelativePath, baseOptions, config) {
-  return baseOptions.url ?? (baseOptions.relative ? path.posix.join(path.posix.relative(urlRelativePath, "").slice(0, -2), "./") : config.base);
+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 getAssetsBase(urlRelativePath, config) {
-  return getBaseInHTML(urlRelativePath, config.experimental.buildAdvancedBaseOptions.assets, config);
+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));
-  return getAssetsBase(relativeUrlPath, config) + filename;
+  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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-legacy",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -19,7 +19,7 @@
   "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": {
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
   "dependencies": {
-    "@babel/standalone": "^7.18.5",
+    "@babel/standalone": "^7.18.7",
     "core-js": "^3.23.1",
     "magic-string": "^0.26.2",
     "regenerator-runtime": "^0.13.9",
@@ -46,7 +46,7 @@
     "vite": "^3.0.0-alpha"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.5",
+    "@babel/core": "^7.18.6",
     "vite": "workspace:*"
   }
 }