@marko/vite 5.0.9 → 5.0.11

package/dist/index.mjs

@@ -4,8 +4,8 @@ import anyMatch from "anymatch";
 import crypto from "crypto";
 import glob2 from "fast-glob";
 import fs4 from "fs";
+import { createRequire } from "module";
 import path6 from "path";
-import { pathToFileURL } from "url";
 
 // src/babel-plugin-cjs-interop.ts
 import * as t from "@babel/types";
@@ -791,6 +791,7 @@ static const assets = [${opts.entryData.join(",")}];
 // src/index.ts
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
+var TEMPLATE_ID_HASH_OPTS = { outputLength: 3 };
 var normalizePath = path6.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 var virtualFiles = /* @__PURE__ */ new Map();
 var extReg = /\.[^.]+$/;
@@ -828,7 +829,7 @@ function markoPlugin(opts = {}) {
   const resolveVirtualDependency = (from, dep) => {
     const normalizedFrom = normalizePath(from);
     const query = `${virtualFileQuery}&id=${Buffer.from(dep.virtualPath).toString("base64url") + path6.extname(dep.virtualPath)}`;
-    const id = normalizePath(normalizedFrom) + query;
+    const id = normalizedFrom + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
       if (isDeferredPromise(prev)) {
@@ -1204,7 +1205,9 @@ function markoPlugin(opts = {}) {
             id = `${id.slice(0, -markoExt.length)}.entry.marko`;
             cachedSources.set(fileName, source);
             if (isBuild) {
-              const relativeFileName = path6.posix.relative(root, fileName);
+              const relativeFileName = normalizePath(
+                path6.relative(root, fileName)
+              );
               const entryId = toEntryId(relativeFileName);
               serverManifest ??= {
                 entries: {},
@@ -1222,7 +1225,7 @@ function markoPlugin(opts = {}) {
                   await devServer.transformIndexHtml(
                     "/",
                     generateInputDoc(
-                      posixFileNameToURL(fileName, root) + browserEntryQuery
+                      fileNameToURL(fileName, root) + browserEntryQuery
                     )
                   )
                 )
@@ -1245,7 +1248,8 @@ function markoPlugin(opts = {}) {
                 tagsAPI = false;
               } else {
                 try {
-                  tagsAPI = (await import(translatorPackage)).preferAPI !== "class";
+                  const require2 = createRequire(import.meta.url);
+                  tagsAPI = require2(translatorPackage).preferAPI !== "class";
                 } catch {
                   tagsAPI = true;
                 }
@@ -1423,7 +1427,7 @@ function isMarkoFile(id) {
 function toHTMLEntries(root, serverEntries) {
   const result = [];
   for (const id in serverEntries) {
-    const markoFile = path6.posix.join(root, serverEntries[id]);
+    const markoFile = normalizePath(path6.join(root, serverEntries[id]));
     const htmlFile = markoFile + htmlExt;
     virtualFiles.set(htmlFile, {
       code: generateInputDoc(markoFile + browserEntryQuery)
@@ -1441,13 +1445,10 @@ function toEntryId(id) {
       lastSepIndex
     );
   }
-  return `${name}_${crypto.createHash("SHA1").update(id).digest("base64").replace(/[/+]/g, "-").slice(0, 4)}`;
+  return `${name}_${crypto.createHash("shake256", TEMPLATE_ID_HASH_OPTS).update(id).digest("base64url")}`;
 }
-function posixFileNameToURL(fileName, root) {
-  const relativeURL = path6.posix.relative(
-    pathToFileURL(root).pathname,
-    pathToFileURL(fileName).pathname
-  );
+function fileNameToURL(fileName, root) {
+  const relativeURL = normalizePath(path6.relative(root, fileName));
   if (relativeURL[0] === ".") {
     throw new Error(
       "@marko/vite: Entry templates must exist under the current root directory."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.0.9",
+  "version": "5.0.11",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",