refactor: update to use @std/assert from jsr (#29)

dsherret · web-flow · commit 849e2b986b99 · 2025-04-08T15:00:39.000-07:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,9 +11,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: denoland/setup-deno@v1
+      - uses: denoland/setup-deno@v2
         with:
-          deno-version: v1.x
+          deno-version: v2.x
       - name: Run tests
         run: deno test --allow-env --allow-read=. --allow-net=api.github.com,0.0.0.0,localhost
       - name: Deploy to Deno Deploy
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/deno.json b/deno.json
@@ -1,3 +1,8 @@
 {
-  "importMap": "./import_map.json"
+  "imports": {
+    "@std/assert": "jsr:@std/assert@^1.0.12",
+    "preact": "https://esm.sh/preact@10.15.1?pin=v135",
+    "preact/": "https://esm.sh/preact@10.15.1&pin=v135/",
+    "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.1.0?pin=v135"
+  }
 }
diff --git a/deno.lock b/deno.lock
diff --git a/deps.test.ts b/deps.test.ts
diff --git a/handleRequest.test.ts b/handleRequest.test.ts
@@ -1,8 +1,8 @@
-import { assertEquals } from "./deps.test.ts";
+import { assertEquals } from "@std/assert";
 import { createRequestHandler } from "./handleRequest.ts";
 import { RealClock } from "./utils/clock.ts";
 
-const connInfo: Deno.ServeHandlerInfo = {
+const connInfo: Deno.ServeHandlerInfo<Deno.NetAddr> = {
   remoteAddr: {
     transport: "tcp",
     hostname: "127.0.0.1",
diff --git a/handleRequest.ts b/handleRequest.ts
@@ -16,7 +16,7 @@ const contentTypes = {
 export function createRequestHandler(clock: Clock) {
   const { fetchCached } = createFetchCacher(clock);
   return {
-    async handleRequest(request: Request, info: Deno.ServeHandlerInfo) {
+    async handleRequest(request: Request, info: Deno.ServeHandlerInfo<Deno.NetAddr>) {
       const url = new URL(request.url);
       const newUrl = await resolvePluginOrSchemaUrl(url);
       if (newUrl != null) {
diff --git a/import_map.json b/import_map.json
diff --git a/plugins.test.ts b/plugins.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "./deps.test.ts";
+import { assertEquals } from "@std/assert";
 import { tryResolveLatestJson } from "./plugins.ts";
 import { getLatestReleaseInfo } from "./utils/github.ts";
 
diff --git a/utils/LazyExpirableValue.test.ts b/utils/LazyExpirableValue.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals, assertRejects } from "../deps.test.ts";
+import { assertEquals, assertRejects } from "@std/assert";
 import { LazyExpirableValue } from "./LazyExpirableValue.ts";
 
 Deno.test("should work", async () => {
diff --git a/utils/LruCache.test.ts b/utils/LruCache.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "../deps.test.ts";
+import { assertEquals } from "@std/assert";
 import { LruCache, LruCacheWithExpiry } from "./LruCache.ts";
 
 Deno.test("LruCache - keeps only most recent", () => {
diff --git a/utils/RateLimiter.test.ts b/utils/RateLimiter.test.ts
@@ -1,4 +1,4 @@
-import { assert } from "../deps.test.ts";
+import { assert } from "@std/assert";
 import { Clock } from "./clock.ts";
 import { RateLimiter } from "./RateLimiter.ts";
 
diff --git a/utils/asyncLazy.test.ts b/utils/asyncLazy.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals, assertRejects } from "../deps.test.ts";
+import { assertEquals, assertRejects } from "@std/assert";
 import { createAsyncLazy } from "./asyncLazy.ts";
 
 Deno.test("should create", async () => {
diff --git a/utils/fetchCached.test.ts b/utils/fetchCached.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "../deps.test.ts";
+import { assertEquals } from "@std/assert";
 import { createFetchCacher } from "./fetchCached.ts";
 
 Deno.test("should error when going above 10mb", {
diff --git a/utils/github.test.ts b/utils/github.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "../deps.test.ts";
+import { assertEquals } from "@std/assert";
 import { checkGithubRepoExists } from "./github.ts";
 
 Deno.test("should get when exists", async () => {
diff --git a/utils/version.test.ts b/utils/version.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "../deps.test.ts";
+import { assertEquals } from "@std/assert";
 import { parseVersion, Version } from "./version.ts";
 
 Deno.test("should parse version", () => {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,8 @@`
`1`	`1`	`{`
`2`		`- "importMap": "./import_map.json"`
	`2`	`+ "imports": {`
	`3`	`+ "@std/assert": "jsr:@std/assert@^1.0.12",`
	`4`	`+ "preact": "https://esm.sh/preact@10.15.1?pin=v135",`
	`5`	`+ "preact/": "https://esm.sh/preact@10.15.1&pin=v135/",`
	`6`	`+ "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.1.0?pin=v135"`
	`7`	`+ }`
`3`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { assertEquals } from "./deps.test.ts";`
	`1`	`+import { assertEquals } from "@std/assert";`
`2`	`2`	`import { tryResolveLatestJson } from "./plugins.ts";`
`3`	`3`	`import { getLatestReleaseInfo } from "./utils/github.ts";`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { assertEquals, assertRejects } from "../deps.test.ts";`
	`1`	`+import { assertEquals, assertRejects } from "@std/assert";`
`2`	`2`	`import { LazyExpirableValue } from "./LazyExpirableValue.ts";`
`3`	`3`
`4`	`4`	`Deno.test("should work", async () => {`