Skip to content

Commit 146f819

Browse files
committed
Restructure monorepo: Move pkgs to packages/ dir
- Move all package directories from root to packages/ subdirectory - Update workspace configurations for both Deno and pnpm - Update package.json repository directories and export paths - Update deno.json workspace member paths and excludes - Update tsdown.config.ts entry paths to src/ structure - Update import paths in test files to reflect new structure - Update README.md symlink and package table paths - Update .gitignore to match new directory structure This reorganization provides a cleaner monorepo structure with all packages consolidated under a single packages/ directory while maintaining the dual workspace setup for cross-runtime compatibility.
1 parent fda8431 commit 146f819

File tree

126 files changed

+238
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+238
-352
lines changed

.github/workflows/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ jobs:
9090
--arg build "$GITHUB_RUN_NUMBER" \
9191
--arg commit "${GITHUB_SHA::8}" \
9292
'.version + "-dev." + $build + "+" + $commit' \
93-
logtape/deno.json)"
93+
packages/logtape/deno.json)"
9494
deno run --allow-read --allow-write scripts/update_versions.ts "$v"
9595
deno task check:versions
9696
- if: github.ref_type == 'tag'
9797
run: |
9898
set -ex
99-
[[ "$(jq -r .version logtape/deno.json)" = "$GITHUB_REF_NAME" ]]
99+
[[ "$(jq -r .version packages/logtape/deno.json)" = "$GITHUB_REF_NAME" ]]
100100
deno task check:versions
101101
- if: github.event_name == 'push'
102102
run: |

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ coverage/
88
logtape-*-*.tgz
99
node_modules/
1010
npm/
11+
packages/*/dist/
1112
t.ts
1213
*/.env
13-
*/dist/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
logtape/README.md
1+
packages/logtape/README.md

deno.json

Lines changed: 17 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"workspace": [
3-
"./logtape",
4-
"./adaptor-pino",
5-
"./adaptor-winston",
6-
"./file",
7-
"./otel",
8-
"./pretty",
9-
"./redaction",
10-
"./sentry",
11-
"./syslog",
12-
"./cloudwatch-logs",
13-
"./windows-eventlog",
3+
"./packages/logtape",
4+
"./packages/adaptor-pino",
5+
"./packages/adaptor-winston",
6+
"./packages/file",
7+
"./packages/otel",
8+
"./packages/pretty",
9+
"./packages/redaction",
10+
"./packages/sentry",
11+
"./packages/syslog",
12+
"./packages/cloudwatch-logs",
13+
"./packages/windows-eventlog",
1414
"./benchmarks"
1515
],
1616
"imports": {
@@ -31,20 +31,21 @@
3131
"fs"
3232
],
3333
"exclude": [
34-
"*/.test-report.xml",
35-
"*/dist/",
34+
"**/.test-report.xml",
3635
".cov/",
3736
".github/",
3837
".test-report.xml",
3938
"coverage/",
4039
"docs/",
4140
"screenshots/",
41+
"packages/*/dist/",
4242
"pnpm-lock.yaml",
4343
"pnpm-workspace.yaml"
4444
],
4545
"fmt": {
4646
"exclude": [
47-
"*/README.md"
47+
"README.md",
48+
"**/README.md"
4849
]
4950
},
5051
"tasks": {
@@ -134,140 +135,8 @@
134135
},
135136
"coverage": "rm -rf coverage && deno task test --coverage && deno coverage --html coverage",
136137
"test": "deno test --allow-read --allow-write --allow-net --allow-env --allow-sys --allow-ffi --allow-run=powershell",
137-
"test:node:file": {
138-
"dependencies": [
139-
"build:file"
140-
],
141-
"command": "cd file/ && node --experimental-transform-types --test"
142-
},
143-
"test:node:logtape": {
144-
"dependencies": [
145-
"build:logtape"
146-
],
147-
"command": "cd logtape/ && node --experimental-transform-types --test"
148-
},
149-
"test:node:pretty": {
150-
"dependencies": [
151-
"build:pretty"
152-
],
153-
"command": "cd pretty/ && node --experimental-transform-types --test"
154-
},
155-
"test:node:redaction": {
156-
"dependencies": [
157-
"build:redaction"
158-
],
159-
"command": "cd redaction/ && node --experimental-transform-types --test"
160-
},
161-
"test:node:syslog": {
162-
"dependencies": [
163-
"build:syslog"
164-
],
165-
"command": "cd syslog/ && node --experimental-transform-types --test"
166-
},
167-
"test:node:cloudwatch-logs": {
168-
"dependencies": [
169-
"build:cloudwatch-logs"
170-
],
171-
"command": "cd cloudwatch-logs/ && node --experimental-transform-types --test"
172-
},
173-
"test:node:windows-eventlog": {
174-
"dependencies": [
175-
"build:windows-eventlog"
176-
],
177-
"command": "cd windows-eventlog/ && node --experimental-transform-types --test"
178-
},
179-
"test:node:adaptor-pino": {
180-
"dependencies": [
181-
"build:adaptor-pino"
182-
],
183-
"command": "cd adaptor-pino/ && node --experimental-transform-types --test"
184-
},
185-
"test:node:adaptor-winston": {
186-
"dependencies": [
187-
"build:adaptor-winston"
188-
],
189-
"command": "cd adaptor-winston/ && node --experimental-transform-types --test"
190-
},
191-
"test:node": {
192-
"dependencies": [
193-
"test:node:file",
194-
"test:node:logtape",
195-
"test:node:pretty",
196-
"test:node:redaction",
197-
"test:node:syslog",
198-
"test:node:cloudwatch-logs",
199-
"test:node:windows-eventlog",
200-
"test:node:adaptor-pino",
201-
"test:node:adaptor-winston"
202-
]
203-
},
204-
"test:bun:file": {
205-
"dependencies": [
206-
"build:file"
207-
],
208-
"command": "cd file/ && bun test"
209-
},
210-
"test:bun:logtape": {
211-
"dependencies": [
212-
"build:logtape"
213-
],
214-
"command": "cd logtape/ && bun test"
215-
},
216-
"test:bun:pretty": {
217-
"dependencies": [
218-
"build:pretty"
219-
],
220-
"command": "cd pretty/ && bun test"
221-
},
222-
"test:bun:redaction": {
223-
"dependencies": [
224-
"build:redaction"
225-
],
226-
"command": "cd redaction/ && bun test"
227-
},
228-
"test:bun:syslog": {
229-
"dependencies": [
230-
"build:syslog"
231-
],
232-
"command": "cd syslog/ && bun test"
233-
},
234-
"test:bun:cloudwatch-logs": {
235-
"dependencies": [
236-
"build:cloudwatch-logs"
237-
],
238-
"command": "cd cloudwatch-logs/ && bun test"
239-
},
240-
"test:bun:windows-eventlog": {
241-
"dependencies": [
242-
"build:windows-eventlog"
243-
],
244-
"command": "cd windows-eventlog/ && bun test --timeout 10000"
245-
},
246-
"test:bun:adaptor-pino": {
247-
"dependencies": [
248-
"build:adaptor-pino"
249-
],
250-
"command": "cd adaptor-pino/ && bun test"
251-
},
252-
"test:bun:adaptor-winston": {
253-
"dependencies": [
254-
"build:adaptor-winston"
255-
],
256-
"command": "cd adaptor-winston/ && bun test"
257-
},
258-
"test:bun": {
259-
"dependencies": [
260-
"test:bun:file",
261-
"test:bun:logtape",
262-
"test:bun:pretty",
263-
"test:bun:redaction",
264-
"test:bun:syslog",
265-
"test:bun:cloudwatch-logs",
266-
"test:bun:windows-eventlog",
267-
"test:bun:adaptor-pino",
268-
"test:bun:adaptor-winston"
269-
]
270-
},
138+
"test:node": "pnpm run -r test",
139+
"test:bun": "pnpm run -r test:bun",
271140
"test-all": {
272141
"dependencies": [
273142
"check",

deno.lock

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

adaptor-pino/deno.json renamed to packages/adaptor-pino/deno.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@logtape/adaptor-pino",
33
"version": "1.1.0",
44
"license": "MIT",
5-
"exports": "./mod.ts",
5+
"exports": "./src/mod.ts",
66
"imports": {
77
"pino-abstract-transport": "npm:pino-abstract-transport@^2.0.0"
88
},

adaptor-pino/package.json renamed to packages/adaptor-pino/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"repository": {
2222
"type": "git",
2323
"url": "git+https://github.com/dahlia/logtape.git",
24-
"directory": "adaptor-pino/"
24+
"directory": "packages/adaptor-pino/"
2525
},
2626
"bugs": {
2727
"url": "https://github.com/dahlia/logtape/issues"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)