@marko/run 0.1.13 → 0.1.15

package/dist/vite/index.cjs

@@ -55,7 +55,6 @@ var virtualRoutesPrefix = `${virtualFilePrefix}/routes`;
 var virtualRuntimePrefix = `${virtualFilePrefix}/internal`;
 var httpVerbs = ["get", "post", "put", "delete"];
 var serverEntryQuery = "?marko-server-entry";
-var browserEntryQuery = "?marko-browser-entry";
 var RoutableFileTypes = {
   Page: "page",
   Layout: "layout",
@@ -73,9 +72,6 @@ var routeableFileRegex = new RegExp(
   `^[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
-function isRoutableFile(filename) {
-  return routeableFileRegex.test(filename);
-}
 function matchRoutableFile(filename) {
   const match = filename.match(routeableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
@@ -1341,13 +1337,9 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 // src/vite/plugin.ts
 var import_url2 = require("url");
 var __dirname = import_path2.default.dirname((0, import_url2.fileURLToPath)(__importMetaURL));
-var markoExt = ".marko";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = import_path2.default.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
-function isMarkoFile(id) {
-  return id.endsWith(markoExt);
-}
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
@@ -1578,15 +1570,14 @@ function markoRun(opts = {}) {
       configureServer(_server) {
         devServer = _server;
         devServer.watcher.on("all", async (type, filename) => {
-          const file = import_path2.default.parse(filename);
-          if (filename.startsWith(resolvedRoutesDir) && isRoutableFile(file.base)) {
+          const routableFileType = matchRoutableFile(import_path2.default.parse(filename).base);
+          if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add") {
               isStale = true;
             } else if (type === "unlink") {
               isStale = true;
             } else if (type === "change") {
-              const match = matchRoutableFile(file.base);
-              if (match === RoutableFileTypes.Handler) {
+              if (routableFileType === RoutableFileTypes.Handler) {
                 isStale = true;
               }
             }
@@ -1621,7 +1612,7 @@ function markoRun(opts = {}) {
           extractVerbs = isBuild ? getVerbsFromFileBuild.bind(null, this) : getVerbsFromFileDev.bind(null, devServer);
         }
       },
-      async resolveId(importee, importer, { ssr }) {
+      async resolveId(importee, importer) {
         let resolved;
         if (importee.startsWith(virtualRuntimePrefix)) {
           return this.resolve(
@@ -1643,14 +1634,14 @@ function markoRun(opts = {}) {
         }
         if (virtualFiles.has(importee)) {
           resolved = importee;
-          if (isBuild && !ssr && isMarkoFile(resolved)) {
-            resolved += browserEntryQuery;
-          }
         }
         return resolved || null;
       },
       async load(id) {
         var _a;
+        if (id.endsWith(serverEntryQuery)) {
+          id = id.slice(0, -serverEntryQuery.length);
+        }
         if (virtualFiles.has(id)) {
           if (!isRendered) {
             await renderVirtualFiles();

package/dist/vite/index.js

@@ -13,7 +13,6 @@ var virtualRoutesPrefix = `${virtualFilePrefix}/routes`;
 var virtualRuntimePrefix = `${virtualFilePrefix}/internal`;
 var httpVerbs = ["get", "post", "put", "delete"];
 var serverEntryQuery = "?marko-server-entry";
-var browserEntryQuery = "?marko-browser-entry";
 var RoutableFileTypes = {
   Page: "page",
   Layout: "layout",
@@ -31,9 +30,6 @@ var routeableFileRegex = new RegExp(
   `^[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
-function isRoutableFile(filename) {
-  return routeableFileRegex.test(filename);
-}
 function matchRoutableFile(filename) {
   const match = filename.match(routeableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
@@ -1299,13 +1295,9 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 // src/vite/plugin.ts
 import { fileURLToPath } from "url";
 var __dirname = path2.dirname(fileURLToPath(import.meta.url));
-var markoExt = ".marko";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = path2.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
-function isMarkoFile(id) {
-  return id.endsWith(markoExt);
-}
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
   let compiler;
@@ -1536,15 +1528,14 @@ function markoRun(opts = {}) {
       configureServer(_server) {
         devServer = _server;
         devServer.watcher.on("all", async (type, filename) => {
-          const file = path2.parse(filename);
-          if (filename.startsWith(resolvedRoutesDir) && isRoutableFile(file.base)) {
+          const routableFileType = matchRoutableFile(path2.parse(filename).base);
+          if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add") {
               isStale = true;
             } else if (type === "unlink") {
               isStale = true;
             } else if (type === "change") {
-              const match = matchRoutableFile(file.base);
-              if (match === RoutableFileTypes.Handler) {
+              if (routableFileType === RoutableFileTypes.Handler) {
                 isStale = true;
               }
             }
@@ -1579,7 +1570,7 @@ function markoRun(opts = {}) {
           extractVerbs = isBuild ? getVerbsFromFileBuild.bind(null, this) : getVerbsFromFileDev.bind(null, devServer);
         }
       },
-      async resolveId(importee, importer, { ssr }) {
+      async resolveId(importee, importer) {
         let resolved;
         if (importee.startsWith(virtualRuntimePrefix)) {
           return this.resolve(
@@ -1601,14 +1592,14 @@ function markoRun(opts = {}) {
         }
         if (virtualFiles.has(importee)) {
           resolved = importee;
-          if (isBuild && !ssr && isMarkoFile(resolved)) {
-            resolved += browserEntryQuery;
-          }
         }
         return resolved || null;
       },
       async load(id) {
         var _a;
+        if (id.endsWith(serverEntryQuery)) {
+          id = id.slice(0, -serverEntryQuery.length);
+        }
         if (virtualFiles.has(id)) {
           if (!isRendered) {
             await renderVirtualFiles();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -112,7 +112,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^2.4.4",
+    "@marko/vite": "^2.4.8",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",