@marko/vite 2.3.12 → 2.3.13

package/dist/index.js

@@ -44,7 +44,9 @@ var import_esbuild_plugin = __toESM(require("./esbuild-plugin"));
 var import_store = require("./store");
 __reExport(src_exports, require("./store"), module.exports);
 const import_meta = {};
-const normalizePath = import_path.default.sep === "\\" ? (id) => id.replace(/\\/g, "/") : (id) => id;
+const POSIX_SEP = "/";
+const WINDOWS_SEP = "\\";
+const normalizePath = import_path.default.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 const virtualFiles = /* @__PURE__ */ new Map();
 const queryReg = /\?marko-.+$/;
 const browserEntryQuery = "?marko-browser-entry";
@@ -79,7 +81,8 @@ function markoPlugin(opts = {}) {
   };
   const resolveViteVirtualDep = (from, dep) => {
     const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
-    const id = normalizePath(from) + query;
+    const normalizedFrom = normalizePath(from);
+    const id = normalizePath(normalizedFrom) + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
       if (isDeferredPromise(prev)) {
@@ -87,7 +90,7 @@ function markoPlugin(opts = {}) {
       }
     }
     virtualFiles.set(id, dep);
-    return `./${import_path.default.basename(from) + query}`;
+    return `./${import_path.default.posix.basename(normalizedFrom) + query}`;
   };
   const ssrConfig = {
     ...baseConfig,
@@ -106,6 +109,7 @@ function markoPlugin(opts = {}) {
   };
   let root;
   let devEntryFile;
+  let devEntryFilePosix;
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
@@ -124,6 +128,7 @@ function markoPlugin(opts = {}) {
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         root = normalizePath(config.root || process.cwd());
         devEntryFile = import_path.default.join(root, "index.html");
+        devEntryFilePosix = normalizePath(devEntryFile);
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
         store = opts.store || new import_store.FileStore(
@@ -221,7 +226,7 @@ function markoPlugin(opts = {}) {
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
               entrySources.set(
-                import_path.default.resolve(root, entry),
+                normalizePath(import_path.default.resolve(root, entry)),
                 serverManifest.entrySources[entry]
               );
             }
@@ -243,7 +248,7 @@ function markoPlugin(opts = {}) {
         let importeeQuery = getMarkoQuery(importee);
         if (importeeQuery) {
           importee = importee.slice(0, -importeeQuery.length);
-        } else if (ssr && linked && importer && importer !== devEntryFile && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
+        } else if (ssr && linked && importer && (importer !== devEntryFile || normalizePath(importer) !== devEntryFilePosix) && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
         isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
           importeeQuery = serverEntryQuery;
         } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
@@ -265,8 +270,10 @@ function markoPlugin(opts = {}) {
           if (importerQuery) {
             importer = importer.slice(0, -importerQuery.length);
             if (importee[0] === ".") {
-              const resolved = import_path.default.resolve(importer, "..", importee);
-              if (resolved === importer)
+              const resolved = normalizePath(
+                import_path.default.resolve(importer, "..", importee)
+              );
+              if (resolved === normalizePath(importer))
                 return resolved;
             }
             return this.resolve(importee, importer, resolveOpts);
@@ -295,7 +302,7 @@ function markoPlugin(opts = {}) {
                 await (0, import_manifest_generator.generateDocManifest)(
                   await devServer.transformIndexHtml(
                     "/",
-                    (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root))
+                    (0, import_manifest_generator.generateInputDoc)(posixFileNameToURL(fileName, root))
                   )
                 )
               );
@@ -335,7 +342,7 @@ function markoPlugin(opts = {}) {
         if (ssr && entrySources.has(id)) {
           entrySources.set(id, source);
           if (serverManifest) {
-            serverManifest.entrySources[import_path.default.relative(root, id)] = source;
+            serverManifest.entrySources[import_path.default.posix.relative(root, id)] = source;
           }
         }
         const compiled = await compiler.compile(
@@ -350,7 +357,7 @@ function markoPlugin(opts = {}) {
 if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         if (devServer) {
-          const templateName = getBasenameWithoutExt(id);
+          const templateName = getPosixBasenameWithoutExt(id);
           const optionalFilePrefix = import_path.default.dirname(id) + import_path.default.sep + (templateName === "index" ? "" : `${templateName}.`);
           for (const file of meta.watchFiles) {
             this.addWatchFile(file);
@@ -454,17 +461,17 @@ function toHTMLEntries(root, serverEntries) {
   return result;
 }
 function toEntryId(id) {
-  const lastSepIndex = id.lastIndexOf(import_path.default.sep);
+  const lastSepIndex = id.lastIndexOf(POSIX_SEP);
   let name = id.slice(lastSepIndex + 1, id.indexOf(".", lastSepIndex));
   if (name === "index" || name === "template") {
     name = id.slice(
-      id.lastIndexOf(import_path.default.sep, lastSepIndex - 1) + 1,
+      id.lastIndexOf(POSIX_SEP, lastSepIndex - 1) + 1,
       lastSepIndex
     );
   }
   return `${name}_${import_crypto.default.createHash("SHA1").update(id).digest("base64").replace(/[/+]/g, "-").slice(0, 4)}`;
 }
-function fileNameToURL(fileName, root) {
+function posixFileNameToURL(fileName, root) {
   const relativeURL = import_path.default.posix.relative(
     (0, import_url.pathToFileURL)(root).pathname,
     (0, import_url.pathToFileURL)(fileName).pathname
@@ -476,8 +483,8 @@ function fileNameToURL(fileName, root) {
   }
   return `/${relativeURL}`;
 }
-function getBasenameWithoutExt(file) {
-  const baseStart = file.lastIndexOf(import_path.default.sep) + 1;
+function getPosixBasenameWithoutExt(file) {
+  const baseStart = file.lastIndexOf(POSIX_SEP) + 1;
   const extStart = file.indexOf(".", baseStart + 1);
   return file.slice(baseStart, extStart);
 }

package/dist/index.mjs

@@ -24,7 +24,9 @@ import crypto from "crypto";
 import anyMatch from "anymatch";
 import { pathToFileURL, fileURLToPath } from "url";
 import { relativeImportPath } from "relative-import-path";
-var normalizePath = path.sep === "\\" ? (id) => id.replace(/\\/g, "/") : (id) => id;
+var POSIX_SEP = "/";
+var WINDOWS_SEP = "\\";
+var normalizePath = path.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 var virtualFiles = /* @__PURE__ */ new Map();
 var queryReg = /\?marko-.+$/;
 var browserEntryQuery = "?marko-browser-entry";
@@ -59,7 +61,8 @@ function markoPlugin(opts = {}) {
   };
   const resolveViteVirtualDep = (from, dep) => {
     const query = `${virtualFileQuery}&id=${normalizePath(dep.virtualPath)}`;
-    const id = normalizePath(from) + query;
+    const normalizedFrom = normalizePath(from);
+    const id = normalizePath(normalizedFrom) + query;
     if (devServer) {
       const prev = virtualFiles.get(id);
       if (isDeferredPromise(prev)) {
@@ -67,7 +70,7 @@ function markoPlugin(opts = {}) {
       }
     }
     virtualFiles.set(id, dep);
-    return `./${path.basename(from) + query}`;
+    return `./${path.posix.basename(normalizedFrom) + query}`;
   };
   const ssrConfig = {
     ...baseConfig,
@@ -86,6 +89,7 @@ function markoPlugin(opts = {}) {
   };
   let root;
   let devEntryFile;
+  let devEntryFilePosix;
   let isBuild = false;
   let isSSRBuild = false;
   let devServer;
@@ -104,6 +108,7 @@ function markoPlugin(opts = {}) {
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         root = normalizePath(config.root || process.cwd());
         devEntryFile = path.join(root, "index.html");
+        devEntryFilePosix = normalizePath(devEntryFile);
         isBuild = env.command === "build";
         isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
         store = opts.store || new FileStore(
@@ -201,7 +206,7 @@ function markoPlugin(opts = {}) {
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
               entrySources.set(
-                path.resolve(root, entry),
+                normalizePath(path.resolve(root, entry)),
                 serverManifest.entrySources[entry]
               );
             }
@@ -223,7 +228,7 @@ function markoPlugin(opts = {}) {
         let importeeQuery = getMarkoQuery(importee);
         if (importeeQuery) {
           importee = importee.slice(0, -importeeQuery.length);
-        } else if (ssr && linked && importer && importer !== devEntryFile && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
+        } else if (ssr && linked && importer && (importer !== devEntryFile || normalizePath(importer) !== devEntryFilePosix) && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
         isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
           importeeQuery = serverEntryQuery;
         } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
@@ -245,8 +250,10 @@ function markoPlugin(opts = {}) {
           if (importerQuery) {
             importer = importer.slice(0, -importerQuery.length);
             if (importee[0] === ".") {
-              const resolved = path.resolve(importer, "..", importee);
-              if (resolved === importer)
+              const resolved = normalizePath(
+                path.resolve(importer, "..", importee)
+              );
+              if (resolved === normalizePath(importer))
                 return resolved;
             }
             return this.resolve(importee, importer, resolveOpts);
@@ -275,7 +282,7 @@ function markoPlugin(opts = {}) {
                 await generateDocManifest(
                   await devServer.transformIndexHtml(
                     "/",
-                    generateInputDoc(fileNameToURL(fileName, root))
+                    generateInputDoc(posixFileNameToURL(fileName, root))
                   )
                 )
               );
@@ -315,7 +322,7 @@ function markoPlugin(opts = {}) {
         if (ssr && entrySources.has(id)) {
           entrySources.set(id, source);
           if (serverManifest) {
-            serverManifest.entrySources[path.relative(root, id)] = source;
+            serverManifest.entrySources[path.posix.relative(root, id)] = source;
           }
         }
         const compiled = await compiler.compile(
@@ -330,7 +337,7 @@ function markoPlugin(opts = {}) {
 if (import.meta.hot) import.meta.hot.accept(() => {});`;
         }
         if (devServer) {
-          const templateName = getBasenameWithoutExt(id);
+          const templateName = getPosixBasenameWithoutExt(id);
           const optionalFilePrefix = path.dirname(id) + path.sep + (templateName === "index" ? "" : `${templateName}.`);
           for (const file of meta.watchFiles) {
             this.addWatchFile(file);
@@ -434,17 +441,17 @@ function toHTMLEntries(root, serverEntries) {
   return result;
 }
 function toEntryId(id) {
-  const lastSepIndex = id.lastIndexOf(path.sep);
+  const lastSepIndex = id.lastIndexOf(POSIX_SEP);
   let name = id.slice(lastSepIndex + 1, id.indexOf(".", lastSepIndex));
   if (name === "index" || name === "template") {
     name = id.slice(
-      id.lastIndexOf(path.sep, lastSepIndex - 1) + 1,
+      id.lastIndexOf(POSIX_SEP, lastSepIndex - 1) + 1,
       lastSepIndex
     );
   }
   return `${name}_${crypto.createHash("SHA1").update(id).digest("base64").replace(/[/+]/g, "-").slice(0, 4)}`;
 }
-function fileNameToURL(fileName, root) {
+function posixFileNameToURL(fileName, root) {
   const relativeURL = path.posix.relative(
     pathToFileURL(root).pathname,
     pathToFileURL(fileName).pathname
@@ -456,8 +463,8 @@ function fileNameToURL(fileName, root) {
   }
   return `/${relativeURL}`;
 }
-function getBasenameWithoutExt(file) {
-  const baseStart = file.lastIndexOf(path.sep) + 1;
+function getPosixBasenameWithoutExt(file) {
+  const baseStart = file.lastIndexOf(POSIX_SEP) + 1;
   const extStart = file.indexOf(".", baseStart + 1);
   return file.slice(baseStart, extStart);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.3.12",
+  "version": "2.3.13",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {