@marko/run 0.4.12 → 0.5.1

package/dist/cli/index.mjs

@@ -764,16 +764,19 @@ function hasVerb(route, verb) {
 }
 
 // src/vite/codegen/index.ts
-function renderRouteTemplate(route) {
+function renderRouteTemplate(route, getRelativePath) {
   if (!route.page) {
     throw new Error(`Route ${route.key} has no page to render`);
   }
   return renderEntryTemplate(
     route.entryName,
-    [...route.layouts, route.page].map((file) => `./${file.importPath}`)
+    [...route.layouts, route.page].map(
+      (file) => getRelativePath(file.importPath)
+    ),
+    route.key === RoutableFileTypes.Error ? ["error"] : []
   );
 }
-function renderEntryTemplate(name, files) {
+function renderEntryTemplate(name, files, pageInputs = []) {
   if (!name) {
     throw new Error(`Invalid argument - 'name' cannot be empty`);
   }
@@ -781,27 +784,28 @@ function renderEntryTemplate(name, files) {
     throw new Error(`Invalid argument - 'files' cannot be empty`);
   }
   const writer = createStringWriter();
-  writer.writeLines(`// ${virtualFilePrefix}/${name}.marko`);
+  writer.writeLines(`// ${name}.marko`);
   writer.branch("imports");
   writer.writeLines("");
-  writeEntryTemplateTag(writer, files);
+  writeEntryTemplateTag(writer, files, pageInputs);
   return writer.end();
 }
-function writeEntryTemplateTag(writer, [file, ...rest], index = 1) {
+function writeEntryTemplateTag(writer, [file, ...rest], pageInputs, index = 1) {
   if (file) {
     const isLast = !rest.length;
-    const tag = isLast ? "page" : `layout${index}`;
+    const tag = isLast ? "Page" : `Layout${index}`;
     writer.branch("imports").writeLines(`import ${tag} from '${file}';`);
     if (isLast) {
-      writer.writeLines(`<${tag} ...input/>`);
+      const attributes = pageInputs.length ? " " + pageInputs.map((name) => `${name}=input.${name}`).join(" ") : "";
+      writer.writeLines(`<${tag}${attributes}/>`);
     } else {
-      writer.writeBlockStart(`<${tag} ...input>`);
-      writeEntryTemplateTag(writer, rest, index + 1);
+      writer.writeBlockStart(`<${tag}>`);
+      writeEntryTemplateTag(writer, rest, pageInputs, index + 1);
       writer.writeBlockEnd(`</>`);
     }
   }
 }
-function renderRouteEntry(route) {
+function renderRouteEntry(route, entriesDir) {
   var _a;
   const { key, index, handler, page, middleware, meta, entryName } = route;
   const verbs = getVerbs(route);
@@ -854,9 +858,8 @@ function renderRouteEntry(route) {
     );
   }
   if (page) {
-    imports.writeLines(
-      `import page from '${virtualFilePrefix}/${entryName}.marko${serverEntryQuery}';`
-    );
+    const importPath = route.layouts.length ? `./${entriesDir}/${entryName}.marko` : `./${page.importPath}`;
+    imports.writeLines(`import page from '${importPath}${serverEntryQuery}';`);
   }
   if (meta) {
     imports.writeLines(
@@ -944,7 +947,7 @@ function writeRouteEntryHandler(writer, route, verb) {
   continuations.join();
   writer.writeBlockEnd("}");
 }
-function renderRouter(routes, options = {
+function renderRouter(routes, entriesDir, options = {
   trailingSlashes: "RedirectWithout"
 }) {
   const writer = createStringWriter();
@@ -961,9 +964,10 @@ function renderRouter(routes, options = {
       `import { ${names.join(", ")} } from '${virtualFilePrefix}/${route.entryName}.js';`
     );
   }
-  for (const { key, entryName } of Object.values(routes.special)) {
+  for (const page of Object.values(routes.special)) {
+    const importPath = page.layouts.length ? `./${entriesDir}/${page.entryName}.marko` : `./${page.importPath}`;
     imports.writeLines(
-      `import page${key} from '${virtualFilePrefix}/${entryName}.marko${serverEntryQuery}';`
+      `import page${page.key} from '${importPath}${serverEntryQuery}';`
     );
   }
   writer.writeLines(
@@ -1737,18 +1741,23 @@ function prepareError(err) {
 }
 
 // src/vite/plugin.ts
+import { createHash } from "crypto";
 var debug = createDebug("@marko/run");
 var __dirname = path3.dirname(fileURLToPath(import.meta.url));
 var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
+var CLIENT_OUT_DIR = "public";
+var MIDDLEWARE_FILENAME = `${markoRunFilePrefix}middleware.js`;
+var ROUTER_FILENAME = `${markoRunFilePrefix}router.js`;
 var normalizePath = path3.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 function markoRun(opts = {}) {
   let { routesDir, adapter, ...markoVitePluginOptions } = opts;
-  let compiler;
   let store;
   let root;
   let resolvedRoutesDir;
+  let entryFilesDir;
+  let relativeEntryFilesDir;
   let typesDir;
   let isBuild = false;
   let isSSRBuild = false;
@@ -1768,6 +1777,9 @@ function markoRun(opts = {}) {
     routesBuild: 0,
     routesRender: 0
   };
+  function getEntryFileRelativePath(to) {
+    return path3.relative(entryFilesDir, to);
+  }
   async function writeTypesFile(routes2) {
     if (routes2 && (tsConfigExists ?? (tsConfigExists = await globFileExists(
       root,
@@ -1798,27 +1810,12 @@ function markoRun(opts = {}) {
           throw new Error("No routes generated");
         }
         for (const route of routes.list) {
-          if (route.page) {
-            virtualFiles.set(
-              path3.posix.join(root, `${route.entryName}.marko`),
-              ""
-            );
-          }
           virtualFiles.set(path3.posix.join(root, `${route.entryName}.js`), "");
         }
-        for (const route of Object.values(routes.special)) {
-          virtualFiles.set(
-            path3.posix.join(root, `${route.entryName}.marko`),
-            ""
-          );
-        }
         if (routes.middleware.length) {
-          virtualFiles.set(
-            path3.posix.join(root, `${markoRunFilePrefix}middleware.js`),
-            ""
-          );
+          virtualFiles.set(path3.posix.join(root, MIDDLEWARE_FILENAME), "");
         }
-        virtualFiles.set("@marko/run/router", "");
+        virtualFiles.set(path3.posix.join(root, ROUTER_FILENAME), "");
         resolve(routes);
       } catch (err) {
         reject(err);
@@ -1829,11 +1826,12 @@ function markoRun(opts = {}) {
   function renderVirtualFiles(context) {
     return renderVirtualFilesResult ?? (renderVirtualFilesResult = new Promise(async (resolve) => {
       var _a;
-      const routerOptions = {
-        trailingSlashes: opts.trailingSlashes || "RedirectWithout"
-      };
       try {
         const routes2 = await buildVirtualFiles();
+        let entryFilesDirExists = false;
+        if (fs4.existsSync(entryFilesDir)) {
+          fs4.rmSync(entryFilesDir, { recursive: true });
+        }
         for (const route of routes2.list) {
           if (route.handler) {
             const exports = await getExportsFromFile(
@@ -1853,22 +1851,30 @@ function markoRun(opts = {}) {
               );
             }
           }
-          if (route.page) {
-            virtualFiles.set(
-              path3.posix.join(root, `${route.entryName}.marko`),
-              renderRouteTemplate(route)
+          if (route.page && route.layouts.length) {
+            entryFilesDirExists || (entryFilesDirExists = !!fs4.mkdirSync(entryFilesDir, {
+              recursive: true
+            }));
+            fs4.writeFileSync(
+              path3.posix.join(entryFilesDir, `${route.entryName}.marko`),
+              renderRouteTemplate(route, getEntryFileRelativePath)
             );
           }
           virtualFiles.set(
             path3.posix.join(root, `${route.entryName}.js`),
-            renderRouteEntry(route)
+            renderRouteEntry(route, relativeEntryFilesDir)
           );
         }
         for (const route of Object.values(routes2.special)) {
-          virtualFiles.set(
-            path3.posix.join(root, `${route.entryName}.marko`),
-            renderRouteTemplate(route)
-          );
+          if (route.layouts.length) {
+            entryFilesDirExists || (entryFilesDirExists = !!fs4.mkdirSync(entryFilesDir, {
+              recursive: true
+            }));
+            fs4.writeFileSync(
+              path3.posix.join(entryFilesDir, `${route.entryName}.marko`),
+              renderRouteTemplate(route, getEntryFileRelativePath)
+            );
+          }
         }
         if (routes2.middleware.length) {
           for (const middleware of routes2.middleware) {
@@ -1879,13 +1885,15 @@ function markoRun(opts = {}) {
             }
           }
           virtualFiles.set(
-            path3.posix.join(root, `${markoRunFilePrefix}middleware.js`),
+            path3.posix.join(root, MIDDLEWARE_FILENAME),
             renderMiddleware(routes2.middleware)
           );
         }
         virtualFiles.set(
-          "@marko/run/router",
-          renderRouter(routes2, routerOptions)
+          path3.posix.join(root, ROUTER_FILENAME),
+          renderRouter(routes2, relativeEntryFilesDir, {
+            trailingSlashes: opts.trailingSlashes || "RedirectWithout"
+          })
         );
         await writeTypesFile(routes2);
         if (adapter == null ? void 0 : adapter.routesGenerated) {
@@ -1906,7 +1914,7 @@ function markoRun(opts = {}) {
           throw err;
         }
         virtualFiles.set(
-          "@marko/run/router",
+          path3.posix.join(root, ROUTER_FILENAME),
           `throw ${JSON.stringify(prepareError(err))}`
         );
       }
@@ -1918,7 +1926,7 @@ function markoRun(opts = {}) {
       name: `${PLUGIN_NAME_PREFIX}:pre`,
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -1942,14 +1950,6 @@ function markoRun(opts = {}) {
             opts = mergeConfig(opts, adapterOptions);
           }
         }
-        compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
-        compiler.taglib.register("@marko/run", {
-          "<dev-error-page>": {
-            template: normalizePath(
-              path3.resolve(__dirname, "../components/dev-error-page.marko")
-            )
-          }
-        });
         routesDir = opts.routesDir || "src/routes";
         store = new ReadOncePersistedStore(
           `vite-marko-run${opts.runtimeId ? `-${opts.runtimeId}` : ""}`
@@ -1957,12 +1957,23 @@ function markoRun(opts = {}) {
         markoVitePluginOptions.runtimeId = opts.runtimeId;
         markoVitePluginOptions.basePathVar = opts.basePathVar;
         resolvedRoutesDir = path3.resolve(root, routesDir);
+        const modulesDir = getModulesDir() || path3.join(root, "node_modules");
+        entryFilesDir = path3.join(
+          modulesDir,
+          ".marko",
+          createHash("shake256", { outputLength: 4 }).update(root).digest("hex")
+        );
+        relativeEntryFilesDir = path3.relative(root, entryFilesDir);
         typesDir = path3.join(root, ".marko-run");
         devEntryFile = path3.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
-        const assetsDir = ((_d = config2.build) == null ? void 0 : _d.assetsDir) || "assets";
-        let rollupOutputOptions = (_f = (_e = config2.build) == null ? void 0 : _e.rollupOptions) == null ? void 0 : _f.output;
+        let outDir = ((_d = config2.build) == null ? void 0 : _d.outDir) || "dist";
+        const assetsDir = ((_e = config2.build) == null ? void 0 : _e.assetsDir) || "assets";
+        let rollupOutputOptions = (_g = (_f = config2.build) == null ? void 0 : _f.rollupOptions) == null ? void 0 : _g.output;
         if (isBuild) {
+          if (!isSSRBuild) {
+            outDir = path3.join(outDir, CLIENT_OUT_DIR);
+          }
           const defaultRollupOutputOptions = {
             assetFileNames({ name }) {
               if (name && name.indexOf("_marko-virtual_id_") < 0) {
@@ -1998,7 +2009,7 @@ function markoRun(opts = {}) {
             }));
           }
         }
-        const browserslistTarget = isBuild && !((_g = config2.build) == null ? void 0 : _g.target) ? browserslist(void 0, {
+        const browserslistTarget = isBuild && !((_h = config2.build) == null ? void 0 : _h.target) ? browserslist(void 0, {
           path: root
         }) : void 0;
         let pluginConfig = {
@@ -2013,19 +2024,22 @@ function markoRun(opts = {}) {
             devSourcemap: true
           },
           build: {
+            outDir,
+            assetsDir,
             target: (browserslistTarget == null ? void 0 : browserslistTarget.length) ? resolveToEsbuildTarget(browserslistTarget, {
               printUnknownTargets: false
             }) : void 0,
             emptyOutDir: isSSRBuild,
             // Avoid server & client deleting files from each other.
-            ssrEmitAssets: isSSRBuild,
+            copyPublicDir: !isSSRBuild,
+            ssrEmitAssets: false,
             rollupOptions: {
               output: rollupOutputOptions
             },
             modulePreload: { polyfill: false }
           },
           optimizeDeps: {
-            entries: !((_h = config2.optimizeDeps) == null ? void 0 : _h.entries) ? [
+            entries: !((_i = config2.optimizeDeps) == null ? void 0 : _i.entries) ? [
               "src/pages/**/*+{page,layout}.marko",
               "!**/__snapshots__/**",
               `!**/__tests__/**`,
@@ -2135,7 +2149,9 @@ function markoRun(opts = {}) {
       async resolveId(importee, importer) {
         let resolved;
         let virtualFilePath;
-        if (importee.startsWith(virtualFilePrefix)) {
+        if (importee === "@marko/run/router") {
+          importee = path3.resolve(root, ROUTER_FILENAME);
+        } else if (importee.startsWith(virtualFilePrefix)) {
           virtualFilePath = importee.slice(virtualFilePrefix.length + 1);
           importee = path3.resolve(root, virtualFilePath);
         } else if (!isBuild && importer && (importer === devEntryFile || normalizePath(importer) === devEntryFilePosix) && importee.startsWith(`/${markoRunFilePrefix}`)) {
@@ -2165,7 +2181,7 @@ function markoRun(opts = {}) {
         }
         if (virtualFiles.has(id)) {
           return virtualFiles.get(id);
-        } else if (/[/\\]__marko-run__[^?/\\]+\.(js|marko)$/.exec(id)) {
+        } else if (!id.startsWith(entryFilesDir) && /[/\\]__marko-run__[^?/\\]+\.(js|marko)$/.exec(id)) {
           return "";
         }
       }
@@ -2304,6 +2320,12 @@ function getImporters(module, fileName, seen = /* @__PURE__ */ new Set()) {
   }
   return seen;
 }
+function getModulesDir(dir = __dirname) {
+  const index = dir.indexOf("node_modules");
+  if (index >= 0) {
+    return dir.slice(0, index + 12);
+  }
+}
 
 // src/cli/commands.ts
 var __dirname2 = path4.dirname(fileURLToPath2(import.meta.url));
@@ -2314,7 +2336,7 @@ async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile,
   var _a;
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent", build: { outDir } },
-    "build"
+    "serve"
   );
   const [availablePort, adapter] = await Promise.all([
     getAvailablePort(

package/dist/runtime/internal.cjs

@@ -44,7 +44,7 @@ var pageResponseInit = {
   headers: { "content-type": "text/html;charset=UTF-8" }
 };
 function pageResponse(template, input) {
-  return new Response(template.stream(input), pageResponseInit);
+  return new Response(template.render(input), pageResponseInit);
 }
 var NotHandled = Symbol();
 var NotMatched = Symbol();

package/dist/runtime/internal.js

@@ -4,7 +4,7 @@ var pageResponseInit = {
   headers: { "content-type": "text/html;charset=UTF-8" }
 };
 function pageResponse(template, input) {
-  return new Response(template.stream(input), pageResponseInit);
+  return new Response(template.render(input), pageResponseInit);
 }
 var NotHandled = Symbol();
 var NotMatched = Symbol();

package/dist/vite/codegen/index.d.ts

@@ -1,8 +1,7 @@
 import type { Adapter, Route, BuiltRoutes, RoutableFile, RouterOptions } from "../types";
-export declare function renderRouteTemplate(route: Route): string;
-export declare function renderEntryTemplate(name: string, files: string[]): string;
-export declare function renderRouteEntry(route: Route): string;
-export declare function renderErrorRouter(error: Error, options?: RouterOptions): string;
-export declare function renderRouter(routes: BuiltRoutes, options?: RouterOptions): string;
+export declare function renderRouteTemplate(route: Route, getRelativePath: (path: string) => string): string;
+export declare function renderEntryTemplate(name: string, files: string[], pageInputs?: string[]): string;
+export declare function renderRouteEntry(route: Route, entriesDir: string): string;
+export declare function renderRouter(routes: BuiltRoutes, entriesDir: string, options?: RouterOptions): string;
 export declare function renderMiddleware(middleware: RoutableFile[]): string;
 export declare function renderRouteTypeInfo(routes: BuiltRoutes, pathPrefix?: string, adapter?: Adapter | null): Promise<string>;