Skip to content

A Bunch of Small Changes #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
helloimalastair wants to merge 1 commit into
base: main
Choose a base branch
from
Open

A Bunch of Small Changes #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/pds/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@cloudflare/vite-plugin": "^1.17.0",
"vite": "^6.4.1",
"wrangler": "^4.54.0"
"wrangler": "^4.80.0"
},
"scripts": {
"dev": "vite dev",
Expand Down
7 changes: 5 additions & 2 deletions demos/pds/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://cdn.jsdelivr.net/npm/wrangler@4.80.0/config-schema.json",
// Demo PDS Deployment
// Run `pnpm pds init` to configure, or `pnpm pds init --production` to deploy secrets
"name": "atproto-pds",
Expand Down Expand Up @@ -28,8 +29,7 @@
// R2 bucket for blob storage
"r2_buckets": [
{
"binding": "BLOBS",
"bucket_name": "pds-blobs"
"binding": "BLOBS"
},
],
// Environment variables (public config)
Expand All @@ -47,6 +47,9 @@
// - SIGNING_KEY: Private signing key (secp256k1 JWK)
// - JWT_SECRET: Secret for signing session JWTs
// - PASSWORD_HASH: Bcrypt hash of account password (for Bluesky app login)
"secrets": {
"required": ["AUTH_TOKEN", "SIGNING_KEY", "JWT_SECRET", "PASSWORD_HASH"]
},
"observability": {
"enabled": true
}
Expand Down
10 changes: 8 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,14 @@
"packageManager": "pnpm@10.26.2",
"pnpm": {
"overrides": {
"wrangler": "^4.63.0",
"wrangler": "^4.80.0",
"miniflare": "^4.20260205.0"
}
},
"ignoredBuiltDependencies": [
"@atcute/time-ms",
"esbuild",
"sharp",
"workerd"
]
}
}
2 changes: 1 addition & 1 deletion packages/create-pds/templates/pds-worker/package.json.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@cloudflare/vite-plugin": "^1.17.0",
"@types/node": "^22",
"vite": "^6.4.1",
"wrangler": "^4.54.0"
"wrangler": "^4.80.0"
},
"scripts": {
"dev": "vite dev",
Expand Down
7 changes: 5 additions & 2 deletions packages/create-pds/templates/pds-worker/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://cdn.jsdelivr.net/npm/wrangler@4.80.0/config-schema.json",
// AT Protocol PDS on Cloudflare Workers
// Run `pnpm pds init` to configure, or `pnpm pds init --production` to deploy secrets
"name": "my-pds",
Expand Down Expand Up @@ -28,8 +29,7 @@
// R2 bucket for blob storage (optional - create via Cloudflare dashboard)
"r2_buckets": [
{
"binding": "BLOBS",
"bucket_name": "pds-blobs"
"binding": "BLOBS"
}
],
// Environment variables (public config)
Expand All @@ -51,6 +51,9 @@
// - SIGNING_KEY: Private signing key (secp256k1 JWK)
// - JWT_SECRET: Secret for signing session JWTs
// - PASSWORD_HASH: Bcrypt hash of account password (for Bluesky app login)
"secrets": {
"required": ["AUTH_TOKEN", "SIGNING_KEY", "JWT_SECRET", "PASSWORD_HASH"]
},
"observability": {
"enabled": true
}
Expand Down
2 changes: 1 addition & 1 deletion packages/pds/e2e/fixture/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"devDependencies": {
"@cloudflare/vite-plugin": "^1.17.0",
"vite": "^6.4.1",
"wrangler": "^4.54.0"
"wrangler": "^4.80.0"
}
}
16 changes: 14 additions & 2 deletions packages/pds/e2e/fixture/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://cdn.jsdelivr.net/npm/wrangler@4.80.0/config-schema.json",
"name": "pds-e2e-test",
"main": "src/index.ts",
"compatibility_date": "2025-01-01",
Expand All @@ -12,6 +13,17 @@
{ "tag": "v1", "new_sqlite_classes": ["AccountDurableObject"] }
],
"r2_buckets": [
{ "binding": "BLOBS", "bucket_name": "test-blobs" }
]
{ "binding": "BLOBS" }
],
// Public vars for Vite dev (required alongside secrets.required + .dev.vars)
"vars": {
"DID": "did:web:test.local",
"HANDLE": "test.local",
"PDS_HOSTNAME": "test.local",
"SIGNING_KEY_PUBLIC": "zQ3shbUq6umkAhwsxEXj6fRZ3ptBtF5CNZbAGoKjvFRatUkVY",
"INITIAL_ACTIVE": "true"
},
"secrets": {
"required": ["AUTH_TOKEN", "SIGNING_KEY", "JWT_SECRET", "PASSWORD_HASH"]
}
}
4 changes: 2 additions & 2 deletions packages/pds/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "^5.9.3",
"vite": "^6.4.1",
"vitest": "4.1.0-beta.1",
"wrangler": "^4.54.0",
"wrangler": "^4.80.0",
"ws": "^8.18.3"
},
"repository": {
Expand All @@ -70,7 +70,7 @@
"directory": "packages/pds"
},
"peerDependencies": {
"wrangler": "^4.54.0"
"wrangler": "^4.80.0"
},
"homepage": "https://github.com/ascorbic/cirrus",
"keywords": [
Expand Down
5 changes: 4 additions & 1 deletion packages/pds/test/fixtures/pds-worker/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://cdn.jsdelivr.net/npm/wrangler@4.80.0/config-schema.json",
// Test configuration for the PDS worker fixture
"name": "pds-test",
"main": "index.ts",
Expand All @@ -21,7 +22,9 @@
"r2_buckets": [
{
"binding": "BLOBS",
"bucket_name": "test-blobs",
},
],
"secrets": {
"required": ["AUTH_TOKEN", "SIGNING_KEY", "JWT_SECRET", "PASSWORD_HASH"]
},
}
Loading