diff --git a/build_bundle.ts b/build_bundle.ts index 87613efa..21caf3e8 100644 --- a/build_bundle.ts +++ b/build_bundle.ts @@ -1,4 +1,4 @@ -import { denoPlugins } from "esbuild_deno_loader"; +import { denoPlugins } from "@luca/esbuild-deno-loader"; import * as esbuild from "esbuild"; await Deno.mkdir("dist", { recursive: true }); diff --git a/build_web.ts b/build_web.ts index be12ffbe..c07812a0 100644 --- a/build_web.ts +++ b/build_web.ts @@ -5,7 +5,7 @@ import { bundleFolder } from "./lib/asset_bundle/builder.ts"; import { parse } from "$std/flags/mod.ts"; import { patchDenoLibJS } from "./cmd/compile.ts"; -import { denoPlugins } from "esbuild_deno_loader"; +import { denoPlugins } from "@luca/esbuild-deno-loader"; import * as esbuild from "esbuild"; export async function bundleAll( diff --git a/cmd/compile.ts b/cmd/compile.ts index a72a63b2..3459c182 100644 --- a/cmd/compile.ts +++ b/cmd/compile.ts @@ -1,5 +1,5 @@ import { path, YAML } from "../lib/deps_server.ts"; -import { denoPlugins } from "esbuild_deno_loader"; +import { denoPlugins } from "@luca/esbuild-deno-loader"; import * as esbuild from "esbuild"; import { bundleAssets } from "../lib/asset_bundle/builder.ts"; import { Manifest } from "../lib/plugos/types.ts"; diff --git a/deno.json b/deno.json index 4a0ae7a7..0e7bfbba 100644 --- a/deno.json +++ b/deno.json @@ -2,10 +2,13 @@ "tasks": { "clean": "rm -rf dist dist_client_bundle dist_plug_bundle website_build", "deep-clean-mac": "rm -f deno.lock && rm -rf $HOME/Library/Caches/deno && deno task clean", + "install": "deno install -g -f --unstable-kv --unstable-worker-options -A --import-map deno.json silverbullet.ts", + "check": "find . -name '*.ts*' | xargs deno check", "test": "deno test -A --unstable-kv --unstable-worker-options", "bench": "deno bench", + "build": "deno run -A build_plugs.ts && deno run -A build_web.ts", "plugs": "deno run -A build_plugs.ts", "server": "deno run -A --unstable-kv --unstable-worker-options --check silverbullet.ts", @@ -24,12 +27,6 @@ "server:dist:darwin-aarch64": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options --target aarch64-apple-darwin -o silverbullet dist/silverbullet.js && zip silverbullet-server-darwin-aarch64.zip silverbullet", "server:dist:windows-x86_64": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options --target x86_64-pc-windows-msvc -o silverbullet.exe dist/silverbullet.js && zip silverbullet-server-windows-x86_64.zip silverbullet.exe" }, - - "compilerOptions": { - "lib": ["dom", "dom.iterable", "dom.asynciterable", "deno.ns"], - "jsx": "react-jsx", - "jsxImportSource": "https://esm.sh/preact@10.23.1" - }, "lint": { "exclude": [ "dist", @@ -49,38 +46,44 @@ "README.md" ] }, - + "compilerOptions": { + "lib": ["dom", "dom.iterable", "dom.asynciterable", "deno.ns"], + "jsx": "react-jsx", + "jsxImportSource": "https://esm.sh/preact@10.23.1" + }, "imports": { - "@lezer/common": "https://esm.sh/@lezer/common@1.2.1&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.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.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.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.27.0?external=@codemirror/state,@lezer/common,style-mod&target=es2022", + "$common/": "./common/", + "$lib/": "./lib/", + "$sb/": "./plug-api/", + "$std/": "https://deno.land/std@0.189.0/", + "$type/": "./type/", "@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/commands": "https://esm.sh/@codemirror/commands@6.6.0?external=@codemirror/state,@codemirror/view,@codemirror/language,@lezer/common&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", - "@codemirror/lang-markdown": "https://esm.sh/@codemirror/lang-markdown@6.2.5?external=@codemirror/state,@lezer/common,@codemirror/language,@lezer/markdown,@codemirror/view,@lezer/highlight,@codemirror/lang-html,@codemirror/autocomplete&target=es2022", - "@codemirror/legacy-modes/": "https://esm.sh/@codemirror/legacy-modes@6.4.0/", "@codemirror/lang-javascript": "https://esm.sh/@codemirror/lang-javascript@6.2.2?external=@codemirror/language,@codemirror/autocomplete,@codemirror/view,@codemirror/state,@codemirror/lint,@lezer/common,@lezer/lr,@lezer/javascript,@codemirror/commands&target=es2022", - "@replit/codemirror-vim": "https://esm.sh/@replit/codemirror-vim@6.2.1?external=@codemirror/state,@codemirror/language,@codemirror/view,@codemirror/search,@codemirror/commands", - "style-mod": "https://esm.sh/style-mod@4.1.2", - "crelt": "https://esm.sh/crelt@1.0.6", - + "@codemirror/lang-markdown": "https://esm.sh/@codemirror/lang-markdown@6.2.5?external=@codemirror/state,@lezer/common,@codemirror/language,@lezer/markdown,@codemirror/view,@lezer/highlight,@codemirror/lang-html,@codemirror/autocomplete&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/legacy-modes/": "https://esm.sh/@codemirror/legacy-modes@6.4.0/", + "@codemirror/lint": "https://esm.sh/@codemirror/lint@6.8.1?external=@codemirror/state,@codemirror/view,@lezer/common,crelt&target=es2022", + "@codemirror/search": "https://esm.sh/@codemirror/search@6.5.6?external=@codemirror/state,@codemirror/view,crelt&target=es2022", + "@codemirror/state": "https://esm.sh/@codemirror/state@6.4.1&target=es2022", + "@codemirror/view": "https://esm.sh/@codemirror/view@6.27.0?external=@codemirror/state,@lezer/common,style-mod&target=es2022", "@js-temporal/polyfill": "https://esm.sh/@js-temporal/polyfill@0.4.4", + "@lezer/common": "https://esm.sh/@lezer/common@1.2.1&target=es2022", + "@lezer/css": "https://esm.sh/@lezer/css@1.1.8?external=@lezer/lr,@lezer/highlight", + "@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.10?external=@lezer/common,@lezer/lr,@lezer/highlight&target=es2022", + "@lezer/javascript": "https://esm.sh/@lezer/javascript@1.4.17?external=@lezer/common,@codemirror/language,@lezer/highlight,@lezer/lr&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", + "@luca/esbuild-deno-loader": "jsr:@luca/esbuild-deno-loader@^0.10.3", + "@replit/codemirror-vim": "https://esm.sh/@replit/codemirror-vim@6.2.1?external=@codemirror/state,@codemirror/language,@codemirror/view,@codemirror/search,@codemirror/commands", "cliffy/": "https://deno.land/x/cliffy@v1.0.0-rc.4/", + "crelt": "https://esm.sh/crelt@1.0.6", "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.9.0/mod.ts", + "esbuild": "https://deno.land/x/esbuild@v0.20.2/mod.js", "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", @@ -89,23 +92,17 @@ "js-yaml": "https://esm.sh/js-yaml@4.1.0", "mimetypes": "https://deno.land/x/mimetypes@v1.0.0/mod.ts", "porter-stemmer": "https://esm.sh/porter-stemmer@0.9.1", + "preact": "https://esm.sh/preact@10.23.1", "preact-feather": "https://esm.sh/preact-feather@4.2.1?external=preact", "preact-feather/types": "https://esm.sh/preact-feather@4.2.1/dist/types?external=preact", + "preact/": "https://esm.sh/preact@10.23.1/", "react-icons/md": "https://deno.land/x/react_icons_md@1.0.9/mod.ts", "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/", + "style-mod": "https://esm.sh/style-mod@4.1.2", "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.23.1", - "preact/": "https://esm.sh/preact@10.23.1/", - "$sb/": "./plug-api/", - "zod": "https://deno.land/x/zod@v3.23.8/mod.ts", - "$std/": "https://deno.land/std@0.189.0/" + "zod": "https://deno.land/x/zod@v3.23.8/mod.ts" } }