Skip to content

Commit 4752052

Browse files
committed
fix(deps): resolve duplicate package type conflicts
- Pin autumn-js to 1.2.23 in catalog and override to prevent bun resolving multiple copies with incompatible branded types - Override @slack/web-api to 7.16.0 to unify bolt's transitive dep - Derive Invoice type from hook return instead of direct import
1 parent 1384034 commit 4752052

4 files changed

Lines changed: 32 additions & 27 deletions

File tree

apps/dashboard/app/(main)/billing/history/page.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use client";
22

3-
import type { Invoice } from "autumn-js";
43
import { memo, useMemo, useState } from "react";
54
import { cn } from "@/lib/utils";
65
import { ErrorState } from "../components/empty-states";
@@ -159,6 +158,10 @@ export default function HistoryPage() {
159158
);
160159
}
161160

161+
type Invoice = NonNullable<
162+
NonNullable<ReturnType<typeof useBillingData>["customerData"]>["invoices"]
163+
>[number];
164+
162165
const InvoiceRow = memo(function InvoiceRowComponent({
163166
invoice,
164167
}: {

apps/slack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@databuddy/redis": "workspace:*",
2121
"@databuddy/rpc": "workspace:*",
2222
"@slack/bolt": "^4.7.2",
23-
"@slack/web-api": "^7.15.1",
23+
"@slack/web-api": "7.16.0",
2424
"evlog": "catalog:"
2525
},
2626
"devDependencies": {

bun.lock

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
"node": ">=20"
2828
},
2929
"overrides": {
30-
"protobufjs": ">=7.5.5"
30+
"protobufjs": ">=7.5.5",
31+
"@slack/web-api": "7.16.0",
32+
"autumn-js": "1.2.23"
3133
},
3234
"trustedDependencies": [],
3335
"packageManager": "bun@1.3.14",
@@ -83,7 +85,7 @@
8385
"typescript": "^5.9.3",
8486
"zod": "4.1.12",
8587
"tailwindcss": "^4.1.4",
86-
"autumn-js": "^1.2.8",
88+
"autumn-js": "1.2.23",
8789
"stripe": "^18.2.1",
8890
"dayjs": "^1.11.13",
8991
"elysia": "^1.4.28",

0 commit comments

Comments
 (0)