@marko/vite 5.0.10 → 5.0.12

package/dist/index.mjs

@@ -6,7 +6,6 @@ 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";
@@ -792,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 = /\.[^.]+$/;
@@ -829,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)) {
@@ -865,6 +865,11 @@ function markoPlugin(opts = {}) {
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
         let optimize = env.mode === "production";
+        isTest = env.mode === "test";
+        isBuild = env.command === "build";
+        if (isTest) {
+          linked = false;
+        }
         if ("MARKO_DEBUG" in process.env) {
           optimize = process.env.MARKO_DEBUG === "false" || process.env.MARKO_DEBUG === "0";
         } else {
@@ -921,8 +926,6 @@ function markoPlugin(opts = {}) {
         compiler2.configure(baseConfig);
         devEntryFile = path6.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
-        isTest = env.mode === "test";
-        isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
         renderAssetsRuntimeCode = getRenderAssetsRuntime({
           isBuild,
@@ -930,7 +933,6 @@ function markoPlugin(opts = {}) {
           runtimeId
         });
         if (isTest) {
-          linked = false;
           const { test } = config;
           if (test.environment?.includes("dom")) {
             config.resolve ??= {};
@@ -1205,7 +1207,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: {},
@@ -1223,7 +1227,7 @@ function markoPlugin(opts = {}) {
                   await devServer.transformIndexHtml(
                     "/",
                     generateInputDoc(
-                      posixFileNameToURL(fileName, root) + browserEntryQuery
+                      fileNameToURL(fileName, root) + browserEntryQuery
                     )
                   )
                 )
@@ -1425,7 +1429,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)
@@ -1443,13 +1447,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.10",
+  "version": "5.0.12",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",