Merge branch 'tsdown'

Author: dahlia

.github/workflows/build.yaml

@@ -23,6 +23,7 @@ jobs:
     - run: deno task test --coverage=.cov --junit-path=.test-report.xml
       env:
         RUST_BACKTRACE: ${{ runner.debug }}
+        LOG: ${{ runner.debug && 'always' || '' }}
       working-directory: ${{ github.workspace }}/fedify/
     - uses: dorny/test-reporter@v2
       if: success() || failure()
@@ -46,7 +47,27 @@ jobs:
       continue-on-error: true
     - run: "true"
 
-  test-dnt:
+  test-node:
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: denoland/setup-deno@v2
+      with:
+        deno-version: v2.x
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 10
+    - run: deno task test:node
+      working-directory: ${{ github.workspace }}/fedify/
+
+  test-bun:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
@@ -63,12 +84,11 @@ jobs:
     - uses: oven-sh/setup-bun@v1
       with:
         bun-version: latest
-    - run: deno task cache
-      working-directory: ${{ github.workspace }}/fedify/
-    - run: deno task dnt
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 10
+    - run: deno task test:bun
       working-directory: ${{ github.workspace }}/fedify/
-    - run: bun test_runner.js
-      working-directory: ${{ github.workspace }}/fedify/npm/
 
   lint:
     runs-on: ubuntu-latest
@@ -92,19 +112,24 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 10
+    - run: '[[ "$(jq -r .version deno.json)" = "$(jq -r .version package.json)" ]]'
+      working-directory: ${{ github.workspace }}/fedify/
     - run: deno task publish --dry-run
       working-directory: ${{ github.workspace }}/fedify/
-    - run: deno task dnt
+    - run: deno task npm
+      working-directory: ${{ github.workspace }}/fedify/
+    - run: npm publish --dry-run fedify-fedify-*.tgz
       working-directory: ${{ github.workspace }}/fedify/
-    - run: npm publish --dry-run
-      working-directory: ${{ github.workspace }}/fedify/npm/
       env:
         DNT_SKIP_TEST: "true"
     - run: deno task publish-dry-run
       working-directory: ${{ github.workspace }}/cli/
 
   publish:
-    needs: [test, test-dnt, lint, release-test]
+    needs: [test, test-node, test-bun, lint, release-test]
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -117,6 +142,9 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 10
     - if: github.ref_type == 'branch'
       run: |
         jq \
@@ -136,12 +164,8 @@ jobs:
     # in deno.json:
     - run: rm vocab/.gitignore
       working-directory: ${{ github.workspace }}/fedify/
-    - run: 'deno task dnt "$(jq -r .version deno.json)"'
+    - run: deno task npm
       working-directory: ${{ github.workspace }}/fedify/
-      env:
-        DNT_SKIP_TEST: "true"
-    - run: npm pack
-      working-directory: ${{ github.workspace }}/fedify/npm/
     - run: deno task pack
       working-directory: ${{ github.workspace }}/cli/
     - run: 'deno task npm "$(jq -r .version deno.json)"'
@@ -161,15 +185,15 @@ jobs:
       with:
         name: dist
         path: |
-          fedify/npm/*.tgz
+          fedify/fedify-fedify-*.tgz
           cli/fedify-cli-*
     - if: github.event_name == 'push' && github.ref_type == 'tag'
       uses: softprops/action-gh-release@v1
       with:
         body_path: ${{ steps.extract-changelog.outputs.output-file }}
         name: Fedify ${{ github.ref_name }}
         files: |
-          fedify/npm/*.tgz
+          fedify/fedify-fedify-*.tgz
           cli/fedify-cli-*
         generate_release_notes: false
     - if: |
@@ -189,13 +213,13 @@ jobs:
         set -ex
         npm config set //registry.npmjs.org/:_authToken "$NPM_AUTH_TOKEN"
         if [[ "$GITHUB_REF_TYPE" = "tag" ]]; then
-          npm publish --provenance --access public *.tgz
+          npm publish --provenance --access public fedify-fedify-*.tgz
         else
-          npm publish --provenance --access public --tag dev *.tgz
+          npm publish --provenance --access public --tag dev fedify-fedify-*.tgz
         fi
       env:
         NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-      working-directory: ${{ github.workspace }}/fedify/npm/
+      working-directory: ${{ github.workspace }}/fedify/
     - if: github.event_name == 'push' && github.ref_type == 'tag'
       run: |
         set -ex

CONTRIBUTING.md

@@ -59,7 +59,6 @@ To build the project, see the [*Build* section](#build).
 Please run the following commands before opening a pull request:
 
 ~~~~ bash
-cd src/
 deno task check
 ~~~~
 
@@ -145,8 +144,8 @@ The repository consists of the following directories:
     [VitePress].
  -  *examples/*: The example projects.  Some examples are built with Deno, and
     some are built with Node.js.
- -  *src/*: The Fedify library.  The library is built with Deno, and tested with
-    Deno, Node.js, and [Bun].
+ -  *fedify/*: The Fedify library.  The library is built with Deno, and tested
+    with Deno, Node.js, and [Bun].
      -  *codegen/*: The code generation scripts.
 
 [Deno]: https://deno.com/

README.md

@@ -0,0 +1 @@
+fedify/README.md

README.md

@@ -1,7 +1,7 @@
+import { getFileSink } from "@logtape/file";
 import {
   configure,
   getConsoleSink,
-  getFileSink,
   type LogRecord,
   type Sink,
 } from "@logtape/logtape";

cli/log.ts

@@ -1,5 +1,6 @@
 import { Command, CompletionsCommand, HelpCommand } from "@cliffy/command";
-import { configure, getConsoleSink, getFileSink } from "@logtape/logtape";
+import { getFileSink } from "@logtape/file";
+import { configure, getConsoleSink } from "@logtape/logtape";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { DEFAULT_CACHE_DIR, setCacheDir } from "./cache.ts";
 import metadata from "./deno.json" with { type: "json" };

cli/mod.ts

@@ -5,6 +5,7 @@
     "activitystreams",
     "aitertools",
     "apidoc",
+    "authdocloader",
     "bccs",
     "biomejs",
     "Bluesky",
@@ -27,6 +28,7 @@
     "eddsa",
     "fanout",
     "federatable",
+    "Federatable",
     "fedi",
     "fedibird",
     "fedify",
@@ -87,6 +89,7 @@
     "tempserver",
     "traceparent",
     "ts-nocheck",
+    "tsdown",
     "twoslash",
     "typeof",
     "unfollow",
@@ -98,7 +101,6 @@
     "vitepress",
     "vtsls",
     "webfinger",
-    "webp",
-    "Federatable"
+    "webp"
   ]
-}
+}

cspell.json

@@ -6,8 +6,8 @@
     "./examples/hono-sample"
   ],
   "imports": {
-    "@logtape/logtape": "jsr:@logtape/logtape@^0.8.2",
-    "@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
+    "@logtape/file": "jsr:@logtape/file@^0.10.0",
+    "@logtape/logtape": "jsr:@logtape/logtape@^0.10.0",
     "@std/fs": "jsr:@std/fs@^1.0.3",
     "@std/path": "jsr:@std/path@^1.0.6",
     "preact": "npm:preact@10.19.6"

deno.json

@@ -1,10 +1,6 @@
+import { getFileSink } from "@logtape/file";
+import { configure, getConsoleSink, type LogLevel } from "@logtape/logtape";
 import { AsyncLocalStorage } from "node:async_hooks";
-import {
-  configure,
-  getConsoleSink,
-  getFileSink,
-  type LogLevel,
-} from "@logtape/logtape";
 
 await configure({
   contextLocalStorage: new AsyncLocalStorage(),

examples/blog/loggers.ts

@@ -4,4 +4,7 @@
 .test-report.xml
 apidoc/
 coverage/
+dist/
+fedify-fedify-*.tgz
+node_modules/
 npm/