Skip to content

Commit

Permalink
Fix bullboard types (#156)
Browse files Browse the repository at this point in the history
  • Loading branch information
@robertherber
robertherber authored Jan 21, 2025
1 parent e3cddba commit 69f5f6e
Show file tree
Hide file tree
Showing 37 changed files with 130 additions and 90 deletions.
37 changes: 37 additions & 0 deletions .changeset/lemon-peas-suffer.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
"todo-app-with-auth-backend": patch
"create-zemble-plugin": patch
"@zemble/auth-anonymous-expo": patch
"create-zemble-app": patch
"todoappwithauth": patch
"@zemble/auth-anonymous": patch
"@zemble/auth-api-token": patch
"@zemble/logger-graphql": patch
"@zemble/firebase-auth": patch
"supplement-stack": patch
"@zemble/email-resend": patch
"@zemble/auth-apple": patch
"@zemble/migrations": patch
"@zemble/auth-expo": patch
"@zemble/cms-users": patch
"@zemble/urql-expo": patch
"@zemble/auth-otp": patch
"@zemble/supabase": patch
"@zemble/graphql": patch
"@zemble/todo-ui": patch
"eslint-config-kingstinct": patch
"@zemble/routes": patch
"@zemble/react": patch
"@zemble/utils": patch
"@zemble/auth": patch
"@zemble/bull": patch
"@zemble/core": patch
"@zemble/pino": patch
"@zemble/todo": patch
"minimal": patch
"@zemble/cms": patch
"cms-ui": patch
"@zemble/kv": patch
---

Bumps and type fixes
2 changes: 1 addition & 1 deletion apps/cms-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"react-native-vector-icons": "^10.0.3",
"react-native-web": "^0.19.8",
"recursive": "^0.0.2",
"typescript": "^5.7.2",
"typescript": "^5.7.3",
"urql": "4.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/minimal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@
},
"devDependencies": {
"@tsconfig/node20": "^20.1.4",
"typescript": "^5.7.2"
"typescript": "^5.7.3"
}
}
2 changes: 1 addition & 1 deletion apps/supplement-stack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@
"papr": "^15.2.2"
},
"devDependencies": {
"typescript": "^5.7.2"
"typescript": "^5.7.3"
}
}
2 changes: 1 addition & 1 deletion apps/todo-app-with-auth-backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"@zemble/bun": "workspace:*"
},
"devDependencies": {
"typescript": "^5.7.2"
"typescript": "^5.7.3"
}
}
2 changes: 1 addition & 1 deletion apps/todo-app-with-auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"devDependencies": {
"@babel/core": "^7.26.0",
"@types/react": "^18.3.3",
"typescript": "^5.7.2"
"typescript": "^5.7.3"
},
"private": true
}
Binary file modified bun.lockb
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"zemble",
"@zemble"
],
"packageManager": "bun@1.1.42",
"packageManager": "bun@1.1.45",
"repository": {
"type": "git",
"url": "https://github.com/kingstinct/zemble"
Expand All @@ -54,13 +54,13 @@
"devDependencies": {
"@graphql-eslint/eslint-plugin": "^4.3.0",
"@graphql-typed-document-node/core": "^3.2.0",
"@stylistic/eslint-plugin-ts": "^2.12.1",
"@stylistic/eslint-plugin-ts": "^2.13.0",
"@tsconfig/bun": "^1.0.7",
"@types/bun": "*",
"@types/debug": "^4.1.12",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"bun-types": "1.1.42",
"@typescript-eslint/eslint-plugin": "^8.21.0",
"@typescript-eslint/parser": "^8.21.0",
"bun-types": "1.1.45",
"check-dependency-version-consistency": "^5.0.0",
"eslint": "8",
"eslint-config-airbnb": "^19.0.4",
Expand All @@ -72,14 +72,14 @@
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsonc": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react": "7.37.4",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-native": "^4.1.0",
"eslint-plugin-react-native-a11y": "^3.3.0",
"eslint-plugin-unicorn": "^56.0.1",
"eslint-plugin-yml": "^1.16.0",
"husky": "^9.1.7",
"lint-staged": "^15.2.11",
"lint-staged": "^15.4.1",
"pino-pretty": "^13.0.0",
"pkg-pr-new": "^0.0.39",
"turbo": "^2.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/anonymous-auth-expo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/client-preset": "^4.5.1",
"@types/react": "^18.3.3",
"typescript": "^5.7.2"
"typescript": "^5.7.3"
},
"private": true
}
2 changes: 1 addition & 1 deletion packages/auth-anonymous/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"license": "ISC",
"dependencies": {
"@envelop/core": "^5.0.2",
"@envelop/core": "^5.0.3",
"@envelop/generic-auth": "7",
"@whatwg-node/server-plugin-cookies": "^1.0.3",
"@zemble/auth": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-api-token/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@zemble/graphql": "workspace:*",
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"hono": "^4.6.14",
"hono": "^4.6.17",
"jose": "^5.9.6",
"@zemble/auth": "workspace:*"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-apple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"license": "ISC",
"dependencies": {
"@envelop/core": "^5.0.2",
"@envelop/core": "^5.0.3",
"@envelop/generic-auth": "7",
"@whatwg-node/server-plugin-cookies": "^1.0.3",
"@zemble/core": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth-expo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@babel/core": "^7.26.0",
"@types/react": "^18.3.3",
"typescript": "^5.7.2"
"typescript": "^5.7.3"
},
"private": true
}
4 changes: 2 additions & 2 deletions packages/auth-otp/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"license": "ISC",
"dependencies": {
"@envelop/core": "^5.0.2",
"@envelop/core": "^5.0.3",
"@envelop/generic-auth": "7",
"@whatwg-node/server-plugin-cookies": "^1.0.3",
"@zemble/auth": "workspace:*",
Expand All @@ -43,6 +43,6 @@
"@zemble/kv": "workspace:*",
"@zemble/utils": "workspace:*",
"graphql": "^16.10.0",
"libphonenumber-js": "^1.11.17"
"libphonenumber-js": "^1.11.18"
}
}
6 changes: 3 additions & 3 deletions packages/auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
},
"license": "ISC",
"dependencies": {
"@envelop/core": "^5.0.2",
"@envelop/core": "^5.0.3",
"@envelop/generic-auth": "7",
"@graphql-tools/wrap": "^10.0.26",
"@graphql-tools/wrap": "^10.0.28",
"@zemble/core": "workspace:*",
"@zemble/bun": "workspace:*",
"@zemble/graphql": "workspace:*",
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"hono": "^4.6.14",
"hono": "^4.6.17",
"jose": "^5.9.6",
"@zemble/kv": "workspace:*"
}
Expand Down
9 changes: 6 additions & 3 deletions packages/bull/bullboard-hono-adapter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type {
AppControllerRoute, AppViewRoute, BullBoardQueues, ControllerHandlerReturnType, HTTPMethod, IServerAdapter, UIConfig,
} from '@bull-board/api/dist/typings/app'
import type { Context, Env } from 'hono'
import type { ContentfulStatusCode } from 'hono/utils/http-status'

export default class HonoAdapter<HonoEnv extends Env> implements IServerAdapter {
protected app: Hono<HonoEnv>
Expand Down Expand Up @@ -84,17 +85,19 @@ export default class HonoAdapter<HonoEnv extends Env> implements IServerAdapter
query: c.req.query(),
body: hasJSONBody ? await c.req.json() : {},
})
return c.json(response.body, response.status || 200)
const status = response.status || 200
return c.json(response.body, status as ContentfulStatusCode)
} catch (e) {
if (!this.errorHandler || !(e instanceof Error)) {
throw e
}

const response = this.errorHandler(e)
if (typeof response.body === 'string') {
return c.text(response.body, response.status)
const status = response.status || 500
return c.text(response.body, status as ContentfulStatusCode)
}
return c.json(response.body, response.status)
return c.json(response.body, response.status as ContentfulStatusCode)
}
})
})
Expand Down
6 changes: 3 additions & 3 deletions packages/bull/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
},
"license": "ISC",
"dependencies": {
"@bull-board/api": "^6.5.3",
"@bull-board/api": "^6.7.1",
"@types/ejs": "^3.1.5",
"@zemble/auth": "workspace:*",
"@zemble/core": "workspace:*",
"@zemble/graphql": "workspace:*",
"@zemble/utils": "workspace:*",
"bullmq": "^5.34.4",
"bullmq": "^5.34.10",
"ejs": "^3.1.10",
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"hono": "^4.6.14",
"hono": "^4.6.17",
"ioredis": "^5.4.2",
"safe-stable-stringify": "^2.5.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/cms-users/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
},
"license": "ISC",
"dependencies": {
"@envelop/core": "^5.0.2",
"@envelop/core": "^5.0.3",
"@envelop/extended-validation": "^4.1.0",
"@envelop/generic-auth": "7",
"@graphql-tools/executor": "^1.3.9",
"@graphql-tools/executor": "^1.3.12",
"@zemble/auth": "workspace:*",
"@zemble/auth-otp": "workspace:*",
"@zemble/cms": "workspace:*",
Expand All @@ -50,7 +50,7 @@
"dataloader": "^2.2.3",
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"hono": "^4.6.14",
"hono": "^4.6.17",
"jose": "^5.9.6",
"mongodb": "^6.12.0",
"papr": "^15.2.2"
Expand Down
10 changes: 5 additions & 5 deletions packages/cms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
},
"license": "ISC",
"dependencies": {
"@envelop/core": "^5.0.2",
"@envelop/core": "^5.0.3",
"@envelop/extended-validation": "^4.1.0",
"@envelop/generic-auth": "7",
"@graphql-tools/utils": "^10.6.4",
"@graphql-tools/utils": "^10.7.2",
"@zemble/auth": "workspace:*",
"@zemble/core": "workspace:*",
"@zemble/graphql": "workspace:*",
Expand All @@ -48,14 +48,14 @@
"dataloader": "^2.2.3",
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"hono": "^4.6.14",
"hono": "^4.6.17",
"jose": "^5.9.6",
"memfs": "^4.15.1",
"memfs": "^4.17.0",
"mongodb": "^6.12.0",
"papr": "^15.2.2"
},
"devDependencies": {
"mongodb-memory-server": "10",
"type-fest": "^4.30.2"
"type-fest": "^4.33.0"
}
}
6 changes: 3 additions & 3 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"@zemble/utils": "workspace:*",
"debug": "^4.4.0",
"dotenv": "^16.4.7",
"hono": "^4.6.14",
"hono": "^4.6.17",
"jose": "^5.9.6",
"pino": "^9.5.0",
"pino": "^9.6.0",
"pino-debug": "^2.0.0"
},
"devDependencies": {
"type-fest": "^4.30.2"
"type-fest": "^4.33.0"
}
}
2 changes: 1 addition & 1 deletion packages/create-zemble-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "bun test cli.ts"
},
"dependencies": {
"fs-extra": "^11.2.0"
"fs-extra": "^11.3.0"
},
"module": "index.ts",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-zemble-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "bun test cli.ts"
},
"dependencies": {
"fs-extra": "^11.2.0"
"fs-extra": "^11.3.0"
},
"module": "index.ts",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/email-resend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@zemble/core": "workspace:*",
"@zemble/graphql": "workspace:*",
"graphql": "^16.10.0",
"resend": "^4.0.1"
"resend": "^4.1.1"
},
"devDependencies": {
"@graphql-codegen/add": "^5.0.3",
Expand Down
12 changes: 6 additions & 6 deletions packages/eslint/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
"devDependencies": {
"@babel/core": "^7.26.0",
"@graphql-eslint/eslint-plugin": "^4.3.0",
"@stylistic/eslint-plugin-ts": "^2.12.1",
"@typescript-eslint/eslint-plugin": "^8.18.1",
"@typescript-eslint/parser": "^8.18.1",
"@stylistic/eslint-plugin-ts": "^2.13.0",
"@typescript-eslint/eslint-plugin": "^8.21.0",
"@typescript-eslint/parser": "^8.21.0",
"eslint": "8",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-base": "^15.0.0",
Expand All @@ -77,16 +77,16 @@
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsonc": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react": "7.37.4",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-native": "^4.1.0",
"eslint-plugin-react-native-a11y": "^3.3.0",
"eslint-plugin-unicorn": "^56.0.1",
"eslint-plugin-yml": "^1.16.0",
"expo": "^49.0.21",
"graphql": "^16.10.0",
"lint-staged": "^15.2.11",
"lint-staged": "^15.4.1",
"react": "^18.3.1",
"typescript": "^5.7.2"
"typescript": "^5.7.3"
}
}
2 changes: 1 addition & 1 deletion packages/firebase-auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@zemble/routes": "workspace:*",
"@zemble/auth": "workspace:*",
"@zemble/utils": "workspace:*",
"firebase": "^11.1.0",
"firebase": "^11.2.0",
"firebase-admin": "^13.0.2"
},
"scripts": {
Expand Down
Loading

0 comments on commit 69f5f6e

Please sign in to comment.