Update deps

Remove obsolete auth widget Start using cross platform libs
jollytoad · Apr 3, 2024 · 9079e8f · 9079e8f · deno-deploy · Apr 3, 2024
1 parent 14e86d5
commit 9079e8f
Show file tree

Hide file tree

Showing 40 changed files with 258 additions and 386 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .store
 .env
+.env.*
 *.pem
diff --git a/cache/blog/dependency_hell b/cache/blog/dependency_hell
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1><div class="user-widget" hx-get="/auth/widget" hx-trigger="load" hx-swap="outerHTML"></div></header><main><h1>Dependency Hell or Heaven</h1>
+<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1></header><main><h1>Dependency Hell or Heaven</h1>
 <p>TLDR; Is Deno heading down the same dependency hell path as Node, due to the use
 of the <code>deps.ts</code> &amp; <code>mod.ts</code> conventions?</p>
 <h2>Introduction</h2>

diff --git a/cache/blog/http_fns b/cache/blog/http_fns
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1><div class="user-widget" hx-get="/auth/widget" hx-trigger="load" hx-swap="outerHTML"></div></header><main><h1>Useful functions for a HTTP server</h1>
+<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1></header><main><h1>Useful functions for a HTTP server</h1>
 <p>I&#39;ve always considered HTTP to be a function, Request in, Response out.</p>
 <p>I&#39;ve never really warmed to the way Node frameworks such as Express, Koa, and
 henceforth Oak deal with it via middleware routers.</p>

diff --git a/cache/blog/jsx_streaming b/cache/blog/jsx_streaming
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1><div class="user-widget" hx-get="/auth/widget" hx-trigger="load" hx-swap="outerHTML"></div></header><main><h1>JSX Streaming</h1>
+<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1></header><main><h1>JSX Streaming</h1>
 <p>TLDR; This is about using JSX as an async streaming template language in Deno,
 and has very little to do with React.</p>
 <h2>Introduction</h2>

diff --git a/cache/index.html b/cache/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1><div class="user-widget" hx-get="/auth/widget" hx-trigger="load" hx-swap="outerHTML"></div></header><main><h2>Demos and Experiments</h2>
+<html lang="en-GB"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><title>Jollytoad</title><link rel="stylesheet" href="https://unpkg.com/missing.css@1.1.1/dist/missing.min.css" integrity="sha384-se/UYQCQ0CMlLo1I5DcMmgR8t9hjCEpTpjPu7JWzT6M4wbxzI078hgX0pxTLyyMm" crossorigin="anonymous"/><link rel="stylesheet" href="/prism.css"/><link rel="stylesheet" href="/main.css"/><script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script><script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/sse.js" integrity="sha384-jlVlI/i5K5APUIz8cxowC1/FsCEZgsrg126wue89Np9N75pQdAzqkYYP+jsUi43W" crossorigin="anonymous"></script><script src="/app.js" type="module"></script></head><body><header><h1><a href="/">The home of Jollytoad</a></h1></header><main><h2>Demos and Experiments</h2>
 <ul>
 <li><a href="/quiz">Quiz</a></li>
 <li><a href="/async">Async component streaming demo</a></li>

diff --git a/components/Delayed.tsx b/components/Delayed.tsx
@@ -1,4 +1,4 @@
-import type { Children } from "$jsx/types";
+import type { Children } from "@http/jsx-stream/types";
 import { delay } from "@std/async/delay";
 
 export interface DelayedProps {

diff --git a/components/Markdown.tsx b/components/Markdown.tsx
@@ -4,9 +4,9 @@ import { gfmFromMarkdown } from "mdast-util-gfm";
 import { toHast } from "mdast-util-to-hast";
 import { type Options, toJsxRuntime } from "hast-util-to-jsx-runtime";
 import { raw } from "hast-util-raw";
-import { Fragment, jsx, jsxDEV, jsxs } from "$jsx/jsx-runtime";
+import { Fragment, jsx, jsxDEV, jsxs } from "@http/jsx-stream/jsx-runtime";
 import { fetchContent } from "../lib/content.ts";
-import type { Promisable } from "$jsx/types";
+import type { Promisable } from "@http/jsx-stream/types";
 
 interface Props {
   url?: string;

diff --git a/components/Page.tsx b/components/Page.tsx
@@ -1,6 +1,5 @@
-import type { Children } from "$jsx/types";
+import type { Children } from "@http/jsx-stream/types";
 import { Src } from "../components/Src.tsx";
-import { UserWidget } from "../components/UserWidget.tsx";
 import { getDeferredTimeout } from "../lib/deferred_timeout.ts";
 
 interface Props {
@@ -47,7 +46,6 @@ export function Page({ req, children, reqURL, module, ...props }: Props) {
           <h1>
             <a href="/">The home of Jollytoad</a>
           </h1>
-          <UserWidget req={req} lazy={deferredTimeout === false} />
         </header>
 
         <main>

diff --git a/components/Trickled.tsx b/components/Trickled.tsx
@@ -1,5 +1,5 @@
-import type { Children } from "$jsx/types";
-import { isAsyncIterable, isIterable } from "$jsx/guards";
+import type { Children } from "@http/jsx-stream/types";
+import { isAsyncIterable, isIterable } from "@http/jsx-stream/guards";
 import { delay } from "@std/async/delay";
 
 export interface TrickledProps {

diff --git a/components/UserWidget.tsx b/components/UserWidget.tsx
diff --git a/config_fragment.ts b/config_fragment.ts
@@ -1,4 +1,4 @@
-import type { RenderOptions } from "$jsx/types";
+import type { RenderOptions } from "@http/jsx-stream/types";
 
 export const FRAGMENT_RENDER_OPTIONS: RenderOptions = {
   deferredTimeout: false,

diff --git a/config_page.ts b/config_page.ts
@@ -1,4 +1,4 @@
-import type { RenderOptions } from "$jsx/types";
+import type { RenderOptions } from "@http/jsx-stream/types";
 import { materialDesignElements } from "./lib/tag_hooks/material_design.ts";
 import { shoelaceElements } from "./lib/tag_hooks/shoelace.ts";
 import { vaadinElements } from "./lib/tag_hooks/vaadin.ts";

diff --git a/deno.json b/deno.json
@@ -13,11 +13,12 @@
     "mkcert": "mkcert -install -key-file localhost-key.pem -cert-file localhost-cert.pem localhost",
     "deploy": "deno run --allow-sys --allow-net --allow-read --allow-write --allow-env jsr:@deno/deployctl deploy --import-map=import_map_deploy.json",
     "check": "deno fmt && deno lint && deno check **/*.ts",
-    "lock": "rm -f deno.lock && deno check **/*.ts"
+    "lock": "rm -f deno.lock && deno check **/*.ts",
+    "outdated": "deno run --allow-read=. --allow-net=jsr.io,registry.npmjs.org jsr:@check/deps"
   },
   "compilerOptions": {
     "jsx": "react-jsx",
-    "jsxImportSource": "$jsx",
+    "jsxImportSource": "@http/jsx-stream",
     "verbatimModuleSyntax": true
   },
   "exclude": [
@@ -32,26 +33,26 @@
     ]
   },
   "imports": {
+    "$jsx": "jsr:@http/jsx-stream@^0.1.1",
+    "$store": "https://deno.land/x/storage_modules@v0.1.0/deno_kv.ts",
+    "@cross/env": "jsr:@cross/env@^1.0.0",
+    "@http/fns": "jsr:@http/fns@^0.7.0",
+    "@http/jsx-stream": "jsr:@http/jsx-stream@^0.1.1",
     "@std/async": "jsr:@std/async@^0.219.1",
-    "@std/http": "jsr:@std/http@^0.219.1",
     "@std/collections": "jsr:@std/collections@^0.219.1",
-    "@std/path": "jsr:@std/path@^0.219.1",
     "@std/fs": "jsr:@std/fs@^0.219.1",
+    "@std/http": "jsr:@std/http@^0.219.1",
+    "@std/path": "jsr:@std/path@^0.219.1",
     "@std/ulid": "jsr:@std/ulid@^0.219.1",
-    "@http/fns": "jsr:@http/fns@^0.6.4",
-    "$jsx": "jsr:@http/jsx-stream@^0.1.1",
-    "$deno_kv_oauth/": "https://deno.land/x/deno_kv_oauth@v0.10.0/lib/",
-    "https://deno.land/x/oauth2_client@v1.0.2/mod.ts": "https://cdn.jsdelivr.net/gh/jollytoad/deno-oauth2-client@oidc-2/mod.ts",
-    "$store": "https://deno.land/x/storage_modules@v0.1.0/deno_kv.ts",
     "esbuild": "npm:esbuild@0.20",
-    "esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader@0.9",
-    "urlpattern-polyfill": "npm:urlpattern-polyfill@10.0.0",
+    "esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader@^0.10.3",
+    "hast-util-raw": "npm:hast-util-raw@9.0.2",
+    "hast-util-to-jsx-runtime": "npm:hast-util-to-jsx-runtime@2.3.0",
     "mdast-util-from-markdown": "npm:mdast-util-from-markdown@2.0.0",
-    "micromark-extension-gfm": "npm:micromark-extension-gfm@3.0.0",
     "mdast-util-gfm": "npm:mdast-util-gfm@3.0.0",
-    "mdast-util-to-hast": "npm:mdast-util-to-hast@13.0.2",
-    "hast-util-to-jsx-runtime": "npm:hast-util-to-jsx-runtime@2.2.0",
-    "hast-util-raw": "npm:hast-util-raw@9.0.1"
+    "mdast-util-to-hast": "npm:mdast-util-to-hast@13.1.0",
+    "micromark-extension-gfm": "npm:micromark-extension-gfm@3.0.0",
+    "urlpattern-polyfill": "npm:urlpattern-polyfill@10.0.0"
   },
   "deploy": {
     "project": "jollytoad",
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     .store
     .env
+    .env.*
     *.pem