ci: add typechecking for deno

remix-run · Nov 30, 2022 · a3b5315 · a3b5315
1 parent a79f828
commit a3b5315
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/.changeset/clean-clocks-float.md b/.changeset/clean-clocks-float.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/deno": patch
+---
+
+Fix types for request handler context
diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml
@@ -35,6 +35,11 @@ jobs:
           node-version-file: ".nvmrc"
           cache: "yarn"
 
+      - name: 🦕 Setup deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 
@@ -65,6 +70,11 @@ jobs:
           node-version: ${{ matrix.node }}
           cache: "yarn"
 
+      - name: 🦕 Setup deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 

diff --git a/.vscode/deno_resolve_npm_imports.json b/.vscode/deno_resolve_npm_imports.json
@@ -1,11 +1,13 @@
 {
-  "// Resolve NPM imports for `packages/remix-deno`.": "",
-  "// This import map is used solely for the denoland.vscode-deno extension.": "",
-  "// Remix does not support import maps.": "",
-  "// Dependency management is done through `npm` and `node_modules/` instead.": "",
-  "// Deno-only dependencies may be imported via URL imports (without using import maps).": "",
+  "comment": [
+    "Resolve NPM imports for `packages/remix-deno`.",
+    "This import map is used solely for the denoland.vscode-deno extension.",
+    "Remix does not support import maps.",
+    "Dependency management is done through `npm` and `node_modules/` instead.",
+    "Deno-only dependencies may be imported via URL imports (without using import maps)."
+  ],
   "imports": {
-    "@remix-run/server-runtime": "https://esm.sh/@remix-run/server-runtime@1.6.4",
+    "@remix-run/server-runtime": "https://esm.sh/@remix-run/server-runtime@nightly",
     "mime": "https://esm.sh/mime@3.0.0"
   }
 }
diff --git a/packages/remix-deno/server.ts b/packages/remix-deno/server.ts
@@ -1,7 +1,7 @@
 import * as path from "https://deno.land/std@0.128.0/path/mod.ts";
 import mime from "mime";
 import { createRequestHandler as createRemixRequestHandler } from "@remix-run/server-runtime";
-import type { ServerBuild } from "@remix-run/server-runtime";
+import type { AppLoadContext, ServerBuild } from "@remix-run/server-runtime";
 
 function defaultCacheControl(url: URL, assetsPublicPath = "/build/") {
   if (url.pathname.startsWith(assetsPublicPath)) {
@@ -11,7 +11,9 @@ function defaultCacheControl(url: URL, assetsPublicPath = "/build/") {
   }
 }
 
-export function createRequestHandler<Context = unknown>({
+export function createRequestHandler<
+  Context extends AppLoadContext | undefined = undefined
+>({
   build,
   mode,
   getLoadContext,
@@ -51,7 +53,7 @@ export async function serveStaticFiles(
     cacheControl?: string | ((url: URL) => string);
     publicDir?: string;
     assetsPublicPath?: string;
-  },
+  }
 ) {
   const url = new URL(request.url);
 
@@ -81,7 +83,9 @@ export async function serveStaticFiles(
   }
 }
 
-export function createRequestHandlerWithStaticFiles<Context = unknown>({
+export function createRequestHandlerWithStaticFiles<
+  Context extends AppLoadContext | undefined = undefined
+>({
   build,
   mode,
   getLoadContext,

diff --git a/scripts/build.mjs b/scripts/build.mjs
@@ -1,11 +1,22 @@
 import { spawn } from "cross-spawn";
+import glob from "glob";
 
 const args = process.argv.slice(2);
 const tsc = process.env.CI || args.includes("--tsc");
 const publish = process.env.CI || args.includes("--publish");
+const denoCheck = process.env.CI || args.includes("--deno");
 
 exec("yarn", ["rollup", "-c"])
   .then(() => tsc && exec("yarn", ["tsc", "-b"]))
+  .then(
+    () =>
+      denoCheck &&
+      exec("deno", [
+        "check",
+        "--import-map=.vscode/deno_resolve_npm_imports.json",
+        ...glob.sync("packages/remix-deno/**/*.ts"),
+      ])
+  )
   .then(() => publish && exec("node", ["scripts/copy-build-to-dist.mjs"]))
   .then(() => process.exit(0))
   .catch((err) => {