From 230bb2ab8bb3b101e17b0de53851fa1c58f0535e Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Thu, 25 Jul 2024 20:58:03 +0200 Subject: [PATCH] Dependency upgrades --- Dockerfile | 4 +++- build_web.ts | 2 +- cmd/server.ts | 4 ++-- deno.jsonc | 2 +- import_map.json | 34 +++++++++++++++++----------------- server/hooks/endpoint.ts | 3 ++- silverbullet.ts | 7 ++----- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index da6b1737..38b87791 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM denoland/deno:debian-1.45.2 +FROM denoland/deno:debian-1.45.3 + # The volume that will keep the space data # Either create a volume: @@ -7,6 +8,7 @@ FROM denoland/deno:debian-1.45.2 # docker run -v myspace:/space -p3000:3000 -it zefhemel/silverbullet # Or simply mount an existing folder into the container: # docker run -v /path/to/my/folder:/space -p3000:3000 -it zefhemel/silverbullet + VOLUME /space # Accept TARGETARCH as argument diff --git a/build_web.ts b/build_web.ts index 2597db78..1db5189b 100644 --- a/build_web.ts +++ b/build_web.ts @@ -103,7 +103,7 @@ async function buildCopyBundleAssets() { // metafile: true, jsx: "automatic", jsxFragment: "Fragment", - jsxImportSource: "https://esm.sh/preact@10.11.1", + jsxImportSource: "https://esm.sh/preact@10.23.1", plugins: denoPlugins({ importMapURL: new URL("./import_map.json", import.meta.url) .toString(), diff --git a/cmd/server.ts b/cmd/server.ts index faf191a5..420bdc5d 100644 --- a/cmd/server.ts +++ b/cmd/server.ts @@ -1,8 +1,8 @@ import { HttpServer } from "../server/http_server.ts"; -import clientAssetBundle from "../dist/client_asset_bundle.json" assert { +import clientAssetBundle from "../dist/client_asset_bundle.json" with { type: "json", }; -import plugAssetBundle from "../dist/plug_asset_bundle.json" assert { +import plugAssetBundle from "../dist/plug_asset_bundle.json" with { type: "json", }; import { AssetBundle, AssetJson } from "../lib/asset_bundle/bundle.ts"; diff --git a/deno.jsonc b/deno.jsonc index b1294cd2..af3c080c 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -29,7 +29,7 @@ "compilerOptions": { "lib": ["dom", "dom.iterable", "dom.asynciterable", "deno.ns"], "jsx": "react-jsx", - "jsxImportSource": "https://esm.sh/preact@10.11.1" + "jsxImportSource": "https://esm.sh/preact@10.23.1" }, "importMap": "import_map.json", "lint": { diff --git a/import_map.json b/import_map.json index 5d2005d7..ac0e3716 100644 --- a/import_map.json +++ b/import_map.json @@ -1,19 +1,19 @@ { "imports": { "@lezer/common": "https://esm.sh/@lezer/common@1.2.1&target=es2022", - "@lezer/lr": "https://esm.sh/@lezer/lr@1.4.0?external=@lezer/common&target=es2022", + "@lezer/lr": "https://esm.sh/@lezer/lr@1.4.1?external=@lezer/common&target=es2022", "@lezer/markdown": "https://esm.sh/@lezer/markdown@1.3.0?external=@lezer/common,@codemirror/language,@lezer/highlight,@lezer/lr&target=es2022", - "@lezer/javascript": "https://esm.sh/@lezer/javascript@1.4.14?external=@lezer/common,@codemirror/language,@lezer/highlight,@lezer/lr&target=es2022", + "@lezer/javascript": "https://esm.sh/@lezer/javascript@1.4.17?external=@lezer/common,@codemirror/language,@lezer/highlight,@lezer/lr&target=es2022", "@lezer/highlight": "https://esm.sh/@lezer/highlight@1.2.0?external=@lezer/common,@lezer/lr&target=es2022", - "@lezer/html": "https://esm.sh/@lezer/html@1.3.9?external=@lezer/common,@lezer/lr,@lezer/highlight&target=es2022", + "@lezer/html": "https://esm.sh/@lezer/html@1.3.10?external=@lezer/common,@lezer/lr,@lezer/highlight&target=es2022", "@lezer/css": "https://esm.sh/@lezer/css@1.1.8?external=@lezer/lr,@lezer/highlight", "@codemirror/state": "https://esm.sh/@codemirror/state@6.4.1&target=es2022", - "@codemirror/language": "https://esm.sh/@codemirror/language@6.10.1?external=@codemirror/state,@lezer/common,@lezer/lr,@codemirror/view,@lezer/highlight,style-mod&target=es2022", - "@codemirror/commands": "https://esm.sh/@codemirror/commands@6.5.0?external=@codemirror/state,@codemirror/view,@codemirror/language,@lezer/common&target=es2022", - "@codemirror/view": "https://esm.sh/@codemirror/view@6.26.3?external=@codemirror/state,@lezer/common,style-mod&target=es2022", - "@codemirror/autocomplete": "https://esm.sh/@codemirror/autocomplete@6.16.0?external=@codemirror/state,@codemirror/commands,@lezer/common,@codemirror/view,@codemirror/language&target=es2022", - "@codemirror/lint": "https://esm.sh/@codemirror/lint@6.5.0?external=@codemirror/state,@codemirror/view,@lezer/common,crelt&target=es2022", + "@codemirror/language": "https://esm.sh/@codemirror/language@6.10.2?external=@codemirror/state,@lezer/common,@lezer/lr,@codemirror/view,@lezer/highlight,style-mod&target=es2022", + "@codemirror/commands": "https://esm.sh/@codemirror/commands@6.6.0?external=@codemirror/state,@codemirror/view,@codemirror/language,@lezer/common&target=es2022", + "@codemirror/view": "https://esm.sh/@codemirror/view@6.29.0?external=@codemirror/state,@lezer/common,style-mod&target=es2022", + "@codemirror/autocomplete": "https://esm.sh/@codemirror/autocomplete@6.17.0?external=@codemirror/state,@codemirror/commands,@lezer/common,@codemirror/view,@codemirror/language&target=es2022", + "@codemirror/lint": "https://esm.sh/@codemirror/lint@6.8.1?external=@codemirror/state,@codemirror/view,@lezer/common,crelt&target=es2022", "@codemirror/lang-css": "https://esm.sh/@codemirror/lang-css@6.2.1?external=@codemirror/language,@codemirror/autocomplete,@codemirror/state,@lezer/common,@lezer/css&target=es2022", "@codemirror/lang-html": "https://esm.sh/@codemirror/lang-html@6.4.9?external=@codemirror/language,@codemirror/autocomplete,@codemirror/lang-css,@codemirror/state,@lezer/lr,@lezer/html,@codemirror/lang-javascript,@codemirror/view&target=es2022", "@codemirror/search": "https://esm.sh/@codemirror/search@6.5.6?external=@codemirror/state,@codemirror/view,crelt&target=es2022", @@ -25,11 +25,11 @@ "crelt": "https://esm.sh/crelt@1.0.6", "@js-temporal/polyfill": "https://esm.sh/@js-temporal/polyfill@0.4.4", - "cliffy/": "https://deno.land/x/cliffy@v1.0.0-rc.3/", - "denosass": "https://deno.land/x/denosass@1.0.4/mod.ts", - "djwt": "https://deno.land/x/djwt@v3.0.1/mod.ts", + "cliffy/": "https://deno.land/x/cliffy@v1.0.0-rc.4/", + "denosass": "https://deno.land/x/denosass@1.0.6/mod.ts", + "djwt": "https://deno.land/x/djwt@v3.0.2/mod.ts", "esbuild": "https://deno.land/x/esbuild@v0.20.0/mod.js", - "esbuild_deno_loader": "https://deno.land/x/esbuild_deno_loader@0.8.5/mod.ts", + "esbuild_deno_loader": "https://deno.land/x/esbuild_deno_loader@0.9.0/mod.ts", "fake-indexeddb/": "https://esm.sh/fake-indexeddb@4.0.2/", "fast-diff": "https://esm.sh/fast-diff@1.3.0", "fuse": "https://deno.land/x/fuse@v6.4.1/dist/fuse.esm.min.js", @@ -44,17 +44,17 @@ "react-icons/md/": "https://deno.land/x/react_icons_md@1.0.9/ico/", "react-icons/types": "https://deno.land/x/react_icons@1.0.9/mod.ts", "s3_lite_client/": "https://deno.land/x/s3_lite_client@0.4.0/", - "turndown": "https://cdn.skypack.dev/turndown@7.1.1", - "turndown-plugin-gfm": "https://cdn.skypack.dev/@joplin/turndown-plugin-gfm@1.0.45", + "turndown": "https://cdn.skypack.dev/turndown@7.2.0", + "turndown-plugin-gfm": "https://cdn.skypack.dev/@joplin/turndown-plugin-gfm@1.0.56", "$common/": "./common/", "$lib/": "./lib/", "$type/": "./type/", - "preact": "https://esm.sh/preact@10.11.1", - "preact/": "https://esm.sh/preact@10.11.1/", + "preact": "https://esm.sh/preact@10.23.1", + "preact/": "https://esm.sh/preact@10.23.1/", "$sb/": "./plug-api/", - "zod": "https://deno.land/x/zod@v3.22.4/mod.ts", + "zod": "https://deno.land/x/zod@v3.23.8/mod.ts", "$std/": "https://deno.land/std@0.189.0/" } } diff --git a/server/hooks/endpoint.ts b/server/hooks/endpoint.ts index 359d3c98..045ab08e 100644 --- a/server/hooks/endpoint.ts +++ b/server/hooks/endpoint.ts @@ -2,6 +2,7 @@ import { Hook, Manifest } from "../../lib/plugos/types.ts"; import { System } from "../../lib/plugos/system.ts"; import type { Context, Next } from "hono/mod.ts"; import { EndpointHookT } from "$lib/manifest.ts"; +import { StatusCode } from "hono/utils/http-status.ts"; export type EndpointRequest = { method: string; @@ -12,7 +13,7 @@ export type EndpointRequest = { }; export type EndpointResponse = { - status: number; + status: StatusCode; headers?: { [key: string]: string }; body: any; }; diff --git a/silverbullet.ts b/silverbullet.ts index 73b710c1..c43ca7e3 100755 --- a/silverbullet.ts +++ b/silverbullet.ts @@ -18,7 +18,7 @@ globalThis.addEventListener("unhandledrejection", (event) => { await new Command() .name("silverbullet") - .description("Markdown as a platform") + .description("Note taking for knowledge hackers") .version(version) .help({ colors: false, @@ -47,10 +47,6 @@ await new Command() "--sync-only", "Run the server as a pure space (file) store only without any backend processing (this disables 'online mode' in the client)", ) - .option( - "--client-encryption", - "Enable client-side encryption for spaces", - ) .option( "--reindex", "Reindex space on startup", @@ -106,4 +102,5 @@ await new Command() .command("version", "Get current version") .action(versionCommand) .parse(Deno.args); + Deno.exit(0);