reorg, update deps

.github/workflows/test-and-deploy.yml

@@ -50,4 +50,5 @@ jobs:
         uses: denoland/deployctl@v1
         with:
           project: kaleidoshare
-          entrypoint: server.ts
+          entrypoint: server/index.ts
+          import-map: server/deno.jsonc

.vscode/settings.json

@@ -2,5 +2,5 @@
   "deno.enable": true,
   "deno.unstable": true,
   "deno.enablePaths": ["server.ts", "server"],
-  "deno.config": "./deno.jsonc"
+  "deno.config": "./server/deno.jsonc"
 }

package.json

@@ -31,11 +31,11 @@
   "scripts": {
     "dev": "run-p dev:*",
     "dev:frontend": "vite",
-    "dev:backend": "deno run -A --watch --unstable ./server.ts",
+    "dev:backend": "deno run -A --watch --unstable --config server/deno.jsonc server/index.ts",
     "build": "run-s build:*",
     "build:schema": "ts-json-schema-generator --path 'schema/schema.ts' --out schema/schema.json",
     "build:frontend": "vite build",
-    "preview": "deno run -A --unstable ./server.ts",
+    "preview": "deno run -A --unstable --config server/deno.jsonc server/index.ts",
     "test": "run-s test:*",
     "test:backend": "node --loader tsx --test ./test/backend/*.test.mts",
     "test:frontend": "playwright test"

server/api.ts

@@ -24,7 +24,8 @@ import {
   updateContent,
 } from "./content.ts";
 
-import Ajv, { ValidateFunction } from "ajv";
+import AjvImport, { ValidateFunction } from "ajv";
+const Ajv = AjvImport as unknown as typeof AjvImport.default;
 import schema from "../schema/schema.json" assert { type: "json" };
 import { Settings, Output, Image } from "../schema/schema.ts";
 import { makeContentPageForTwitterBot } from "./twitter.tsx";

server/deno.jsonc

@@ -0,0 +1,22 @@
+{
+  "imports": {
+    "simplewebauthn/server": "npm:@simplewebauthn/server@^7.3.0",
+    "simplewebauthn/server/helpers": "npm:@simplewebauthn/server@^7.3.0/helpers",
+    "simplewebauthn/typescript-types": "npm:@simplewebauthn/[email protected]",
+    "std/encoding/base64url": "https://deno.land/[email protected]/encoding/base64url.ts",
+    "std/_util/asserts": "https://deno.land/[email protected]/_util/asserts.ts",
+    "ulid": "npm:[email protected]",
+    "ajv": "npm:[email protected]",
+    "oak": "https://deno.land/x/[email protected]/mod.ts",
+    "oak_sessions": "https://deno.land/x/[email protected]/mod.ts",
+    "react": "npm:[email protected]",
+    "react-dom/server": "npm:[email protected]/server"
+  },
+  "scopes": {},
+  "compilerOptions": {
+    "jsx": "react",
+    "jsxFactory": "React.createElement",
+    "jsxFragmentFactory": "React.Fragment"
+  },
+  "nodeModulesDir": false
+}

server.ts → server/index.ts

@@ -1,8 +1,8 @@
 import { Application } from "oak";
 import { CookieStore, Session } from "oak_sessions";
-import { randomHex } from "./server/util.ts";
-import { openKv } from "./server/kv.ts";
-import { createRouters, handleError } from "./server/api.ts";
+import { randomHex } from "./util.ts";
+import { openKv } from "./kv.ts";
+import { createRouters, handleError } from "./api.ts";
 
 const apiServerPort: number = parseInt(Deno.env.get("PORT") ?? "8000");
 

test/backend/bot.test.mts

@@ -12,15 +12,26 @@ test("bot", async (t) => {
   let p: childProcess.ChildProcess;
   before(async () => {
     fs.mkdirSync("tmp", { recursive: true });
-    p = childProcess.spawn("deno", ["run", "-A", "--unstable", "server.ts"], {
-      env: {
-        ...process.env,
-        CHALLENGE: "test",
-        PORT: String(port),
-        KV_PATH: kvPath,
-      },
-      stdio: "inherit",
-    });
+    p = childProcess.spawn(
+      "deno",
+      [
+        "run",
+        "-A",
+        "--unstable",
+        "--config",
+        "server/deno.jsonc",
+        "server/index.ts",
+      ],
+      {
+        env: {
+          ...process.env,
+          CHALLENGE: "test",
+          PORT: String(port),
+          KV_PATH: kvPath,
+        },
+        stdio: "inherit",
+      }
+    );
     await waitForServer(origin);
   });
   after(() => {

test/backend/content.test.mts

@@ -17,15 +17,26 @@ test("content", async (t) => {
   let p: childProcess.ChildProcess;
   before(async () => {
     fs.mkdirSync("tmp", { recursive: true });
-    p = childProcess.spawn("deno", ["run", "-A", "--unstable", "server.ts"], {
-      env: {
-        ...process.env,
-        CHALLENGE: "test",
-        PORT: String(port),
-        KV_PATH: kvPath,
-      },
-      stdio: "inherit",
-    });
+    p = childProcess.spawn(
+      "deno",
+      [
+        "run",
+        "-A",
+        "--unstable",
+        "--config",
+        "server/deno.jsonc",
+        "server/index.ts",
+      ],
+      {
+        env: {
+          ...process.env,
+          CHALLENGE: "test",
+          PORT: String(port),
+          KV_PATH: kvPath,
+        },
+        stdio: "inherit",
+      }
+    );
     await waitForServer(origin);
   });
   after(() => {

test/backend/session.test.mts

@@ -19,15 +19,26 @@ test("session", async (t) => {
   let p: childProcess.ChildProcess;
   before(async () => {
     fs.mkdirSync("tmp", { recursive: true });
-    p = childProcess.spawn("deno", ["run", "-A", "--unstable", "server.ts"], {
-      env: {
-        ...process.env,
-        CHALLENGE: "test",
-        PORT: String(port),
-        KV_PATH: kvPath,
-      },
-      stdio: "inherit",
-    });
+    p = childProcess.spawn(
+      "deno",
+      [
+        "run",
+        "-A",
+        "--unstable",
+        "--config",
+        "server/deno.jsonc",
+        "server/index.ts",
+      ],
+      {
+        env: {
+          ...process.env,
+          CHALLENGE: "test",
+          PORT: String(port),
+          KV_PATH: kvPath,
+        },
+        stdio: "inherit",
+      }
+    );
     await waitForServer(origin);
   });
   after(() => {