Skip to content

Commit b268a14

Browse files
committed
Use tsdown instead of dnt
1 parent 26348fc commit b268a14

35 files changed

Lines changed: 1747 additions & 537 deletions

.github/workflows/build.yaml

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- run: deno task test --coverage=.cov --junit-path=.test-report.xml
2424
env:
2525
RUST_BACKTRACE: ${{ runner.debug }}
26+
LOG: ${{ runner.debug && 'always' || '' }}
2627
working-directory: ${{ github.workspace }}/fedify/
2728
- uses: dorny/test-reporter@v2
2829
if: success() || failure()
@@ -46,7 +47,7 @@ jobs:
4647
continue-on-error: true
4748
- run: "true"
4849

49-
test-dnt:
50+
test-node:
5051
strategy:
5152
matrix:
5253
os: [macos-latest, ubuntu-latest, windows-latest]
@@ -57,18 +58,15 @@ jobs:
5758
- uses: denoland/setup-deno@v2
5859
with:
5960
deno-version: v2.x
61+
- uses: pnpm/action-setup@v4
62+
with:
63+
version: 10
6064
- uses: actions/setup-node@v4
6165
with:
6266
node-version: lts/*
63-
- uses: oven-sh/setup-bun@v1
64-
with:
65-
bun-version: latest
66-
- run: deno task cache
67-
working-directory: ${{ github.workspace }}/fedify/
68-
- run: deno task dnt
67+
cache: pnpm
68+
- run: deno task test:node
6969
working-directory: ${{ github.workspace }}/fedify/
70-
- run: bun test_runner.js
71-
working-directory: ${{ github.workspace }}/fedify/npm/
7270

7371
lint:
7472
runs-on: ubuntu-latest
@@ -89,22 +87,28 @@ jobs:
8987
- uses: denoland/setup-deno@v2
9088
with:
9189
deno-version: v2.x
90+
- uses: pnpm/action-setup@v4
91+
with:
92+
version: 10
9293
- uses: actions/setup-node@v4
9394
with:
9495
node-version: lts/*
96+
cache: pnpm
97+
- run: '[[ "$(jq -r .version deno.json)" = "$(jq -r .version package.json)" ]]'
98+
working-directory: ${{ github.workspace }}/fedify/
9599
- run: deno task publish --dry-run
96100
working-directory: ${{ github.workspace }}/fedify/
97-
- run: deno task dnt
101+
- run: deno task npm
102+
working-directory: ${{ github.workspace }}/fedify/
103+
- run: npm publish --dry-run fedify-fedify-*.tgz
98104
working-directory: ${{ github.workspace }}/fedify/
99-
- run: npm publish --dry-run
100-
working-directory: ${{ github.workspace }}/fedify/npm/
101105
env:
102106
DNT_SKIP_TEST: "true"
103107
- run: deno task publish-dry-run
104108
working-directory: ${{ github.workspace }}/cli/
105109

106110
publish:
107-
needs: [test, test-dnt, lint, release-test]
111+
needs: [test, test-node, lint, release-test]
108112
runs-on: ubuntu-latest
109113
permissions:
110114
id-token: write
@@ -114,9 +118,13 @@ jobs:
114118
- uses: denoland/setup-deno@v2
115119
with:
116120
deno-version: v2.x
121+
- uses: pnpm/action-setup@v4
122+
with:
123+
version: 10
117124
- uses: actions/setup-node@v4
118125
with:
119126
node-version: lts/*
127+
cache: pnpm
120128
- if: github.ref_type == 'branch'
121129
run: |
122130
jq \
@@ -136,12 +144,8 @@ jobs:
136144
# in deno.json:
137145
- run: rm vocab/.gitignore
138146
working-directory: ${{ github.workspace }}/fedify/
139-
- run: 'deno task dnt "$(jq -r .version deno.json)"'
147+
- run: deno task npm
140148
working-directory: ${{ github.workspace }}/fedify/
141-
env:
142-
DNT_SKIP_TEST: "true"
143-
- run: npm pack
144-
working-directory: ${{ github.workspace }}/fedify/npm/
145149
- run: deno task pack
146150
working-directory: ${{ github.workspace }}/cli/
147151
- run: 'deno task npm "$(jq -r .version deno.json)"'
@@ -161,15 +165,15 @@ jobs:
161165
with:
162166
name: dist
163167
path: |
164-
fedify/npm/*.tgz
168+
fedify/fedify-fedify-*.tgz
165169
cli/fedify-cli-*
166170
- if: github.event_name == 'push' && github.ref_type == 'tag'
167171
uses: softprops/action-gh-release@v1
168172
with:
169173
body_path: ${{ steps.extract-changelog.outputs.output-file }}
170174
name: Fedify ${{ github.ref_name }}
171175
files: |
172-
fedify/npm/*.tgz
176+
fedify/fedify-fedify-*.tgz
173177
cli/fedify-cli-*
174178
generate_release_notes: false
175179
- if: |
@@ -189,13 +193,13 @@ jobs:
189193
set -ex
190194
npm config set //registry.npmjs.org/:_authToken "$NPM_AUTH_TOKEN"
191195
if [[ "$GITHUB_REF_TYPE" = "tag" ]]; then
192-
npm publish --provenance --access public *.tgz
196+
npm publish --provenance --access public fedify-fedify-*.tgz
193197
else
194-
npm publish --provenance --access public --tag dev *.tgz
198+
npm publish --provenance --access public --tag dev fedify-fedify-*.tgz
195199
fi
196200
env:
197201
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
198-
working-directory: ${{ github.workspace }}/fedify/npm/
202+
working-directory: ${{ github.workspace }}/fedify/
199203
- if: github.event_name == 'push' && github.ref_type == 'tag'
200204
run: |
201205
set -ex

README.md

Lines changed: 0 additions & 124 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fedify/README.md

cli/log.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { getFileSink } from "@logtape/file";
12
import {
23
configure,
34
getConsoleSink,
4-
getFileSink,
55
type LogRecord,
66
type Sink,
77
} from "@logtape/logtape";

cli/mod.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Command, CompletionsCommand, HelpCommand } from "@cliffy/command";
2-
import { configure, getConsoleSink, getFileSink } from "@logtape/logtape";
2+
import { getFileSink } from "@logtape/file";
3+
import { configure, getConsoleSink } from "@logtape/logtape";
34
import { AsyncLocalStorage } from "node:async_hooks";
45
import { DEFAULT_CACHE_DIR, setCacheDir } from "./cache.ts";
56
import metadata from "./deno.json" with { type: "json" };

cspell.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"activitystreams",
66
"aitertools",
77
"apidoc",
8+
"authdocloader",
89
"bccs",
910
"biomejs",
1011
"Bluesky",
@@ -27,6 +28,7 @@
2728
"eddsa",
2829
"fanout",
2930
"federatable",
31+
"Federatable",
3032
"fedi",
3133
"fedibird",
3234
"fedify",
@@ -87,6 +89,7 @@
8789
"tempserver",
8890
"traceparent",
8991
"ts-nocheck",
92+
"tsdown",
9093
"twoslash",
9194
"typeof",
9295
"unfollow",
@@ -98,7 +101,6 @@
98101
"vitepress",
99102
"vtsls",
100103
"webfinger",
101-
"webp",
102-
"Federatable"
104+
"webp"
103105
]
104-
}
106+
}

deno.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"./examples/hono-sample"
77
],
88
"imports": {
9-
"@logtape/logtape": "jsr:@logtape/logtape@^0.8.2",
10-
"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
9+
"@logtape/file": "jsr:@logtape/file@^0.10.0",
10+
"@logtape/logtape": "jsr:@logtape/logtape@^0.10.0",
1111
"@std/fs": "jsr:@std/fs@^1.0.3",
1212
"@std/path": "jsr:@std/path@^1.0.6",
1313
"preact": "npm:preact@10.19.6"

examples/blog/loggers.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1+
import { getFileSink } from "@logtape/file";
2+
import { configure, getConsoleSink, type LogLevel } from "@logtape/logtape";
13
import { AsyncLocalStorage } from "node:async_hooks";
2-
import {
3-
configure,
4-
getConsoleSink,
5-
getFileSink,
6-
type LogLevel,
7-
} from "@logtape/logtape";
84

95
await configure({
106
contextLocalStorage: new AsyncLocalStorage(),

fedify/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
.test-report.xml
55
apidoc/
66
coverage/
7+
dist/
8+
fedify-fedify-*.tgz
9+
node_modules/
710
npm/

0 commit comments

Comments
 (0)