From 1028f76c6667e7318bcf0c82e5e4271826c516ee Mon Sep 17 00:00:00 2001 From: mcculloughrt-svh Date: Fri, 27 Jun 2025 10:01:25 -0700 Subject: [PATCH 1/2] prevent internal access of deprecated getters --- .changeset/tall-months-switch.md | 6 ++++++ .../uploadthing/src/_internal/upload-server.ts | 6 ++++++ packages/uploadthing/src/sdk/utils.ts | 15 +++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .changeset/tall-months-switch.md 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..97b960c64a 100644 --- a/packages/uploadthing/src/_internal/upload-server.ts +++ b/packages/uploadthing/src/_internal/upload-server.ts @@ -47,6 +47,12 @@ export const uploadWithoutProgress = ( return { ...json, + get _internalUrl() { + return json.url; + }, + get _internalAppUrl() { + return 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, From e8ba10f4d33b798fc2ffcf79a81398cff9d54c16 Mon Sep 17 00:00:00 2001 From: mcculloughrt-svh Date: Mon, 30 Jun 2025 11:01:20 -0700 Subject: [PATCH 2/2] dont need getters --- packages/uploadthing/src/_internal/upload-server.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/uploadthing/src/_internal/upload-server.ts b/packages/uploadthing/src/_internal/upload-server.ts index 97b960c64a..3e956fe8e0 100644 --- a/packages/uploadthing/src/_internal/upload-server.ts +++ b/packages/uploadthing/src/_internal/upload-server.ts @@ -47,12 +47,8 @@ export const uploadWithoutProgress = ( return { ...json, - get _internalUrl() { - return json.url; - }, - get _internalAppUrl() { - return json.appUrl; - }, + _internalUrl: json.url, + _internalAppUrl: json.appUrl, get url() { logDeprecationWarning( "`file.url` is deprecated and will be removed in uploadthing v9. Use `file.ufsUrl` instead.",