From a5d18635c3b568ac9fbbc2d5009d75dbbedf24a7 Mon Sep 17 00:00:00 2001
From: Reed von Redwitz <reed+github@vonredwitz.com>
Date: Wed, 6 Dec 2023 10:18:21 +0100
Subject: [PATCH] chore: uptake fresh 1.6.0 and std 0.208.0

---
 deno.json                     |  4 +-
 e2e_test.ts                   | 74 +++++++++++++++++------------------
 plugins/error_handling.ts     | 11 +++---
 plugins/session.ts            |  6 +--
 routes/_500.tsx               |  4 +-
 routes/api/stripe-webhooks.ts |  7 ++--
 routes/api/vote.ts            |  5 ++-
 utils/github_test.ts          |  4 +-
 utils/http.ts                 |  4 +-
 utils/http_test.ts            |  4 +-
 10 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/deno.json b/deno.json
index a2d403d8e..d77717674 100644
--- a/deno.json
+++ b/deno.json
@@ -22,7 +22,7 @@
   "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "preact" },
   "imports": {
     "@/": "./",
-    "$fresh/": "https://deno.land/x/fresh@1.5.4/",
+    "$fresh/": "https://deno.land/x/fresh@1.6.0/",
     "$gfm": "https://deno.land/x/gfm@0.2.5/mod.ts",
     "preact": "https://esm.sh/preact@10.18.1",
     "preact/": "https://esm.sh/preact@10.18.1/",
@@ -31,7 +31,7 @@
     "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.0",
     "twind-preset-tailwind/": "https://esm.sh/@twind/preset-tailwind@1.1.4/",
     "twind-preset-ext": "https://esm.sh/@twind/preset-ext@1.0.7/",
-    "std/": "https://deno.land/std@0.205.0/",
+    "std/": "https://deno.land/std@0.208.0/",
     "stripe": "npm:/stripe@13.5.0",
     "feed": "npm:/feed@4.2.2",
     "kv_oauth/": "https://deno.land/x/deno_kv_oauth@v0.9.1/",
diff --git a/e2e_test.ts b/e2e_test.ts
index 4098aea54..76a561096 100644
--- a/e2e_test.ts
+++ b/e2e_test.ts
@@ -1,6 +1,6 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
 
-import { createHandler, Status } from "$fresh/server.ts";
+import { createHandler } from "$fresh/server.ts";
 import manifest from "@/fresh.gen.ts";
 import {
   collectValues,
@@ -24,7 +24,7 @@ import {
   assertObjectMatch,
   assertStringIncludes,
 } from "std/assert/mod.ts";
-import { isRedirectStatus } from "std/http/status.ts";
+import { isRedirectStatus, STATUS_CODE } from "std/http/status.ts";
 import { resolvesNext, returnsNext, stub } from "std/testing/mock.ts";
 import Stripe from "stripe";
 import options from "./fresh.config.ts";
@@ -94,7 +94,7 @@ Deno.test("[e2e] security headers", async () => {
 Deno.test("[e2e] GET /", async () => {
   const resp = await handler(new Request("http://localhost"));
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertHtml(resp);
 });
 
@@ -184,7 +184,7 @@ Deno.test("[e2e] GET /blog", async () => {
     new Request("http://localhost/blog"),
   );
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertHtml(resp);
 });
 
@@ -192,7 +192,7 @@ Deno.test("[e2e] GET /pricing", async () => {
   const req = new Request("http://localhost/pricing");
   const resp = await handler(req);
 
-  assertEquals(resp.status, Status.NotFound);
+  assertEquals(resp.status, STATUS_CODE.NotFound);
   assertHtml(resp);
 });
 
@@ -255,7 +255,7 @@ Deno.test("[e2e] GET /dashboard/stats", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertHtml(resp);
     assertStringIncludes(await resp.text(), "<!--frsh-chart_default");
   });
@@ -279,7 +279,7 @@ Deno.test("[e2e] GET /dashboard/users", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertHtml(resp);
     assertStringIncludes(await resp.text(), "<!--frsh-userstable_default");
   });
@@ -290,7 +290,7 @@ Deno.test("[e2e] GET /submit", async () => {
     new Request("http://localhost/submit"),
   );
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertHtml(resp);
 });
 
@@ -299,7 +299,7 @@ Deno.test("[e2e] GET /feed", async () => {
     new Request("http://localhost/feed"),
   );
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertXml(resp);
 });
 
@@ -312,7 +312,7 @@ Deno.test("[e2e] GET /api/items", async () => {
   const resp = await handler(req);
   const { values } = await resp.json();
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertJson(resp);
   assertArrayIncludes(values, [item1, item2]);
 });
@@ -391,7 +391,7 @@ Deno.test("[e2e] GET /api/items/[id]", async (test) => {
   await test.step("serves not found response if item not found", async () => {
     const resp = await handler(req);
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertEquals(await resp.text(), "Item not found");
   });
 
@@ -399,7 +399,7 @@ Deno.test("[e2e] GET /api/items/[id]", async (test) => {
     await createItem(item);
     const resp = await handler(req);
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertJson(resp);
     assertEquals(await resp.json(), item);
   });
@@ -416,7 +416,7 @@ Deno.test("[e2e] GET /api/users", async () => {
 
   const { values } = await resp.json();
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertJson(resp);
   assertArrayIncludes(values, [user1, user2]);
 });
@@ -428,7 +428,7 @@ Deno.test("[e2e] GET /api/users/[login]", async (test) => {
   await test.step("serves not found response if user not found", async () => {
     const resp = await handler(req);
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertText(resp);
     assertEquals(await resp.text(), "User not found");
   });
@@ -437,7 +437,7 @@ Deno.test("[e2e] GET /api/users/[login]", async (test) => {
     await createUser(user);
     const resp = await handler(req);
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertJson(resp);
     assertEquals(await resp.json(), user);
   });
@@ -454,7 +454,7 @@ Deno.test("[e2e] GET /api/users/[login]/items", async (test) => {
   await test.step("serves not found response if user not found", async () => {
     const resp = await handler(req);
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertText(resp);
     assertEquals(await resp.text(), "User not found");
   });
@@ -465,7 +465,7 @@ Deno.test("[e2e] GET /api/users/[login]/items", async (test) => {
     const resp = await handler(req);
     const { values } = await resp.json();
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertJson(resp);
     assertArrayIncludes(values, [item]);
   });
@@ -481,7 +481,7 @@ Deno.test("[e2e] POST /api/vote", async (test) => {
   await test.step("serves unauthorized response if the session user is not signed in", async () => {
     const resp = await handler(new Request(url, { method: "POST" }));
 
-    assertEquals(resp.status, Status.Unauthorized);
+    assertEquals(resp.status, STATUS_CODE.Unauthorized);
     assertText(resp);
     assertEquals(await resp.text(), "User must be signed in");
   });
@@ -494,7 +494,7 @@ Deno.test("[e2e] POST /api/vote", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertText(resp);
     assertEquals(await resp.text(), "Item not found");
   });
@@ -509,7 +509,7 @@ Deno.test("[e2e] POST /api/vote", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.Created);
+    assertEquals(resp.status, STATUS_CODE.Created);
   });
 
   await test.step("serves an error response if the `item_id` URL parameter is missing", async () => {
@@ -520,7 +520,7 @@ Deno.test("[e2e] POST /api/vote", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.BadRequest);
+    assertEquals(resp.status, STATUS_CODE.BadRequest);
     assertEquals(await resp.text(), "`item_id` URL parameter missing");
   });
 });
@@ -553,7 +553,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
     Deno.env.delete("STRIPE_SECRET_KEY");
     const resp = await handler(new Request(url, { method: "POST" }));
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertText(resp);
     assertEquals(await resp.text(), "Not Found");
   });
@@ -562,7 +562,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
     Deno.env.set("STRIPE_SECRET_KEY", crypto.randomUUID());
     const resp = await handler(new Request(url, { method: "POST" }));
 
-    assertEquals(resp.status, Status.BadRequest);
+    assertEquals(resp.status, STATUS_CODE.BadRequest);
     assertText(resp);
     assertEquals(await resp.text(), "`Stripe-Signature` header is missing");
   });
@@ -576,7 +576,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.InternalServerError);
+    assertEquals(resp.status, STATUS_CODE.InternalServerError);
     assertText(resp);
     assertEquals(
       await resp.text(),
@@ -593,7 +593,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.BadRequest);
+    assertEquals(resp.status, STATUS_CODE.BadRequest);
     assertText(resp);
     assertEquals(
       await resp.text(),
@@ -619,7 +619,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
 
     constructEventAsyncStub.restore();
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertText(resp);
     assertEquals(await resp.text(), "User not found");
   });
@@ -648,7 +648,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
 
     constructEventAsyncStub.restore();
 
-    assertEquals(resp.status, Status.Created);
+    assertEquals(resp.status, STATUS_CODE.Created);
     assertEquals(await getUser(user.login), { ...user, isSubscribed: true });
   });
 
@@ -670,7 +670,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
 
     constructEventAsyncStub.restore();
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertText(resp);
     assertEquals(await resp.text(), "User not found");
   });
@@ -700,7 +700,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
     constructEventAsyncStub.restore();
 
     assertEquals(await getUser(user.login), { ...user, isSubscribed: false });
-    assertEquals(resp.status, Status.Accepted);
+    assertEquals(resp.status, STATUS_CODE.Accepted);
   });
 
   await test.step("serves bad request response if the event type is not supported", async () => {
@@ -721,7 +721,7 @@ Deno.test("[e2e] POST /api/stripe-webhooks", async (test) => {
 
     constructEventAsyncStub.restore();
 
-    assertEquals(resp.status, Status.BadRequest);
+    assertEquals(resp.status, STATUS_CODE.BadRequest);
     assertText(resp);
     assertEquals(await resp.text(), "Event type not supported");
   });
@@ -746,7 +746,7 @@ Deno.test("[e2e] GET /account", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertHtml(resp);
     assertStringIncludes(await resp.text(), 'href="/account/upgrade"');
   });
@@ -761,7 +761,7 @@ Deno.test("[e2e] GET /account", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.OK);
+    assertEquals(resp.status, STATUS_CODE.OK);
     assertHtml(resp);
     assertStringIncludes(await resp.text(), 'href="/account/manage"');
   });
@@ -786,7 +786,7 @@ Deno.test("[e2e] GET /account/manage", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertHtml(resp);
   });
 
@@ -836,7 +836,7 @@ Deno.test("[e2e] GET /account/upgrade", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.InternalServerError);
+    assertEquals(resp.status, STATUS_CODE.InternalServerError);
     assertHtml(resp);
   });
 
@@ -849,7 +849,7 @@ Deno.test("[e2e] GET /account/upgrade", async (test) => {
       }),
     );
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertHtml(resp);
   });
 
@@ -874,7 +874,7 @@ Deno.test("[e2e] GET /account/upgrade", async (test) => {
 
     sessionsCreateStub.restore();
 
-    assertEquals(resp.status, Status.NotFound);
+    assertEquals(resp.status, STATUS_CODE.NotFound);
     assertHtml(resp);
   });
 
@@ -926,7 +926,7 @@ Deno.test("[e2e] GET /api/me/votes", async () => {
   );
   const body = await resp.json();
 
-  assertEquals(resp.status, Status.OK);
+  assertEquals(resp.status, STATUS_CODE.OK);
   assertJson(resp);
   assertArrayIncludes(body, [{ ...item1, score: 1 }, { ...item2, score: 1 }]);
 });
diff --git a/plugins/error_handling.ts b/plugins/error_handling.ts
index 03b3d0765..ffeaebce9 100644
--- a/plugins/error_handling.ts
+++ b/plugins/error_handling.ts
@@ -1,9 +1,8 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
 import type { Plugin } from "$fresh/server.ts";
 import type { State } from "@/plugins/session.ts";
-import { Status } from "$fresh/server.ts";
 import { BadRequestError, redirect, UnauthorizedError } from "@/utils/http.ts";
-import { STATUS_TEXT } from "std/http/status.ts";
+import { STATUS_CODE, STATUS_TEXT } from "std/http/status.ts";
 
 /**
  * Returns the HTTP status code corresponding to a given runtime error. By
@@ -17,10 +16,10 @@ import { STATUS_TEXT } from "std/http/status.ts";
  * ```
  */
 export function toErrorStatus(error: Error) {
-  if (error instanceof Deno.errors.NotFound) return Status.NotFound;
-  if (error instanceof UnauthorizedError) return Status.Unauthorized;
-  if (error instanceof BadRequestError) return Status.BadRequest;
-  return Status.InternalServerError;
+  if (error instanceof Deno.errors.NotFound) return STATUS_CODE.NotFound;
+  if (error instanceof UnauthorizedError) return STATUS_CODE.Unauthorized;
+  if (error instanceof BadRequestError) return STATUS_CODE.BadRequest;
+  return STATUS_CODE.InternalServerError;
 }
 
 export default {
diff --git a/plugins/session.ts b/plugins/session.ts
index e68ab2047..fc084c550 100644
--- a/plugins/session.ts
+++ b/plugins/session.ts
@@ -1,6 +1,6 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
 import { Plugin } from "$fresh/server.ts";
-import type { MiddlewareHandlerContext } from "$fresh/server.ts";
+import type { FreshContext } from "$fresh/server.ts";
 import { getSessionId } from "kv_oauth/mod.ts";
 import { getUserBySession } from "@/utils/db.ts";
 import type { User } from "@/utils/db.ts";
@@ -22,7 +22,7 @@ export function assertSignedIn(
 
 async function setSessionState(
   req: Request,
-  ctx: MiddlewareHandlerContext<State>,
+  ctx: FreshContext<State>,
 ) {
   if (ctx.destination !== "route") return await ctx.next();
 
@@ -41,7 +41,7 @@ async function setSessionState(
 
 async function ensureSignedIn(
   _req: Request,
-  ctx: MiddlewareHandlerContext<State>,
+  ctx: FreshContext<State>,
 ) {
   assertSignedIn(ctx);
   return await ctx.next();
diff --git a/routes/_500.tsx b/routes/_500.tsx
index e246d2112..7c4e0792c 100644
--- a/routes/_500.tsx
+++ b/routes/_500.tsx
@@ -1,8 +1,8 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
-import { ErrorPageProps } from "$fresh/server.ts";
+import { PageProps } from "$fresh/server.ts";
 import { HEADING_STYLES, LINK_STYLES } from "@/utils/constants.ts";
 
-export default function Error500Page(props: ErrorPageProps) {
+export default function Error500Page(props: PageProps) {
   return (
     <main class="flex flex-1 flex-col justify-center p-4 text-center space-y-4">
       <h1 class={HEADING_STYLES}>Server error</h1>
diff --git a/routes/api/stripe-webhooks.ts b/routes/api/stripe-webhooks.ts
index 6e7d70188..9c3aae6be 100644
--- a/routes/api/stripe-webhooks.ts
+++ b/routes/api/stripe-webhooks.ts
@@ -1,5 +1,6 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
-import { type Handlers, Status } from "$fresh/server.ts";
+import { type Handlers } from "$fresh/server.ts";
+import { STATUS_CODE } from "std/http/status.ts";
 import { isStripeEnabled, stripe } from "@/utils/stripe.ts";
 import Stripe from "stripe";
 import { getUserByStripeCustomer, updateUser } from "@/utils/db.ts";
@@ -54,7 +55,7 @@ export const handler: Handlers = {
         }
 
         await updateUser({ ...user, isSubscribed: true });
-        return new Response(null, { status: Status.Created });
+        return new Response(null, { status: STATUS_CODE.Created });
       }
       case "customer.subscription.deleted": {
         const user = await getUserByStripeCustomer(customer);
@@ -63,7 +64,7 @@ export const handler: Handlers = {
         }
 
         await updateUser({ ...user, isSubscribed: false });
-        return new Response(null, { status: Status.Accepted });
+        return new Response(null, { status: STATUS_CODE.Accepted });
       }
       default: {
         throw new BadRequestError("Event type not supported");
diff --git a/routes/api/vote.ts b/routes/api/vote.ts
index 8b19bf6af..843e9aa0f 100644
--- a/routes/api/vote.ts
+++ b/routes/api/vote.ts
@@ -1,5 +1,6 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
-import { type Handlers, Status } from "$fresh/server.ts";
+import { type Handlers } from "$fresh/server.ts";
+import { STATUS_CODE } from "std/http/status.ts";
 import type { SignedInState } from "@/plugins/session.ts";
 import { createVote } from "@/utils/db.ts";
 import { BadRequestError } from "@/utils/http.ts";
@@ -16,6 +17,6 @@ export const handler: Handlers<undefined, SignedInState> = {
       userLogin: ctx.state.sessionUser.login,
     });
 
-    return new Response(null, { status: Status.Created });
+    return new Response(null, { status: STATUS_CODE.Created });
   },
 };
diff --git a/utils/github_test.ts b/utils/github_test.ts
index 5488c754b..e2356b943 100644
--- a/utils/github_test.ts
+++ b/utils/github_test.ts
@@ -3,7 +3,7 @@ import { assertRejects } from "std/assert/assert_rejects.ts";
 import { getGitHubUser } from "./github.ts";
 import { returnsNext, stub } from "std/testing/mock.ts";
 import { assertEquals } from "std/assert/assert_equals.ts";
-import { Status } from "kv_oauth/deps.ts";
+import { STATUS_CODE } from "std/http/status.ts";
 import { BadRequestError } from "@/utils/http.ts";
 
 Deno.test("[plugins] getGitHubUser()", async (test) => {
@@ -14,7 +14,7 @@ Deno.test("[plugins] getGitHubUser()", async (test) => {
       "fetch",
       returnsNext([
         Promise.resolve(
-          Response.json({ message }, { status: Status.BadRequest }),
+          Response.json({ message }, { status: STATUS_CODE.BadRequest }),
         ),
       ]),
     );
diff --git a/utils/http.ts b/utils/http.ts
index 44f978df3..127e8d4fc 100644
--- a/utils/http.ts
+++ b/utils/http.ts
@@ -1,5 +1,5 @@
 // Copyright 2023 the Deno authors. All rights reserved. MIT license.
-import { RedirectStatus, Status } from "std/http/status.ts";
+import { RedirectStatus, STATUS_CODE } from "std/http/status.ts";
 
 /**
  * Returns a response that redirects the client to the given location (URL).
@@ -19,7 +19,7 @@ import { RedirectStatus, Status } from "std/http/status.ts";
  */
 export function redirect(
   location: string,
-  status: Status.Created | RedirectStatus = Status.SeeOther,
+  status: typeof STATUS_CODE.Created | RedirectStatus = STATUS_CODE.SeeOther,
 ) {
   return new Response(null, {
     headers: {
diff --git a/utils/http_test.ts b/utils/http_test.ts
index f9b72e2b2..fef9ddcb8 100644
--- a/utils/http_test.ts
+++ b/utils/http_test.ts
@@ -2,7 +2,7 @@
 import { returnsNext, stub } from "std/testing/mock.ts";
 import { fetchValues, getCursor, redirect } from "./http.ts";
 import { assert, assertEquals, assertRejects } from "std/assert/mod.ts";
-import { Status } from "$fresh/server.ts";
+import { STATUS_CODE } from "std/http/status.ts";
 import { Item, randomItem } from "@/utils/db.ts";
 
 Deno.test("[http] redirect() defaults", () => {
@@ -33,7 +33,7 @@ Deno.test("[http] getCursor()", () => {
 
 Deno.test("[http] fetchValues()", async () => {
   const resp1 = Promise.resolve(
-    new Response(null, { status: Status.NotFound }),
+    new Response(null, { status: STATUS_CODE.NotFound }),
   );
   const resp2Body = {
     values: [randomItem(), randomItem()],