Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/retire-files-sdk-patch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@buildinternet/uploads": patch
---

Bump files-sdk to 2.3.1 and drop the local pnpm patch; the Workers-safe S3 adapter now comes from the public files-sdk/s3-fetch entry.
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@uploads/ui": "workspace:*",
"astro": "^7.2.4",
"astro-expressive-code": "^0.44.1",
"files-sdk": "^2.2.5",
"files-sdk": "^2.3.1",
"img-comparison-slider": "^8.0.7",
"lucide-react": "^1.33.0",
"markdown-for-agents": "^1.3.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@aws-sdk/client-s3": "^3.1080.0",
"@aws-sdk/s3-presigned-post": "^3.1080.0",
"@aws-sdk/s3-request-presigner": "^3.1080.0",
"files-sdk": "^2.2.5"
"files-sdk": "^2.3.1"
},
"devDependencies": {
"@cloudflare/workers-types": "^5.20260706.1",
Expand Down
7 changes: 3 additions & 4 deletions packages/storage/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Files, type StoredFile } from "files-sdk";
export { createFilesRouter } from "files-sdk/api";
import { r2, s3FetchAdapter } from "files-sdk/r2";
import { r2 } from "files-sdk/r2";
import { s3Fetch } from "files-sdk/s3-fetch";

/** Discriminant for {@link StorageConfig}. Adding a provider = add a case in `createStorage` plus its peer deps. */
export type StorageProvider = "r2" | "s3";
Expand Down Expand Up @@ -117,12 +118,10 @@ export function createStorage(config: StorageConfig): Files {
if (!config.endpoint || !config.accessKeyId || !config.secretAccessKey) {
throw new Error("s3 storage config requires endpoint, accessKeyId, and secretAccessKey");
}
const adapter = s3FetchAdapter({
const adapter = s3Fetch({
accessKeyId: config.accessKeyId,
bucket: config.bucket,
endpoint: config.endpoint,
name: "s3-http-fetch",
providerLabel: "S3 error",
region: config.region,
secretAccessKey: config.secretAccessKey,
...(config.forcePathStyle !== undefined && { forcePathStyle: config.forcePathStyle }),
Expand Down
4 changes: 2 additions & 2 deletions packages/storage/test/s3-provider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const base: S3StorageConfig = {
};

describe("createStorage s3 provider", () => {
it("returns a Files instance whose adapter name is s3-http-fetch", () => {
it("returns a Files instance backed by files-sdk's public s3-fetch adapter", () => {
const files = createStorage(base);
expect(files.adapter.name).toBe("s3-http-fetch");
expect(files.adapter.name).toBe("s3-fetch");
});

it("rejects a config missing credentials at runtime (backstop for untyped callers)", () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"typecheck": "tsc --noEmit"
},
"peerDependencies": {
"files-sdk": ">=2.2.4",
"files-sdk": ">=2.3.1",
"react": ">=18",
"react-dom": ">=18"
},
Expand All @@ -65,7 +65,7 @@
"@types/node": "^26.1.0",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"files-sdk": "^2.2.5",
"files-sdk": "^2.3.1",
"react": "^19.2.7",
"react-dom": "^19.2.7",
"tsup": "^8.3.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/uploads/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"node": ">=22"
},
"peerDependencies": {
"files-sdk": "^2.2.4"
"files-sdk": "^2.3.1"
},
"peerDependenciesMeta": {
"files-sdk": {
Expand All @@ -56,7 +56,7 @@
"devDependencies": {
"@types/node": "^26.1.0",
"ai": "^6.0.0",
"files-sdk": "^2.2.5",
"files-sdk": "^2.3.1",
"typescript": "^7.0.2",
"vitest": "^4.1.10"
},
Expand Down
24 changes: 0 additions & 24 deletions patches/files-sdk.patch

This file was deleted.

31 changes: 15 additions & 16 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ minimumReleaseAgeExclude:
- "@aws-sdk/s3-request-presigner@3.1080.0"
- "@aws-sdk/token-providers@3.1080.0"
- "@cloudflare/workers-types@5.20260706.1"
- files-sdk@2.2.4
- files-sdk@2.2.4 || 2.3.1
- hono@4.12.28
patchedDependencies:
"@better-auth/oauth-provider": patches/@better-auth__oauth-provider.patch
files-sdk: patches/files-sdk.patch
Loading