Merge branch 'main' into unstable-kv

Author: kt3k

.github/workflows/ci.yml

@@ -31,11 +31,8 @@ jobs:
       - name: Check formatting, linting, license headers, types and run tests
         run: deno task ok
 
-      - name: Create lcov file
-        run: deno task cov:gen
-
       - name: Upload coverage
         uses: codecov/codecov-action@v5
         with:
           name: ${{ matrix.os }}
-          files: cov.lcov
+          files: coverage/lcov.info

deno.json

@@ -12,7 +12,6 @@
     "check:license": "deno run --allow-read --allow-write tasks/check_license.ts",
     "check:types": "deno check main.ts && deno check dev.ts && deno check tasks/*.ts",
     "ok": "deno fmt --check && deno lint && deno task check:license --check && deno task check:types && deno task test",
-    "cov:gen": "deno coverage coverage --lcov --exclude='.tsx' --output=cov.lcov",
     "update": "deno run -A -r https://fresh.deno.dev/update .",
     "build": "deno run -A dev.ts build",
     "preview": "deno run -A main.ts"
@@ -21,6 +20,14 @@
   "imports": {
     "@/": "./",
     "$fresh/": "https://raw.githubusercontent.com/denoland/fresh/60220dd33b5b0f6b5c72927c933dbc32a3c4734e/",
+    "@std/assert": "jsr:@std/assert@^1.0.13",
+    "@std/datetime": "jsr:@std/datetime@^0.225.5",
+    "@std/front-matter": "jsr:@std/front-matter@^1.0.9",
+    "@std/fs": "jsr:@std/fs@^1.0.18",
+    "@std/http": "jsr:@std/http@^1.0.18",
+    "@std/path": "jsr:@std/path@^1.1.0",
+    "@std/testing": "jsr:@std/testing@^1.0.14",
+    "@std/ulid": "jsr:@std/ulid@^1.0.0",
     "preact": "https://esm.sh/preact@10.19.2",
     "preact/": "https://esm.sh/preact@10.19.2/",
     "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.2.2",
@@ -29,14 +36,12 @@
     "tailwindcss": "npm:tailwindcss@3.4.1",
     "tailwindcss/": "npm:/tailwindcss@3.4.1/",
     "tailwindcss/plugin": "npm:/tailwindcss@3.4.1/plugin.js",
-    "$std/": "https://deno.land/std@0.208.0/",
     "stripe": "npm:/stripe@13.5.0",
     "kv_oauth/": "https://deno.land/x/deno_kv_oauth@v0.9.1/",
     "tabler_icons_tsx/": "https://deno.land/x/tabler_icons_tsx@0.0.4/tsx/",
     "fresh_charts/": "https://deno.land/x/fresh_charts@0.3.1/"
   },
-  "exclude": ["coverage/", "_fresh/", "**/_fresh/*"],
-  "lint": { "rules": { "tags": ["fresh", "recommended"] } },
+  "lint": { "rules": { "tags": ["fresh", "recommended", "jsx", "react"] } },
   "unstable": [
     "kv"
   ]

e2e_test.ts

@@ -23,9 +23,9 @@ import {
   assertNotEquals,
   assertObjectMatch,
   assertStringIncludes,
-} from "$std/assert/mod.ts";
-import { isRedirectStatus, STATUS_CODE } from "$std/http/status.ts";
-import { resolvesNext, returnsNext, stub } from "$std/testing/mock.ts";
+} from "@std/assert";
+import { isRedirectStatus, STATUS_CODE } from "@std/http/status";
+import { resolvesNext, returnsNext, stub } from "@std/testing/mock";
 import Stripe from "stripe";
 import options from "./fresh.config.ts";
 import { _internals } from "./plugins/kv_oauth.ts";

islands/ItemsList.tsx

@@ -4,7 +4,7 @@ import { useEffect } from "preact/hooks";
 import { type Item } from "@/utils/db.ts";
 import IconInfo from "tabler_icons_tsx/info-circle.tsx";
 import { fetchValues } from "@/utils/http.ts";
-import { decodeTime } from "$std/ulid/mod.ts";
+import { decodeTime } from "@std/ulid/decode-time";
 import { timeAgo } from "@/utils/display.ts";
 import GitHubAvatarImg from "@/components/GitHubAvatarImg.tsx";
 

plugins/blog/mod.ts

@@ -3,7 +3,7 @@ import type { Plugin } from "$fresh/server.ts";
 import BlogIndex from "./routes/blog/index.tsx";
 import BlogSlug from "./routes/blog/[slug].tsx";
 import Feed from "./routes/feed.ts";
-import { normalize } from "$std/url/normalize.ts";
+import { normalize } from "@std/path/normalize";
 
 export function blog(): Plugin {
   return {
@@ -19,6 +19,6 @@ export function blog(): Plugin {
       component: Feed,
     }],
     location: import.meta.url,
-    projectLocation: normalize(import.meta.url + "../../../").href,
+    projectLocation: normalize(import.meta.url + "../../../"),
   };
 }

plugins/blog/utils/posts.ts

@@ -1,6 +1,6 @@
 // Copyright 2023-2025 the Deno authors. All rights reserved. MIT license.
-import { extract } from "$std/front_matter/yaml.ts";
-import { join } from "$std/path/join.ts";
+import { extract } from "@std/front-matter/yaml";
+import { join } from "@std/path/join";
 
 /**
  * This code is based on the

plugins/blog/utils/posts_test.ts

@@ -1,7 +1,7 @@
 // Copyright 2023-2025 the Deno authors. All rights reserved. MIT license.
 import { getPost, getPosts } from "./posts.ts";
 
-import { assert, assertEquals } from "$std/assert/mod.ts";
+import { assert, assertEquals } from "@std/assert";
 
 Deno.test("[blog] getPost()", async () => {
   const post = await getPost("first-post");

plugins/error_handling.ts

@@ -2,7 +2,7 @@
 import type { Plugin } from "$fresh/server.ts";
 import type { State } from "@/plugins/session.ts";
 import { BadRequestError, redirect, UnauthorizedError } from "@/utils/http.ts";
-import { STATUS_CODE, STATUS_TEXT } from "$std/http/status.ts";
+import { STATUS_CODE, STATUS_TEXT } from "@std/http/status";
 
 /**
  * Returns the HTTP status code corresponding to a given runtime error. By

routes/api/stripe-webhooks.ts

@@ -1,6 +1,6 @@
 // Copyright 2023-2025 the Deno authors. All rights reserved. MIT license.
 import { type Handlers } from "$fresh/server.ts";
-import { STATUS_CODE } from "$std/http/status.ts";
+import { STATUS_CODE } from "@std/http/status";
 import { isStripeEnabled, stripe } from "@/utils/stripe.ts";
 import Stripe from "stripe";
 import { getUserByStripeCustomer, updateUser } from "@/utils/db.ts";

routes/api/vote.ts

@@ -1,6 +1,6 @@
 // Copyright 2023-2025 the Deno authors. All rights reserved. MIT license.
 import { type Handlers } from "$fresh/server.ts";
-import { STATUS_CODE } from "$std/http/status.ts";
+import { STATUS_CODE } from "@std/http/status";
 import type { SignedInState } from "@/plugins/session.ts";
 import { createVote } from "@/utils/db.ts";
 import { BadRequestError } from "@/utils/http.ts";