diff --git a/.changeset/tall-months-switch.md b/.changeset/tall-months-switch.md new file mode 100644 index 0000000000..1fff48ffb3 --- /dev/null +++ b/.changeset/tall-months-switch.md @@ -0,0 +1,6 @@ +--- +"uploadthing": patch +--- + +Fix deprecation warning being triggered on every upload due to deprecated +getters being accessed internally. diff --git a/packages/uploadthing/src/_internal/upload-server.ts b/packages/uploadthing/src/_internal/upload-server.ts index e0b40eaba8..3e956fe8e0 100644 --- a/packages/uploadthing/src/_internal/upload-server.ts +++ b/packages/uploadthing/src/_internal/upload-server.ts @@ -47,6 +47,8 @@ export const uploadWithoutProgress = ( return { ...json, + _internalUrl: json.url, + _internalAppUrl: json.appUrl, get url() { logDeprecationWarning( "`file.url` is deprecated and will be removed in uploadthing v9. Use `file.ufsUrl` instead.", diff --git a/packages/uploadthing/src/sdk/utils.ts b/packages/uploadthing/src/sdk/utils.ts index 0b1df0acc6..09651f72cb 100644 --- a/packages/uploadthing/src/sdk/utils.ts +++ b/packages/uploadthing/src/sdk/utils.ts @@ -15,6 +15,7 @@ import type { MaybeUrl, SerializedUploadThingError, } from "@uploadthing/shared"; +import { logDeprecationWarning } from "uploadthing/_internal/deprecations"; import { IngestUrl, UTToken } from "../_internal/config"; import { uploadWithoutProgress } from "../_internal/upload-server"; @@ -146,8 +147,18 @@ export const uploadFile = ( return { key: presigned.key, - url: response.url, - appUrl: response.appUrl, + get url() { + logDeprecationWarning( + "`file.url` is deprecated and will be removed in uploadthing v9. Use `file.ufsUrl` instead.", + ); + return response._internalUrl; + }, + get appUrl() { + logDeprecationWarning( + "`file.appUrl` is deprecated and will be removed in uploadthing v9. Use `file.ufsUrl` instead.", + ); + return response._internalAppUrl; + }, ufsUrl: response.ufsUrl, lastModified: file.lastModified ?? Date.now(), name: file.name,