@marko/run 0.9.2 → 0.9.4

package/dist/vite/index.js

@@ -256,15 +256,22 @@ function normalizedRelativePath(from, to) {
   const relativePath = normalizePath(path2.relative(from, to));
   return relativePath.startsWith(".") ? relativePath : "./" + relativePath;
 }
-function renderRouteTemplate(route, rootDir) {
+function renderRouteTemplate(route, markoApi) {
   if (!route.page) {
     throw new Error(`Route ${route.key} has no page to render`);
   }
   if (!route.templateFilePath) {
     throw new Error(`Route ${route.key} has no template file path`);
   }
-  return renderEntryTemplate(
-    normalizedRelativePath(rootDir, route.templateFilePath),
+  const writer = createStringWriter();
+  if (markoApi) {
+    writer.writeLines(`<!-- use ${markoApi} -->
+`);
+  }
+  writer.branch("imports");
+  writer.writeLines("");
+  writeEntryTemplateTag(
+    writer,
     [...route.layouts, route.page].map(
       (file) => normalizedRelativePath(
         path2.dirname(route.templateFilePath),
@@ -273,16 +280,6 @@ function renderRouteTemplate(route, rootDir) {
     ),
     route.key === RoutableFileTypes.Error ? ["error"] : []
   );
-}
-function renderEntryTemplate(name, files, pageInputs = []) {
-  if (!files.length) {
-    throw new Error(`Invalid argument - 'files' cannot be empty`);
-  }
-  const writer = createStringWriter();
-  writer.writeLines(`// ${name}`);
-  writer.branch("imports");
-  writer.writeLines("");
-  writeEntryTemplateTag(writer, files, pageInputs);
   return writer.end();
 }
 function writeEntryTemplateTag(writer, [file, ...rest], pageInputs, index = 1) {
@@ -310,7 +307,6 @@ function renderRouteEntry(route, rootDir) {
     );
   }
   const writer = createStringWriter();
-  writer.writeLines(`// ${virtualFilePrefix}${getRouteVirtualFileName(route)}`);
   const imports = writer.branch("imports");
   const runtimeImports = [];
   if (handler) {
@@ -469,7 +465,6 @@ function renderRouter(routes, rootDir, runtimeInclude, options = {
   const writer = createStringWriter();
   const hasErrorPage = Boolean(routes.special[RoutableFileTypes.Error]);
   const hasNotFoundPage = Boolean(routes.special[RoutableFileTypes.NotFound]);
-  writer.writeLines(`// @marko/run/router`);
   const imports = writer.branch("imports");
   if (runtimeInclude) {
     imports.writeLines(`import "${normalizePath(runtimeInclude)}";`);
@@ -779,9 +774,6 @@ function renderMatch(verb, route, path7, pathIndex) {
 }
 function renderMiddleware(middleware, rootDir) {
   const writer = createStringWriter();
-  writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}middleware.js`
-  );
   const imports = writer.branch("imports");
   imports.writeLines(
     `import { normalize } from "${virtualFilePrefix}/runtime/internal";`
@@ -807,9 +799,6 @@ function stripTsExtension(path7) {
   }
   return path7;
 }
-function decodePath(path7) {
-  return path7;
-}
 async function renderRouteTypeInfo(routes, outDir, adapter) {
   var _a, _b, _c, _d;
   const writer = createStringWriter();
@@ -862,7 +851,7 @@ async function renderRouteTypeInfo(routes, outDir, adapter) {
       }
       routeDefinition += " }";
     }
-    const pathType = `"${decodePath(route.path.path)}"`;
+    const pathType = `"${route.path.path}"`;
     routeType += routeType ? " | " + pathType : pathType;
     routesWriter.writeLines(`${pathType}: ${routeDefinition};`);
     for (const file of [route.handler, route.page]) {
@@ -1603,7 +1592,6 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 
 // src/vite/utils/log.ts
 import zlib from "node:zlib";
-import { Blob } from "buffer";
 import Table from "cli-table3";
 import format from "human-format";
 import kleur2 from "kleur";
@@ -1854,6 +1842,7 @@ function markoRun(opts = {}) {
   let routeData;
   let resolvedConfig;
   let typesFile;
+  let runtimeInclude;
   const externalRoutes = /* @__PURE__ */ new Set();
   const seenErrors = /* @__PURE__ */ new Set();
   const virtualFiles = /* @__PURE__ */ new Map();
@@ -1861,6 +1850,13 @@ function markoRun(opts = {}) {
     routesBuild: 0,
     routesRender: 0
   };
+  async function loadModule(context, id) {
+    if ("transformRequest" in context.environment) {
+      await context.environment.transformRequest(id);
+      return context.getModuleInfo(id);
+    }
+    return await context.load({ id });
+  }
   async function getExportsFromFile(context, filePath) {
     if (devServer) {
       const result2 = await devServer.transformRequest(filePath, { ssr: false });
@@ -1872,6 +1868,17 @@ function markoRun(opts = {}) {
     });
     return result.exports || [];
   }
+  let routeMarkoApiCache;
+  async function getMarkoApiForRoute(context, route) {
+    var _a, _b;
+    routeMarkoApiCache ?? (routeMarkoApiCache = /* @__PURE__ */ new Map());
+    if (!routeMarkoApiCache.has(route)) {
+      const markoAPI = route.templateFilePath && ((_b = (_a = await loadModule(context, normalizePath(route.layouts[0].filePath))) == null ? void 0 : _a.meta) == null ? void 0 : _b.markoAPI);
+      routeMarkoApiCache.set(route, markoAPI);
+      return markoAPI;
+    }
+    return routeMarkoApiCache.get(route);
+  }
   async function writeTypesFile(routes2) {
     if (routes2 && (tsConfigExists ?? (tsConfigExists = await globFileExists(
       root,
@@ -1984,7 +1991,10 @@ function markoRun(opts = {}) {
             });
             fs3.writeFileSync(
               route.templateFilePath,
-              renderRouteTemplate(route, root)
+              renderRouteTemplate(
+                route,
+                await getMarkoApiForRoute(context, route)
+              )
             );
           }
           virtualFiles.set(
@@ -1999,7 +2009,10 @@ function markoRun(opts = {}) {
             });
             fs3.writeFileSync(
               route.templateFilePath,
-              renderRouteTemplate(route, root)
+              renderRouteTemplate(
+                route,
+                await getMarkoApiForRoute(context, route)
+              )
             );
           }
         }
@@ -2016,7 +2029,7 @@ function markoRun(opts = {}) {
             renderMiddleware(routes2.middleware, root)
           );
         }
-        const runtimeInclude = await ((_a = adapter == null ? void 0 : adapter.runtimeInclude) == null ? void 0 : _a.call(adapter));
+        runtimeInclude = await ((_a = adapter == null ? void 0 : adapter.runtimeInclude) == null ? void 0 : _a.call(adapter));
         virtualFiles.set(
           path6.posix.join(root, ROUTER_FILENAME),
           renderRouter(routes2, root, runtimeInclude, {
@@ -2220,10 +2233,11 @@ function markoRun(opts = {}) {
           const routableFileType = matchRoutableFile(
             path6.parse(filename).base
           );
-          if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
-            if (type === "add" || type === "unlink" || type === "change" && (routableFileType === RoutableFileTypes.Handler || routableFileType === RoutableFileTypes.Middleware)) {
+          if (filename.startsWith(resolvedRoutesDir) && routableFileType || filename === runtimeInclude) {
+            if (type === "add" || type === "unlink" || type === "change" && (routableFileType === RoutableFileTypes.Handler || routableFileType === RoutableFileTypes.Middleware || filename === runtimeInclude)) {
               buildVirtualFilesResult = void 0;
               renderVirtualFilesResult = void 0;
+              routeMarkoApiCache = void 0;
               const module = devServer.moduleGraph.getModuleById(filename);
               const importers = module && getImporters(module, filename);
               if (importers == null ? void 0 : importers.size) {
@@ -2297,8 +2311,7 @@ function markoRun(opts = {}) {
           await renderVirtualFiles(this);
         }
         if (virtualFiles.has(id)) {
-          const file = virtualFiles.get(id);
-          return file;
+          return virtualFiles.get(id);
         } else if (!id.startsWith(entryFilesDirPosix) && /[/\\]__marko-run__[^?/\\]+\.(js|marko)$/.exec(id)) {
           return "";
         }
@@ -2500,9 +2513,12 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     windowsHide: true,
     env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
   });
-  const close = () => {
+  const close = async () => {
     proc.unref();
     proc.kill();
+    if (!await waitForExit(proc, 500)) {
+      proc.kill("SIGKILL");
+    }
   };
   try {
     await Promise.race([waitForError(proc, port), waitForServer(port, wait)]);
@@ -2550,6 +2566,15 @@ async function spawnServerWorker(module, args = [], port = 0, env, wait = true)
     cluster.settings.execArgv = originalArgs;
   }
 }
+async function waitForExit(proc, wait = 0) {
+  if (proc.exitCode !== null) return;
+  return await new Promise((resolve) => {
+    proc.once("exit", resolve), proc.once("close", resolve);
+    if (wait) {
+      setTimeout(resolve, wait, null);
+    }
+  });
+}
 async function waitForError(proc, port) {
   return new Promise((_, reject) => {
     proc.once("error", reject);

package/dist/vite/routes/walk.d.ts

@@ -11,4 +11,4 @@ export interface WalkOptions {
 export type Walker = (options: WalkOptions) => Promise<void>;
 export declare function createFSWalker(dir: string): Walker;
 export type TestFileTree = [string, (string | TestFileTree)[]];
-export declare function createTestWalker(dir: TestFileTree, root: string): Walker;
+export declare function createTestWalker(dir: TestFileTree): Walker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "The Marko application framework.",
   "keywords": [
     "marko"
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@marko/run-explorer": "^2.0.1",
-    "@marko/vite": "^5.3.2",
+    "@marko/vite": "^5.4.2",
     "browserslist": "^4.24.4",
     "cli-table3": "^0.6.5",
     "compression": "^1.8.0",