Fix build command

Author: ije

server/build.ts

@@ -5,7 +5,7 @@ import { parseExportNames } from "../compiler/mod.ts";
 import cache from "../lib/cache.ts";
 import { existsDir, existsFile } from "../lib/fs.ts";
 import { builtinModuleExts, toLocalPath } from "../lib/helpers.ts";
-import { parseHtmlLinks } from "../lib/html.ts";
+import { parseHtmlLinks } from "./html.ts";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
 import { getAlephPkgUri, loadImportMap, loadJSXConfig } from "../server/config.ts";
@@ -55,7 +55,7 @@ export async function build(serverEntry?: string) {
     `import { DependencyGraph } from "${alephPkgUri}/server/graph.ts";`,
     `import graph from "./server_dependency_graph.js";`,
     `globalThis.serverDependencyGraph = new DependencyGraph(graph.modules);`,
-    routeFiles.length > 0 && `import { register } from "${alephPkgUri}/server/routing.ts";`,
+    routeFiles.length > 0 && `import { revive } from "${alephPkgUri}/server/routing.ts";`,
     ...routeFiles.map(([filename, exportNames], idx) => {
       const hasDefaultExport = exportNames.includes("default");
       const hasDataExport = exportNames.includes("data");
@@ -64,11 +64,18 @@ export async function build(serverEntry?: string) {
       }
       const url = `http://localhost:${port}${filename.slice(1)}`;
       return [
-        hasDefaultExport && `import _${idx} from ${JSON.stringify(url)};`,
-        !hasDefaultExport && `const _${idx} = undefined;`,
-        hasDataExport && `import { data as $${idx} } from ${JSON.stringify(url)};`,
-        !hasDataExport && `const $${idx} = undefined;`,
-        `register(${JSON.stringify(filename)}, { default: _${idx}, data: $${idx} });`,
+        `import { ${
+          [
+            hasDefaultExport && `default as $${idx}`,
+            hasDataExport && `data as $$${idx}`,
+          ].filter(Boolean).join(", ")
+        } } from ${JSON.stringify(url)};`,
+        `revive(${JSON.stringify(filename)}, { ${
+          [
+            hasDefaultExport && `default: $${idx}`,
+            hasDataExport && `data: $$${idx}`,
+          ].filter(Boolean).join(", ")
+        } });`,
       ];
     }).flat().filter(Boolean),
     serverEntry && `import "http://localhost:${port}/${basename(serverEntry)}";`,
@@ -189,9 +196,11 @@ export async function build(serverEntry?: string) {
   // create server_dependency_graph.js
   const serverDependencyGraph: DependencyGraph | undefined = Reflect.get(globalThis, "serverDependencyGraph");
   if (serverDependencyGraph) {
+    // deno-lint-ignore no-unused-vars
+    const modules = serverDependencyGraph.modules.map(({ sourceCode, ...ret }) => ret);
     await Deno.writeTextFile(
       join(outputDir, "server_dependency_graph.js"),
-      "export default " + JSON.stringify({ modules: serverDependencyGraph.modules }),
+      "export default " + JSON.stringify({ modules }),
     );
   }
 

server/graph.ts

@@ -1,7 +1,7 @@
 export type Module = {
   readonly specifier: string;
-  readonly sourceCode: string;
   readonly version: number;
+  readonly sourceCode?: string;
   readonly deps?: ReadonlyArray<DependencyDescriptor>;
   readonly inlineCSS?: string;
   readonly atomicCSS?: boolean;
@@ -108,7 +108,7 @@ export class DependencyGraph {
   #walk(specifier: string, callback: (mod: Module) => void, __tracing = new Set<string>()) {
     if (this.#modules.has(specifier)) {
       const mod = this.#modules.get(specifier)!;
-      callback({ ...mod, deps: mod.deps?.map((dep) => ({ ...dep })) });
+      callback(mod);
       __tracing.add(specifier);
       mod.deps?.forEach((dep) => {
         if (!__tracing.has(dep.specifier)) {

server/mod.ts

@@ -294,6 +294,7 @@ export const serve = (options: ServerOptions = {}) => {
       indexHtml,
       routes,
       customHTMLRewriter,
+      isDev,
       ssr,
     });
   };

server/renderer.ts

@@ -4,7 +4,7 @@ import util from "../lib/util.ts";
 import type { RouteModule, Routes } from "../lib/route.ts";
 import { matchRoutes } from "../lib/route.ts";
 import { getUnoGenerator } from "./config.ts";
-import type { DependencyGraph } from "./graph.ts";
+import type { DependencyGraph, Module } from "./graph.ts";
 import type { Comment, Element } from "./html.ts";
 import { HTMLRewriter } from "./html.ts";
 import { importRouteModule } from "./routing.ts";
@@ -36,6 +36,7 @@ export type RenderOptions = {
   indexHtml: Uint8Array;
   routes: Routes;
   customHTMLRewriter: Map<string, HTMLRewriterHandlers>;
+  isDev: boolean;
   ssr?: SSR;
 };
 
@@ -51,7 +52,7 @@ const bootstrapScript = `data:text/javascript;charset=utf-8;base64,${btoa("/* hy
 
 export default {
   async fetch(req: Request, ctx: Record<string, unknown>, options: RenderOptions): Promise<Response> {
-    const { indexHtml, routes, customHTMLRewriter, ssr } = options;
+    const { indexHtml, routes, customHTMLRewriter, isDev, ssr } = options;
     const headers = new Headers(ctx.headers as Headers);
     let ssrRes: SSRResult | null = null;
     if (ssr) {
@@ -72,27 +73,27 @@ export default {
         const body = await render(ssrContext);
         const serverDependencyGraph: DependencyGraph | undefined = Reflect.get(globalThis, "serverDependencyGraph");
         if (serverDependencyGraph) {
-          const atomicCSSSource: string[] = [];
+          const atomicCSSSource: Promise<string>[] = [];
+          const lookupModuleStyle = (mod: Module) => {
+            const { specifier, sourceCode, atomicCSS, inlineCSS } = mod;
+            if (atomicCSS) {
+              atomicCSSSource.push(
+                sourceCode ? Promise.resolve(sourceCode) : Deno.readTextFile(specifier).then((text) => {
+                  Object.assign(mod, { sourceCode: text });
+                  return text;
+                }),
+              );
+            }
+            if (inlineCSS) {
+              headCollection.push(`<style data-module-id="${specifier}">${inlineCSS}</style>`);
+            }
+          };
           for (const { filename } of routeModules) {
-            serverDependencyGraph.walk(filename, (mod) => {
-              if (mod.atomicCSS) {
-                atomicCSSSource.push(mod.sourceCode);
-              }
-              if (mod.inlineCSS) {
-                headCollection.push(`<style data-module-id="${mod.specifier}">${mod.inlineCSS}</style>`);
-              }
-            });
+            serverDependencyGraph.walk(filename, lookupModuleStyle);
           }
           for (const serverEntry of builtinModuleExts.map((ext) => `./server.${ext}`)) {
             if (serverDependencyGraph.get(serverEntry)) {
-              serverDependencyGraph.walk(serverEntry, (mod) => {
-                if (mod.atomicCSS) {
-                  atomicCSSSource.push(mod.sourceCode);
-                }
-                if (mod.inlineCSS) {
-                  headCollection.push(`<style data-module-id="${mod.specifier}">${mod.inlineCSS}</style>`);
-                }
-              });
+              serverDependencyGraph.walk(serverEntry, lookupModuleStyle);
               break;
             }
           }
@@ -101,7 +102,10 @@ export default {
             const unoGenerator = getUnoGenerator();
             if (unoGenerator) {
               const start = performance.now();
-              const { css } = await unoGenerator.generate(atomicCSSSource.join("\n"));
+              const input = (await Promise.all(atomicCSSSource)).join("\n");
+              const { css } = await unoGenerator.generate(input, {
+                minify: !isDev,
+              });
               if (css) {
                 headCollection.push(
                   `<style data-unocss="${unoGenerator.version}" data-build-time="${

server/routing.ts

@@ -12,7 +12,7 @@ const revivedModules: Map<string, Record<string, unknown>> = new Map();
 
 /** revive a route module. */
 export function revive(filename: string, module: Record<string, unknown>) {
-  if (!Deno.env.get("ALEPH_CLI")) {
+  if (Deno.env.get("ALEPH_ENV") === "production") {
     revivedModules.set(filename, module);
   }
 }