Add preBuild option

Author: ije

commands/dev.ts

@@ -126,10 +126,6 @@ if (import.meta.main) {
           });
         }
       });
-    } else {
-      emitters.forEach((e) => {
-        e.emit(kind, { specifier });
-      });
     }
   });
 
@@ -142,6 +138,9 @@ if (import.meta.main) {
 
   let ac: AbortController | null = null;
   const bs = async () => {
+    if (Deno.env.get("PREVENT_SERVER_RESTART") === "true") {
+      return;
+    }
     if (ac) {
       ac.abort();
       log.info(`Restart server...`);
@@ -188,7 +187,7 @@ if (import.meta.main) {
   await bs();
 }
 
-async function bootstrap(signal: AbortSignal, entry: string | undefined, forcePort?: number): Promise<void> {
+async function bootstrap(signal: AbortSignal, entry: string | undefined, fixedPort?: number): Promise<void> {
   // clean globally cached objects
   Reflect.deleteProperty(globalThis, "__ALEPH_SERVER");
   Reflect.deleteProperty(globalThis, "__ALEPH_INDEX_HTML");
@@ -211,14 +210,28 @@ async function bootstrap(signal: AbortSignal, entry: string | undefined, forcePo
     serve();
   }
 
-  const {
-    port: userPort,
-    hostname,
-    certFile,
-    keyFile,
-    handler,
-  } = Reflect.get(globalThis, "__ALEPH_SERVER") || {};
-  const port = forcePort || userPort || 8080;
+  const { devServer, build }: AlephConfig = Reflect.get(globalThis, "__ALEPH_CONFIG") || {};
+  const { port: userPort, hostname, certFile, keyFile, handler } = Reflect.get(globalThis, "__ALEPH_SERVER") || {};
+  const port = fixedPort || userPort || 8080;
+
+  if (typeof build?.preBuild === "function") {
+    log.info("Pre-build...");
+    await build.preBuild();
+  }
+  if (typeof devServer?.watchFS === "function") {
+    const { watchFS } = devServer;
+    const e = createEmitter();
+    signal.addEventListener("abort", () => {
+      removeEmitter(e);
+    });
+    e.on("*", (kind, { specifier }) => {
+      if (kind.startsWith("modify:")) {
+        watchFS("modify", specifier);
+      } else if (kind === "create" || kind === "remove") {
+        watchFS(kind, specifier);
+      }
+    });
+  }
 
   try {
     await httpServe({

server/build.ts

@@ -41,6 +41,7 @@ export async function build(serverEntry?: string) {
   const jsxCofig = await loadJSXConfig(importMap);
   const moduleLoaders = await initModuleLoaders(importMap);
   const config: AlephConfig | undefined = Reflect.get(globalThis, "__ALEPH_CONFIG");
+  const preBuild = config?.build?.preBuild;
   const platform = config?.build?.platform ?? "deno";
   const target = config?.build?.target ?? "es2020";
   const outputDir = join(workingDir, config?.build?.outputDir ?? "dist");
@@ -59,6 +60,11 @@ export async function build(serverEntry?: string) {
     await Deno.mkdir(outputDir, { recursive: true });
   }
 
+  if (typeof preBuild === "function") {
+    log.info("Pre-build...");
+    await preBuild();
+  }
+
   // find route files by the `routes` config
   let routeFiles: [filename: string, exportNames: string[]][] = [];
   if (config?.routes) {

server/mod.ts

@@ -20,15 +20,14 @@ export type ServerOptions = Omit<ServeInit, "onError"> & {
   certFile?: string;
   keyFile?: string;
   logLevel?: LevelName;
-  hmrWebSocketUrl?: string;
   middlewares?: Middleware[];
   fetch?: FetchHandler;
   ssr?: SSR;
   onError?: ErrorCallback;
 } & AlephConfig;
 
 export const serve = (options: ServerOptions = {}) => {
-  const { routes, build, middlewares, fetch, ssr, logLevel, onError } = options;
+  const { routes, build, devServer, middlewares, fetch, ssr, logLevel, onError } = options;
   const isDev = Deno.env.get("ALEPH_ENV") === "development";
   const importMapPromise = loadImportMap();
   const jsxConfigPromise = importMapPromise.then(loadJSXConfig);
@@ -353,7 +352,7 @@ export const serve = (options: ServerOptions = {}) => {
           isDev,
           importMap: await importMapPromise,
           ssr: typeof ssr === "function" ? {} : ssr,
-          hmrWebSocketUrl: options.hmrWebSocketUrl,
+          hmrWebSocketUrl: options.devServer?.hmrWebSocketUrl,
         });
       } catch (err) {
         if (err instanceof Deno.errors.NotFound) {
@@ -387,31 +386,13 @@ export const serve = (options: ServerOptions = {}) => {
     });
   };
 
-  // inject navigator browser polyfill to fix some ssr errors
-  Object.assign(globalThis.navigator, {
-    connection: {
-      downlink: 10,
-      effectiveType: "4g",
-      onchange: null,
-      rtt: 50,
-      saveData: false,
-    },
-    cookieEnabled: false,
-    language: "en",
-    languages: ["en"],
-    onLine: true,
-    vendor: "Deno Land Inc.",
-  });
-  // deno-lint-ignore no-explicit-any
-  (globalThis.navigator as any).userAgent ??= `Deno/${Deno.version?.deno || "deploy"}`;
-
   // set log level if specified
   if (logLevel) {
     log.setLevel(logLevel);
   }
 
   // inject global objects
-  Reflect.set(globalThis, "__ALEPH_CONFIG", { build, routes });
+  Reflect.set(globalThis, "__ALEPH_CONFIG", { build, routes, devServer });
   Reflect.set(globalThis, "clientDependencyGraph", new DependencyGraph());
 
   const { hostname, port = 8080, certFile, keyFile, signal } = options;

server/types.ts

@@ -1,10 +1,16 @@
 import type { UserConfig as UnoConfig } from "https://esm.sh/@unocss/[email protected]";
 
 export type AlephConfig = {
-  /** The build options for `build` command. */
-  build?: BuildOptions;
   /** The config for file-system based routing.  */
   routes?: RoutesConfig | string;
+  /** The build options for `build` command. */
+  build?: BuildOptions;
+  /** The config for dev server. */
+  devServer?: {
+    watchFS?: (kind: "create" | "remove" | "modify", specifier: string) => void;
+    /** The url for HMR web socket. This is useful for dev server proxy env. */
+    hmrWebSocketUrl?: string;
+  };
 };
 
 /** The build platform.  */
@@ -13,7 +19,7 @@ export type BuildPlatform = "deno" | "cloudflare" | "vercel";
 /** The build options for `build` command. */
 export type BuildOptions = {
   /** The Pre-build task.  */
-  preBuild?: () => Promise<Record<string, unknown>>;
+  preBuild?: () => Promise<void> | void;
   /** The supported platform. default is "deno" */
   platform?: BuildPlatform;
   /** The directory for build output files. default is "dist" */