Merge branch 'main' into preact-utils

.changeset/silly-parrots-knock.md

@@ -0,0 +1,6 @@
+---
+"@uppy/transloadit": patch
+"uppy": patch
+---
+
+remove monkey patch from uppy bundle package

examples/react/package.json

@@ -25,6 +25,7 @@
     "@types/react-dom": "^19.0.4",
     "@vitejs/plugin-react": "^4.6.0",
     "@vitest/browser": "^3.2.4",
+    "msw": "^2.10.4",
     "playwright": "1.57.0",
     "typescript": "^5.7.3",
     "vite": "^7.1.11",

examples/react/test/index.test.tsx

@@ -1,8 +1,18 @@
 import { userEvent } from '@vitest/browser/context'
-import { describe, expect, test } from 'vitest'
+import { setupWorker } from 'msw/browser'
+import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 import { render } from 'vitest-browser-react'
+import { tusHandlers } from '../../shared/tusHandlers.js'
 import App from '../src/App'
 
+const worker = setupWorker(...tusHandlers)
+beforeAll(async () => {
+  await worker.start({ onUnhandledRequest: 'bypass' })
+})
+afterAll(() => {
+  worker.stop()
+})
+
 const createMockFile = (name: string, type: string, size: number = 1024) => {
   return new File(['test content'], name, { type })
 }

examples/shared/tusHandlers.ts

@@ -0,0 +1,39 @@
+import { HttpResponse, http } from 'msw'
+
+/**
+ * MSW handlers that mock the tus resumable upload protocol.
+ *
+ * Handles the tus v1 flow used by the example tests:
+ * 1. POST /files/ — create upload, return Location header
+ * 2. PATCH /files/:id — receive chunk, return new Upload-Offset
+ *
+ * See https://tus.io/protocols/resumable-upload#protocol
+ */
+export const TUS_ENDPOINT = 'https://tusd.tusdemo.net/files/'
+
+export const tusHandlers = [
+  http.post(TUS_ENDPOINT, async ({ request }) => {
+    const uploadLength = request.headers.get('Upload-Length') || '0'
+    return new HttpResponse(null, {
+      status: 201,
+      headers: {
+        Location: `${TUS_ENDPOINT}mock-upload-id`,
+        'Tus-Resumable': '1.0.0',
+        'Upload-Offset': '0',
+        'Upload-Length': uploadLength,
+      },
+    })
+  }),
+  http.patch(`${TUS_ENDPOINT}:id`, async ({ request }) => {
+    const uploadOffset = request.headers.get('Upload-Offset') || '0'
+    const body = await request.arrayBuffer()
+    const newOffset = Number.parseInt(uploadOffset, 10) + body.byteLength
+    return new HttpResponse(null, {
+      status: 204,
+      headers: {
+        'Tus-Resumable': '1.0.0',
+        'Upload-Offset': String(newOffset),
+      },
+    })
+  }),
+]

examples/sveltekit/package.json

@@ -27,6 +27,7 @@
     "@sveltejs/vite-plugin-svelte": "^5.0.0",
     "@tailwindcss/vite": "^4.0.0",
     "@vitest/browser": "^3.2.4",
+    "msw": "^2.10.4",
     "playwright": "1.57.0",
     "svelte": "^5.0.0",
     "svelte-check": "^4.0.0",

examples/sveltekit/test/index.test.ts

@@ -1,9 +1,19 @@
 import { userEvent } from '@vitest/browser/context'
-import { describe, expect, test } from 'vitest'
+import { setupWorker } from 'msw/browser'
+import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 import { render } from 'vitest-browser-svelte'
+import { tusHandlers } from '../../shared/tusHandlers.js'
 import PropsReactivity from '../src/components/test/props-reactivity.svelte'
 import App from '../src/routes/+page.svelte'
 
+const worker = setupWorker(...tusHandlers)
+beforeAll(async () => {
+  await worker.start({ onUnhandledRequest: 'error' })
+})
+afterAll(() => {
+  worker.stop()
+})
+
 const createMockFile = (name: string, type: string, size: number = 1024) => {
   return new File(['test content'], name, { type })
 }

examples/vue/package.json

@@ -23,6 +23,7 @@
     "@tailwindcss/vite": "^4.1.11",
     "@vitejs/plugin-vue": "^6.0.1",
     "@vitest/browser": "^3.2.4",
+    "msw": "^2.10.4",
     "playwright": "1.57.0",
     "tailwindcss": "^4.0.0",
     "vite": "^7.1.11",

examples/vue/test/index.test.ts

@@ -1,8 +1,18 @@
 import { userEvent } from '@vitest/browser/context'
-import { describe, expect, test } from 'vitest'
+import { setupWorker } from 'msw/browser'
+import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 import { render } from 'vitest-browser-vue'
+import { tusHandlers } from '../../shared/tusHandlers.js'
 import App from '../src/App.vue'
 
+const worker = setupWorker(...tusHandlers)
+beforeAll(async () => {
+  await worker.start({ onUnhandledRequest: 'error' })
+})
+afterAll(() => {
+  worker.stop()
+})
+
 const createMockFile = (name: string, type: string, size: number = 1024) => {
   return new File(['test content'], name, { type })
 }

packages/@uppy/transloadit/src/index.ts

@@ -239,6 +239,10 @@ export default class Transloadit<
 > extends BasePlugin<Opts<M, B>, M, B, TransloaditState> {
   static VERSION = packageJson.version
 
+  static COMPANION_URL = COMPANION_URL
+
+  static COMPANION_ALLOWED_HOSTS = COMPANION_ALLOWED_HOSTS
+
   #rateLimitedQueue: RateLimitedQueue
 
   client: Client<M, B>

packages/uppy/src/bundle.ts

@@ -51,15 +51,4 @@ export { default as Webcam } from '@uppy/webcam'
 export { default as XHRUpload } from '@uppy/xhr-upload'
 export { default as Zoom } from '@uppy/zoom'
 
-// Special hack for Transloadit static exports
-import Transloadit, {
-  COMPANION_ALLOWED_HOSTS,
-  COMPANION_URL,
-} from '@uppy/transloadit'
-
-// @ts-expect-error monkey patching
-Transloadit.COMPANION_URL = COMPANION_URL
-// @ts-expect-error monkey patching
-Transloadit.COMPANION_ALLOWED_HOSTS = COMPANION_ALLOWED_HOSTS
-
 export const locales = {}

yarn.lock

@@ -14205,6 +14205,7 @@ __metadata:
     "@uppy/webcam": "workspace:*"
     "@vitejs/plugin-react": "npm:^4.6.0"
     "@vitest/browser": "npm:^3.2.4"
+    msw: "npm:^2.10.4"
     playwright: "npm:1.57.0"
     react: "npm:^19.0.0"
     react-dom: "npm:^19.0.0"
@@ -14261,6 +14262,7 @@ __metadata:
     "@uppy/tus": "workspace:*"
     "@uppy/webcam": "workspace:*"
     "@vitest/browser": "npm:^3.2.4"
+    msw: "npm:^2.10.4"
     playwright: "npm:1.57.0"
     svelte: "npm:^5.0.0"
     svelte-check: "npm:^4.0.0"
@@ -14305,6 +14307,7 @@ __metadata:
     "@uppy/webcam": "workspace:*"
     "@vitejs/plugin-vue": "npm:^6.0.1"
     "@vitest/browser": "npm:^3.2.4"
+    msw: "npm:^2.10.4"
     playwright: "npm:1.57.0"
     tailwindcss: "npm:^4.0.0"
     vite: "npm:^7.1.11"