From 3476f45b41b8dca7b171d6d01e735deae20f9601 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 15 Feb 2025 14:29:12 -0600 Subject: [PATCH] Add @ditto/ditto as a workspace package --- .vscode/launch.json | 2 +- Dockerfile | 2 +- deno.json | 13 +++++++------ packages/ditto/deno.json | 13 +++++++++++++ 4 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 packages/ditto/deno.json diff --git a/.vscode/launch.json b/.vscode/launch.json index 298c3be5..35b505d2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "request": "launch", "name": "Launch Program", "type": "node", - "program": "${workspaceFolder}/src/server.ts", + "program": "${workspaceFolder}/packages/ditto/server.ts", "cwd": "${workspaceFolder}", "runtimeExecutable": "deno", "runtimeArgs": [ diff --git a/Dockerfile b/Dockerfile index 21b03689..78ae7fad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV PORT 5000 WORKDIR /app RUN mkdir -p data && chown -R deno data COPY . . -RUN deno cache --allow-import src/server.ts +RUN deno cache --allow-import packages/ditto/server.ts RUN apt-get update && apt-get install -y unzip curl RUN deno task soapbox CMD deno task start diff --git a/deno.json b/deno.json index 9bd822b1..ee6868d9 100644 --- a/deno.json +++ b/deno.json @@ -1,15 +1,17 @@ { - "version": "1.1.0", + "workspace": [ + "./packages/ditto" + ], "tasks": { - "start": "deno run -A --env-file --deny-read=.env src/server.ts", - "dev": "deno run -A --env-file --deny-read=.env --watch src/server.ts", + "start": "deno run -A --env-file --deny-read=.env packages/ditto/server.ts", + "dev": "deno run -A --env-file --deny-read=.env --watch packages/ditto/server.ts", "hook": "deno run --allow-read --allow-run --allow-write https://deno.land/x/deno_hooks@0.1.1/mod.ts", "db:export": "deno run -A --env-file --deny-read=.env scripts/db-export.ts", "db:import": "deno run -A --env-file --deny-read=.env scripts/db-import.ts", "db:cleanup": "deno run -A --env-file --deny-read=.env scripts/db-policy.ts", "db:migrate": "deno run -A --env-file --deny-read=.env scripts/db-migrate.ts", "nostr:pull": "deno run -A --env-file --deny-read=.env scripts/nostr-pull.ts", - "debug": "deno run -A --env-file --deny-read=.env --inspect src/server.ts", + "debug": "deno run -A --env-file --deny-read=.env --inspect packages/ditto/server.ts", "test": "deno test -A --env-file=.env.test --deny-read=.env --junit-path=./deno-test.xml", "check": "deno check --allow-import .", "nsec": "deno run scripts/nsec.ts", @@ -20,7 +22,7 @@ "stats:recompute": "deno run -A --env-file --deny-read=.env scripts/stats-recompute.ts", "soapbox": "curl -O https://dl.soapbox.pub/main/soapbox.zip && mkdir -p public && mv soapbox.zip public/ && cd public/ && unzip -o soapbox.zip && rm soapbox.zip", "trends": "deno run -A --env-file --deny-read=.env scripts/trends.ts", - "clean:deps": "deno cache --reload src/app.ts", + "clean:deps": "deno cache --reload packages/ditto/app.ts", "db:populate:nip05": "deno run -A --env-file --deny-read=.env scripts/db-populate-nip05.ts", "db:populate-search": "deno run -A --env-file --deny-read=.env scripts/db-populate-search.ts", "db:populate-extensions": "deno run -A --env-file --deny-read=.env scripts/db-populate-extensions.ts", @@ -71,7 +73,6 @@ "comlink": "npm:comlink@^4.4.1", "comlink-async-generator": "npm:comlink-async-generator@^0.0.1", "commander": "npm:commander@12.1.0", - "deno.json": "./deno.json", "entities": "npm:entities@^4.5.0", "fast-stable-stringify": "npm:fast-stable-stringify@^1.0.0", "formdata-helper": "npm:formdata-helper@^0.3.0", diff --git a/packages/ditto/deno.json b/packages/ditto/deno.json new file mode 100644 index 00000000..31f80278 --- /dev/null +++ b/packages/ditto/deno.json @@ -0,0 +1,13 @@ +{ + "name": "@ditto/ditto", + "version": "1.1.0", + "exports": {}, + "imports": { + "deno.json": "./deno.json" + }, + "lint": { + "rules": { + "exclude": ["verbatim-module-syntax"] + } + } +}