Merge branch 'main' into remove-finish-setup

Author: iuioiua

docs/latest/getting-started/form-submissions.md

@@ -53,8 +53,10 @@ export default function Page({ data }: PageProps<Data>) {
   return (
     <div>
       <form>
-        <input type="text" name="q" value={query} />
-        <button type="submit">Search</button>
+        <input type="text" name="q" value={query} class="border p-1" />
+        <button type="submit" class="ml-1 px-2 py-1 bg-gray-100 border">
+          Search
+        </button>
       </form>
       <ul>
         {results.map((name) => <li key={name}>{name}</li>)}

init/src/init.ts

@@ -403,6 +403,7 @@ ${GRADIENT_CSS}`;
 import { define, type State } from "./utils.ts";
 
 export const app = new App<State>();
+
 app.use(staticFiles());
 
 // this is the same as the /api/:name route defined via a file. feel free to delete this!
@@ -421,7 +422,6 @@ const exampleLoggerMiddleware = define.middleware((ctx) => {
 app.use(exampleLoggerMiddleware);
 
 await fsRoutes(app, {
-  dir: "./",
   loadIsland: (path) => import(\`./islands/\${path}\`),
   loadRoute: (path) => import(\`./routes/\${path}\`),
 });

src/app.ts

@@ -6,12 +6,7 @@ import { DENO_DEPLOYMENT_ID } from "./runtime/build_id.ts";
 import * as colors from "@std/fmt/colors";
 import { type MiddlewareFn, runMiddlewares } from "./middlewares/mod.ts";
 import { FreshReqContext } from "./context.ts";
-import {
-  mergePaths,
-  type Method,
-  type Router,
-  UrlPatternRouter,
-} from "./router.ts";
+import { type Method, type Router, UrlPatternRouter } from "./router.ts";
 import {
   type FreshConfig,
   normalizeConfig,
@@ -20,6 +15,7 @@ import {
 import { type BuildCache, ProdBuildCache } from "./build_cache.ts";
 import type { ServerIslandRegistry } from "./context.ts";
 import { HttpError, SetupError } from "./error.ts";
+import { mergePaths } from "./utils.ts";
 
 // TODO: Completed type clashes in older Deno versions
 // deno-lint-ignore no-explicit-any
@@ -42,8 +38,80 @@ export type ListenOptions =
   & {
     remoteAddress?: string;
   };
+function createOnListen(
+  basePath: string,
+  options: ListenOptions,
+): (localAddr: Deno.NetAddr) => void {
+  return (params) => {
+    // Don't spam logs with this on live deployments
+    if (DENO_DEPLOYMENT_ID) return;
+
+    const pathname = basePath + "/";
+    const protocol = "key" in options && options.key && options.cert
+      ? "https:"
+      : "http:";
+
+    let hostname = params.hostname;
+    // Windows being windows...
+    if (
+      Deno.build.os === "windows" &&
+      (hostname === "0.0.0.0" || hostname === "::")
+    ) {
+      hostname = "localhost";
+    }
+    // Work around https://github.com/denoland/deno/issues/23650
+    hostname = hostname.startsWith("::") ? `[${hostname}]` : hostname;
+
+    // deno-lint-ignore no-console
+    console.log();
+    // deno-lint-ignore no-console
+    console.log(
+      colors.bgRgb8(colors.rgb8(" 🍋 Fresh ready   ", 0), 121),
+    );
+    const sep = options.remoteAddress ? "" : "\n";
+    const space = options.remoteAddress ? " " : "";
+
+    const localLabel = colors.bold("Local:");
+    const address = colors.cyan(
+      `${protocol}//${hostname}:${params.port}${pathname}`,
+    );
+    // deno-lint-ignore no-console
+    console.log(`    ${localLabel}  ${space}${address}${sep}`);
+    if (options.remoteAddress) {
+      const remoteLabel = colors.bold("Remote:");
+      const remoteAddress = colors.cyan(options.remoteAddress);
+      // deno-lint-ignore no-console
+      console.log(`    ${remoteLabel}  ${remoteAddress}\n`);
+    }
+  };
+}
 
-Deno.serve;
+async function listenOnFreePort(
+  options: ListenOptions,
+  handler: (
+    request: Request,
+    info?: Deno.ServeHandlerInfo,
+  ) => Promise<Response>,
+) {
+  // No port specified, check for a free port. Instead of picking just
+  // any port we'll check if the next one is free for UX reasons.
+  // That way the user only needs to increment a number when running
+  // multiple apps vs having to remember completely different ports.
+  let firstError = null;
+  for (let port = 8000; port < 8020; port++) {
+    try {
+      return await Deno.serve({ ...options, port }, handler);
+    } catch (err) {
+      if (err instanceof Deno.errors.AddrInUse) {
+        // Throw first EADDRINUSE error if no port is free
+        if (!firstError) firstError = err;
+        continue;
+      }
+      throw err;
+    }
+  }
+  throw firstError;
+}
 
 export let getRouter: <State>(app: App<State>) => Router<MiddlewareFn<State>>;
 // deno-lint-ignore no-explicit-any
@@ -249,80 +317,15 @@ export class App<State> {
 
   async listen(options: ListenOptions = {}): Promise<void> {
     if (!options.onListen) {
-      options.onListen = (params) => {
-        const pathname = (this.config.basePath) + "/";
-        const protocol = "key" in options && options.key && options.cert
-          ? "https:"
-          : "http:";
-
-        let hostname = params.hostname;
-        // Windows being windows...
-        if (
-          Deno.build.os === "windows" &&
-          (hostname === "0.0.0.0" || hostname === "::")
-        ) {
-          hostname = "localhost";
-        }
-        // Work around https://github.com/denoland/deno/issues/23650
-        hostname = hostname.startsWith("::") ? `[${hostname}]` : hostname;
-        const address = colors.cyan(
-          `${protocol}//${hostname}:${params.port}${pathname}`,
-        );
-        const localLabel = colors.bold("Local:");
-
-        // Don't spam logs with this on live deployments
-        if (!DENO_DEPLOYMENT_ID) {
-          // deno-lint-ignore no-console
-          console.log();
-          // deno-lint-ignore no-console
-          console.log(
-            colors.bgRgb8(colors.rgb8(" 🍋 Fresh ready   ", 0), 121),
-          );
-          const sep = options.remoteAddress ? "" : "\n";
-          const space = options.remoteAddress ? " " : "";
-          // deno-lint-ignore no-console
-          console.log(`    ${localLabel}  ${space}${address}${sep}`);
-          if (options.remoteAddress) {
-            const remoteLabel = colors.bold("Remote:");
-            const remoteAddress = colors.cyan(options.remoteAddress);
-            // deno-lint-ignore no-console
-            console.log(`    ${remoteLabel}  ${remoteAddress}\n`);
-          }
-        }
-      };
+      options.onListen = createOnListen(this.config.basePath, options);
     }
 
     const handler = await this.handler();
     if (options.port) {
       await Deno.serve(options, handler);
-    } else {
-      // No port specified, check for a free port. Instead of picking just
-      // any port we'll check if the next one is free for UX reasons.
-      // That way the user only needs to increment a number when running
-      // multiple apps vs having to remember completely different ports.
-      let firstError;
-      for (let port = 8000; port < 8020; port++) {
-        try {
-          await Deno.serve({ ...options, port }, handler);
-          firstError = undefined;
-          break;
-        } catch (err) {
-          if (err instanceof Deno.errors.AddrInUse) {
-            // Throw first EADDRINUSE error
-            // if no port is free
-            if (!firstError) {
-              firstError = err;
-            }
-            continue;
-          }
-
-          throw err;
-        }
-      }
-
-      if (firstError) {
-        throw firstError;
-      }
+      return;
     }
+
+    await listenOnFreePort(options, handler);
   }
 }

src/config.ts

@@ -1,20 +1,37 @@
 import * as path from "@std/path";
 
 export interface FreshConfig {
+  /**
+   * The root directory of the Fresh project.
+   *
+   * Other paths, such as `build.outDir`, `staticDir`, and `fsRoutes()`
+   * are resolved relative to this directory.
+   * @default Deno.cwd()
+   */
   root?: string;
   build?: {
     /**
      * The directory to write generated files to when `dev.ts build` is run.
+     *
      * This can be an absolute path, a file URL or a relative path.
+     * Relative paths are resolved against the `root` option.
+     * @default "_fresh"
      */
     outDir?: string;
   };
   /**
    * Serve fresh from a base path instead of from the root.
    *   "/foo/bar" -> http://localhost:8000/foo/bar
-   * @default {undefined}
+   * @default undefined
    */
   basePath?: string;
+  /**
+   * The directory to serve static files from.
+   *
+   * This can be an absolute path, a file URL or a relative path.
+   * Relative paths are resolved against the `root` option.
+   * @default "static"
+   */
   staticDir?: string;
 }
 
@@ -35,35 +52,47 @@ export interface ResolvedFreshConfig {
 }
 
 export function parseRootPath(root: string, cwd: string): string {
-  if (root.startsWith("file://")) {
-    root = path.fromFileUrl(root);
-  } else if (!path.isAbsolute(root)) {
-    root = path.join(cwd, root);
+  return parseDirPath(root, cwd, true);
+}
+
+function parseDirPath(
+  dirPath: string,
+  root: string,
+  fileToDir = false,
+): string {
+  if (dirPath.startsWith("file://")) {
+    dirPath = path.fromFileUrl(dirPath);
+  } else if (!path.isAbsolute(dirPath)) {
+    dirPath = path.join(root, dirPath);
+  }
+
+  if (fileToDir) {
+    const ext = path.extname(dirPath);
+    if (
+      ext === ".ts" || ext === ".tsx" || ext === ".js" || ext === ".jsx" ||
+      ext === ".mjs"
+    ) {
+      dirPath = path.dirname(dirPath);
+    }
   }
 
-  const ext = path.extname(root);
-  if (
-    ext === ".ts" || ext === ".tsx" || ext === ".js" || ext === ".jsx" ||
-    ext === ".mjs"
-  ) {
-    root = path.dirname(root);
+  if (Deno.build.os === "windows") {
+    dirPath = dirPath.replaceAll("\\", "/");
   }
 
-  return root;
+  return dirPath;
 }
 
 export function normalizeConfig(options: FreshConfig): ResolvedFreshConfig {
-  const root = options.root
-    ? parseRootPath(options.root, Deno.cwd())
-    : Deno.cwd();
+  const root = parseRootPath(options.root ?? ".", Deno.cwd());
 
   return {
     root,
     build: {
-      outDir: options.build?.outDir ?? path.join(root, "_fresh"),
+      outDir: parseDirPath(options.build?.outDir ?? "_fresh", root),
     },
     basePath: options.basePath ?? "",
-    staticDir: options.staticDir ?? path.join(root, "static"),
+    staticDir: parseDirPath(options.staticDir ?? "static", root),
     mode: "production",
   };
 }