Merge branch 'main' into deno-jsons-clean

Author: iuioiua

deno.lock

@@ -53,7 +53,7 @@ function LeafletProvider(props: { children: ComponentChildren }) {
       <p>Leaflet must be loaded on the client. No children will render</p>
     );
   }
-  const [value, setValue] = useState<typeof Leaflet | null>(null);
+  const value = useSignal<typeof Leaflet | null>(null)
   return (
     <>
       {/* Load Leaflet CSS */}
@@ -65,7 +65,7 @@ function LeafletProvider(props: { children: ComponentChildren }) {
       />
       {/* Load Leaflet JS */}
       <script
-        onLoad={() => setValue(window.L)}
+        onLoad={() => value.value = window.L}
         src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
         integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
         crossorigin=""
@@ -120,8 +120,9 @@ export default function MapIsland() {
 ```tsx MapIsland.tsx
 import * as Leaflet from "https://esm.sh/v135/@types/leaflet@1.9.4/index.d.ts";
 import { IS_BROWSER } from "$fresh/runtime.ts";
-import { useContext, useEffect, useState } from "preact/hooks";
+import { useContext, useEffect } from "preact/hooks";
 import { ComponentChildren, createContext } from "preact";
+import { useSignal } from "@preact/signals";
 
 // Create a context to hold Leaflet data/functions
 const LeafletContext = createContext<typeof Leaflet | null>(null);
@@ -131,7 +132,7 @@ function LeafletProvider(props: { children: ComponentChildren }) {
   if (!IS_BROWSER) {
     return <p>Leaflet must be loaded on the client. No children will render</p>;
   }
-  const [value, setValue] = useState<typeof Leaflet | null>(null);
+  const value = useSignal<typeof Leaflet | null>(null);
   return (
     <>
       {/* Load Leaflet CSS */}
@@ -143,7 +144,7 @@ function LeafletProvider(props: { children: ComponentChildren }) {
       />
       {/* Load Leaflet JS */}
       <script
-        onLoad={() => setValue(window.L)}
+        onLoad={() => value.value = window.L}
         src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
         integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
         crossorigin=""

docs/latest/examples/client-side-components-and-libraries.md

@@ -121,25 +121,31 @@ Deno.test("init - with vscode", async () => {
   });
 });
 
-Deno.test("init - fmt, lint, and type check project", async () => {
-  await withTmpDir(async (dir) => {
-    const mock = mockUserInput({
-      [InitStep.ProjectName]: ".",
+Deno.test({
+  name: "init - fmt, lint, and type check project",
+  // Ignore this test on canary due to different formatting
+  // behaviours when the formatter changes.
+  ignore: Deno.version.deno.includes("+"),
+  fn: async () => {
+    await withTmpDir(async (dir) => {
+      const mock = mockUserInput({
+        [InitStep.ProjectName]: ".",
+      });
+      await initProject(dir, [], {}, mock.tty);
+      await expectProjectFile(dir, "main.ts");
+      await expectProjectFile(dir, "dev.ts");
+
+      await patchProject(dir);
+
+      const check = await new Deno.Command(Deno.execPath(), {
+        args: ["task", "check"],
+        cwd: dir,
+        stderr: "inherit",
+        stdout: "inherit",
+      }).output();
+      expect(check.code).toEqual(0);
     });
-    await initProject(dir, [], {}, mock.tty);
-    await expectProjectFile(dir, "main.ts");
-    await expectProjectFile(dir, "dev.ts");
-
-    await patchProject(dir);
-
-    const check = await new Deno.Command(Deno.execPath(), {
-      args: ["task", "check"],
-      cwd: dir,
-      stderr: "inherit",
-      stdout: "inherit",
-    }).output();
-    expect(check.code).toEqual(0);
-  });
+  },
 });
 
 Deno.test("init with tailwind - fmt, lint, and type check project", async () => {

init/src/init_test.ts

@@ -3,11 +3,10 @@ import { initProject } from "./init.ts";
 import { InitError } from "./init.ts";
 
 const flags = parseArgs(Deno.args, {
-  boolean: ["force", "tailwind", "twind", "vscode", "docker", "help"],
+  boolean: ["force", "tailwind", "vscode", "docker", "help"],
   default: {
     force: null,
     tailwind: null,
-    twind: null,
     vscode: null,
     docker: null,
   },

init/src/mod.ts

@@ -295,10 +295,19 @@ export class App<State> {
       }
 
       try {
+        let result: unknown;
         if (handlers.length === 1 && handlers[0].length === 1) {
-          return handlers[0][0](ctx);
+          result = await handlers[0][0](ctx);
+        } else {
+          result = await runMiddlewares(handlers, ctx);
         }
-        return await runMiddlewares(handlers, ctx);
+        if (!(result instanceof Response)) {
+          throw new Error(
+            `Expected a "Response" instance to be returned, but got: ${result}`,
+          );
+        }
+
+        return result;
       } catch (err) {
         if (err instanceof HttpError) {
           if (err.status >= 500) {