Merge pull request #35 from PHS-TSA/fresh-1-6-8

Fresh 1.6.8

deno.json

@@ -10,7 +10,7 @@
     "test:coverage:genhtml": "genhtml -o cov/html cov/cov.lcov",
     "manifest": "deno task cli manifest $(pwd)",
     "start": "deno run --env -A --watch src/dev.ts",
-    "build": "deno task compile:mdx && deno run -A src/dev.ts build",
+    "build": "deno task compile:mdx && deno run --env -A src/dev.ts build",
     "preview": "deno run --env -A src/main.ts",
     "update": "deno run -A -r https://fresh.deno.dev/update .",
     "esm": "deno run -A https://esm.sh/v135",
@@ -23,42 +23,43 @@
     "compile:mdx": "deno run -A tool/compile-mdx.ts"
   },
   "imports": {
-    "$std/": "https://deno.land/std@0.216.0/",
-    "$fresh/": "https://deno.land/x/fresh@1.6.5/",
-    "$gfm": "https://deno.land/x/gfm@0.6.0/mod.ts",
-    "openai": "https://deno.land/x/openai@v4.29.2/mod.ts",
-    "openai/": "https://deno.land/x/openai@v4.29.2/",
+    "$fresh/": "https://deno.land/x/fresh@1.6.8/",
     "$tabler_icons/": "https://deno.land/x/tabler_icons_tsx@0.0.6/tsx/",
-    "zod": "https://deno.land/x/zod@v3.22.4/mod.ts",
+    "@deno/gfm": "jsr:@deno/gfm@^0.8.0",
     "@headlessui/react": "https://esm.sh/v135/*@headlessui/react@1.7.17",
-    "@preact/signals-core": "https://esm.sh/v135/@preact/signals-core@1.5.1",
-    "@preact/signals": "https://esm.sh/v135/*@preact/signals@1.2.2",
-    "preact": "https://esm.sh/v135/preact@10.19.6",
-    "preact/": "https://esm.sh/v135/preact@10.19.6/",
     "@headlessui/tailwindcss": "npm:@headlessui/tailwindcss@0.2.0",
     "@mdx-js/mdx": "npm:@mdx-js/mdx@3.0.1",
+    "@preact/signals": "https://esm.sh/v135/*@preact/signals@1.2.2",
+    "@preact/signals-core": "https://esm.sh/v135/*@preact/signals-core@1.5.1",
+    "@std/assert": "jsr:@std/assert@^0.220.1",
+    "@std/path": "jsr:@std/path@^0.220.1",
     "@tailwindcss/forms": "npm:@tailwindcss/forms@0.5.7",
     "@tailwindcss/typography": "npm:@tailwindcss/typography@0.5.10",
     "idb-keyval": "npm:idb-keyval@6.2.1",
+    "openai": "https://deno.land/x/openai@v4.29.2/mod.ts",
+    "openai/": "https://deno.land/x/openai@v4.29.2/",
+    "preact": "https://esm.sh/v135/preact@10.19.6",
+    "preact/": "https://esm.sh/v135/preact@10.19.6/",
     "rehype-mathjax": "npm:rehype-mathjax@6.0.0",
     "remark-frontmatter": "npm:remark-frontmatter@5.0.0",
     "remark-lint-checkbox-content-indent": "npm:remark-lint-checkbox-content-indent@4.1.1",
-    "remark-lint-no-tabs": "npm:remark-lint-no-tabs@3.1.1",
     "remark-lint-definition-spacing": "npm:remark-lint-definition-spacing@3.1.1",
     "remark-lint-heading-increment": "npm:remark-lint-heading-increment@3.1.1",
     "remark-lint-linebreak-style": "npm:remark-lint-linebreak-style@3.1.1",
-    "remark-lint-no-missing-blank-lines": "npm:remark-lint-no-missing-blank-lines@3.1.1",
     "remark-lint-no-consecutive-blank-lines": "npm:remark-lint-no-consecutive-blank-lines@4.1.2",
+    "remark-lint-no-missing-blank-lines": "npm:remark-lint-no-missing-blank-lines@3.1.1",
+    "remark-lint-no-tabs": "npm:remark-lint-no-tabs@3.1.1",
     "remark-math": "npm:remark-math@6.0.0",
     "remark-mdx-frontmatter": "npm:remark-mdx-frontmatter@4.0.0",
     "remark-preset-lint-consistent": "npm:remark-preset-lint-consistent@5.1.2",
     "remark-preset-lint-recommended": "npm:remark-preset-lint-recommended@6.1.3",
     "tailwindcss": "npm:tailwindcss@3.4.1",
     "tailwindcss/plugin": "npm:tailwindcss@3.4.1/plugin.js",
     "unified": "npm:unified@11.0.4",
+    "vfile": "npm:vfile@6.0.1",
     "vfile-matter": "npm:vfile-matter@5.0.0",
     "vfile-reporter": "npm:vfile-reporter@8.1.0",
-    "vfile": "npm:vfile@6.0.1"
+    "zod": "https://deno.land/x/zod@v3.22.4/mod.ts"
   },
   "scopes": {
     "https://esm.sh/v135/": {

src/dev.ts

@@ -3,6 +3,4 @@
 import dev from "$fresh/dev.ts";
 import config from "./fresh.config.ts";
 
-import "$std/dotenv/load.ts";
-
 await dev(import.meta.url, "./main.ts", config);

src/islands/Chatbot.tsx

@@ -1,4 +1,4 @@
-import { render } from "$gfm";
+import { render } from "@deno/gfm";
 import { Transition } from "@headlessui/react";
 import { useSignal, useSignalEffect } from "@preact/signals";
 import { set } from "idb-keyval";

src/main.ts

@@ -4,8 +4,6 @@
 /// <reference lib="dom.asynciterable" />
 /// <reference lib="deno.ns" />
 
-import "$std/dotenv/load.ts";
-
 import { start } from "$fresh/server.ts";
 import config from "./fresh.config.ts";
 import manifest from "./fresh.gen.ts";

src/routes/about.test.ts

@@ -1,5 +1,5 @@
 import { type ServeHandlerInfo, createHandler } from "$fresh/server.ts";
-import { assertStringIncludes } from "$std/assert/mod.ts";
+import { assertStringIncludes } from "@std/assert";
 import config from "../fresh.config.ts";
 import manifest from "../fresh.gen.ts";
 

src/routes/solutions/[category]/[[slug]].tsx

@@ -1,6 +1,6 @@
 import { Head } from "$fresh/runtime.ts";
 import type { Handlers, PageProps, RouteConfig } from "$fresh/server.ts";
-import { join } from "$std/path/mod.ts";
+import { join } from "@std/path";
 import type { JSX } from "preact";
 import { Content } from "../../../components/Content.tsx";
 import { Cover } from "../../../components/Cover.tsx";

src/utils/solutions.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, assertThrows } from "$std/assert/mod.ts";
+import { assertEquals, assertThrows } from "@std/assert";
 import { ZodError } from "zod";
 import { solutionPagesSchema } from "./solutions.ts";
 

src/utils/tailwind.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "$std/assert/mod.ts";
+import { assertEquals } from "@std/assert";
 import { tw } from "./tailwind.ts";
 
 /**

tool/compile-mdx.ts

@@ -1,11 +1,5 @@
-import {
-  dirname,
-  fromFileUrl,
-  join,
-  relative,
-  resolve,
-} from "$std/path/mod.ts";
 import { type CompileOptions, compile } from "@mdx-js/mdx";
+import { dirname, fromFileUrl, join, relative, resolve } from "@std/path";
 import rehypeMathjax from "rehype-mathjax";
 import remarkFrontmatter from "remark-frontmatter";
 import remarkLintCheckboxContentIndent from "remark-lint-checkbox-content-indent";