refactor: prepare for Deno 2

.github/workflows/ci.yml

@@ -12,6 +12,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        deno:
+          - "1.x"
+          - canary
         os:
           - ubuntu-latest
           - windows-latest
@@ -23,6 +26,8 @@ jobs:
 
       - name: Setup Deno
         uses: denoland/setup-deno@v1
+        with:
+          deno-version: ${{ matrix.deno }}
 
       - name: Check typos
         if: matrix.os == 'ubuntu-latest'

e2e_test.ts

@@ -21,7 +21,6 @@ import {
   assertEquals,
   assertInstanceOf,
   assertNotEquals,
-  assertObjectMatch,
   assertStringIncludes,
 } from "$std/assert/mod.ts";
 import { isRedirectStatus, STATUS_CODE } from "$std/http/status.ts";
@@ -422,7 +421,7 @@ Deno.test("[e2e] POST /submit", async (test) => {
 
     assertRedirect(resp, "/");
     // Deep partial match since the item ID is a ULID generated at runtime
-    assertObjectMatch(items[0], item);
+    assertEquals(items[0], item);
   });
 });
 

islands/ItemsList.tsx

@@ -146,7 +146,7 @@ export default function ItemsList(props: ItemsListProps) {
       itemsSig.value = [...itemsSig.value, ...values];
       cursorSig.value = cursor;
     } catch (error) {
-      console.error(error.message);
+      console.error((error as Error).message);
     } finally {
       isLoadingSig.value = false;
     }

islands/UsersTable.tsx

@@ -58,7 +58,7 @@ export default function UsersTable(props: UsersTableProps) {
       usersSig.value = [...usersSig.value, ...values];
       cursorSig.value = cursor;
     } catch (error) {
-      console.log(error.message);
+      console.log((error as Error).message);
     } finally {
       isLoadingSig.value = false;
     }

plugins/blog/routes/blog/[slug].tsx

@@ -1,6 +1,6 @@
 // Copyright 2023-2024 the Deno authors. All rights reserved. MIT license.
 import { defineRoute } from "$fresh/server.ts";
-import { CSS, render } from "https://deno.land/x/gfm@0.2.5/mod.ts";
+import { CSS, render } from "jsr:@deno/gfm@^0.9";
 import { getPost } from "../../utils/posts.ts";
 import Head from "@/components/Head.tsx";
 import Share from "../../components/Share.tsx";

plugins/error_handling.ts

@@ -47,8 +47,8 @@ export default {
           try {
             return await ctx.next();
           } catch (error) {
-            const status = toErrorStatus(error);
-            return new Response(error.message, {
+            const status = toErrorStatus(error as Error);
+            return new Response((error as Error).message, {
               statusText: STATUS_TEXT[status],
               status,
             });

routes/api/stripe-webhooks.ts

@@ -41,7 +41,7 @@ export const handler: Handlers = {
         cryptoProvider,
       );
     } catch (error) {
-      throw new BadRequestError(error.message);
+      throw new BadRequestError((error as Error).message);
     }
 
     // @ts-ignore: Property 'customer' actually does exist on type 'Object'

utils/github_test.ts

@@ -10,7 +10,7 @@ Deno.test("[plugins] getGitHubUser()", async (test) => {
   await test.step("rejects on error message", async () => {
     const message = crypto.randomUUID();
     const fetchStub = stub(
-      window,
+      globalThis,
       "fetch",
       returnsNext([
         Promise.resolve(
@@ -29,7 +29,7 @@ Deno.test("[plugins] getGitHubUser()", async (test) => {
   await test.step("resolves to a GitHub user object", async () => {
     const body = { login: crypto.randomUUID(), email: crypto.randomUUID() };
     const fetchStub = stub(
-      window,
+      globalThis,
       "fetch",
       returnsNext([Promise.resolve(Response.json(body))]),
     );