Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/unkeyed/unkey into eng-1336…
Browse files Browse the repository at this point in the history
…-custom-override-permissions
  • Loading branch information
MichaelUnkey committed Oct 22, 2024
2 parents 56b8c75 + 34831dc commit e961f82
Show file tree
Hide file tree
Showing 34 changed files with 914 additions and 231 deletions.
5 changes: 0 additions & 5 deletions .changeset/late-colts-shout.md

This file was deleted.

5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ dist
.dev.vars
.wrangler
.vitest
.react-email
.react-email

.secrets.json
secrets.ts
6 changes: 6 additions & 0 deletions apps/api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# api

## 0.1.0

### Minor Changes

- 09d36ad: add /v1/keys.whoami route

## 0.0.14

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions apps/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api",
"version": "0.0.14",
"version": "0.1.0",
"private": true,
"scripts": {
"build": "tsc",
Expand All @@ -18,7 +18,7 @@
"@vitest/ui": "^1.6.0",
"typescript": "^5.5.3",
"vitest": "^1.6.0",
"wrangler": "^3.62.0"
"wrangler": "^3.80.5"
},
"dependencies": {
"@axiomhq/js": "1.0.0-rc.2",
Expand All @@ -27,6 +27,7 @@
"@hono/zod-validator": "^0.2.1",
"@planetscale/database": "^1.16.0",
"@unkey/cache": "workspace:^",
"@unkey/clickhouse-zod": "workspace:^",
"@unkey/db": "workspace:^",
"@unkey/encryption": "workspace:^",
"@unkey/error": "workspace:^",
Expand All @@ -36,7 +37,6 @@
"@unkey/logs": "workspace:^",
"@unkey/metrics": "workspace:^",
"@unkey/rbac": "workspace:^",
"@unkey/clickhouse-zod": "workspace:^",
"@unkey/schema": "workspace:^",
"@unkey/worker-logging": "workspace:^",
"hono": "^4.6.3",
Expand Down
Loading

0 comments on commit e961f82

Please sign in to comment.