@uppy/upgrade devdeps v2 (#6318)

qxprakash · Copilot · web-flow · commit 675b48fa1413 · 2026-06-03T15:30:55.000+05:30
AI disclaimer : AI used ## Changes - **jsdom 26 → 29** across all packages' devDependencies — **except`@uppy/aws-s3`** (left at 26; that plugin is being rewritten and its deps are handled on the rewrite branch). - **`@uppy/xhr-upload` unit tests migrated from nock to MSW**, and `nock` dropped from its devDependencies. ## Why the test migration was needed jsdom **28** overhauled resource loading so `XMLHttpRequest` now goes through jsdom's internal (undici-based) fetch instead of Node's `http` module ([jsdom 28 release notes](https://github.com/jsdom/jsdom/releases/tag/28.0.0)). nock intercepts at the Node `http` / `http.ClientRequest` layer ([nock README](https://github.com/nock/nock)), so it can no longer see uppy's upload requests — the mocked responses never arrive and the tests time out. (This is the long-standing nock + jsdom XHR incompatibility: [nock#518](nock/nock#518).) --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
diff --git a/packages/@uppy/audio/package.json b/packages/@uppy/audio/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "cssnano": "^8.0.1",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "postcss": "^8.5.15",
     "postcss-cli": "^11.0.1",
     "sass": "^1.89.2",
diff --git a/packages/@uppy/companion-client/package.json b/packages/@uppy/companion-client/package.json
@@ -41,7 +41,7 @@
     "p-retry": "^6.1.0"
   },
   "devDependencies": {
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
   },
diff --git a/packages/@uppy/compressor/package.json b/packages/@uppy/compressor/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.19.0",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
   },
diff --git a/packages/@uppy/core/package.json b/packages/@uppy/core/package.json
@@ -55,7 +55,7 @@
     "@types/node": "^20.19.0",
     "cssnano": "^8.0.1",
     "deep-freeze": "^0.0.1",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "postcss": "^8.5.15",
     "postcss-cli": "^11.0.1",
     "sass": "^1.89.2",
diff --git a/packages/@uppy/dashboard/package.json b/packages/@uppy/dashboard/package.json
@@ -63,7 +63,7 @@
     "@vitest/browser": "^4.1.6",
     "@vitest/browser-playwright": "^4.1.6",
     "cssnano": "^8.0.1",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "playwright": "1.60.0",
     "postcss": "^8.5.15",
     "postcss-cli": "^11.0.1",
diff --git a/packages/@uppy/provider-views/package.json b/packages/@uppy/provider-views/package.json
@@ -52,7 +52,7 @@
     "@types/google.accounts": "^0.0.14",
     "@types/google.picker": "^0.0.42",
     "cssnano": "^8.0.1",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "postcss": "^8.5.15",
     "postcss-cli": "^11.0.1",
     "sass": "^1.89.2",
diff --git a/packages/@uppy/react/package.json b/packages/@uppy/react/package.json
@@ -46,7 +46,7 @@
     "@types/react": "^19.2.14",
     "@types/use-sync-external-store": "^1.5.0",
     "@uppy/core": "workspace:^",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
     "typescript": "^5.8.3",
diff --git a/packages/@uppy/remote-sources/package.json b/packages/@uppy/remote-sources/package.json
@@ -58,7 +58,7 @@
   },
   "devDependencies": {
     "@uppy/core": "workspace:^",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "resize-observer-polyfill": "^1.5.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
diff --git a/packages/@uppy/store-default/package.json b/packages/@uppy/store-default/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.19.0",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
   },
diff --git a/packages/@uppy/thumbnail-generator/package.json b/packages/@uppy/thumbnail-generator/package.json
@@ -41,7 +41,7 @@
     "exifr": "^7.1.3"
   },
   "devDependencies": {
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "namespace-emitter": "2.0.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@uppy/core": "workspace:^",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "msw": "^2.10.4",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6",
diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@uppy/core": "workspace:^",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
   },
diff --git a/packages/@uppy/utils/package.json b/packages/@uppy/utils/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.199",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
   }
diff --git a/packages/@uppy/webcam/package.json b/packages/@uppy/webcam/package.json
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "cssnano": "^8.0.1",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "postcss": "^8.5.15",
     "postcss-cli": "^11.0.1",
     "sass": "^1.89.2",
diff --git a/packages/@uppy/xhr-upload/package.json b/packages/@uppy/xhr-upload/package.json
@@ -48,9 +48,8 @@
     "@uppy/dashboard": "workspace:^",
     "@vitest/browser": "^4.1.6",
     "@vitest/browser-playwright": "^4.1.6",
-    "jsdom": "^26.1.0",
+    "jsdom": "^29.1.1",
     "msw": "^2.10.4",
-    "nock": "^13.1.0",
     "playwright": "1.60.0",
     "typescript": "^5.8.3",
     "vitest": "^4.1.6"
diff --git a/packages/@uppy/xhr-upload/src/index.test.ts b/packages/@uppy/xhr-upload/src/index.test.ts
@@ -1,23 +1,47 @@
 import Core, { type UppyEventMap } from '@uppy/core'
-import nock from 'nock'
-import { describe, expect, it, vi } from 'vitest'
+import { HttpResponse, http } from 'msw'
+import { setupServer } from 'msw/node'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest'
 import XHRUpload from './index.js'
 
+// MSW intercepts at the XMLHttpRequest layer (it patches the global
+// XMLHttpRequest), so it works regardless of how jsdom implements XHR
+// internally — unlike nock, which patches Node's http module and is bypassed
+// by newer jsdom versions. Because the request is short-circuited before it
+// ever hits the network, no CORS preflight (OPTIONS) is performed, so only the
+// POST handlers need to be mocked.
+const server = setupServer()
+
+const corsHeaders = { 'access-control-allow-origin': '*' }
+
+beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
+afterEach(() => server.resetHandlers())
+afterAll(() => server.close())
+
 describe('XHRUpload', () => {
   it('should leverage hooks from fetcher', async () => {
-    nock('https://fake-endpoint.uppy.io')
-      .defaultReplyHeaders({
-        'access-control-allow-method': 'POST',
-        'access-control-allow-origin': '*',
-      })
-      .options('/')
-      .reply(204, {})
-      .post('/')
-      .reply(401, {})
-      .options('/')
-      .reply(204, {})
-      .post('/')
-      .reply(200, 'https://fake-endpoint.uppy.io/random-id')
+    let postCount = 0
+    server.use(
+      http.post('https://fake-endpoint.uppy.io/', () => {
+        postCount += 1
+        // First attempt fails (triggers a retry), second succeeds.
+        if (postCount === 1) {
+          return new HttpResponse(null, { status: 401, headers: corsHeaders })
+        }
+        return new HttpResponse('https://fake-endpoint.uppy.io/random-id', {
+          status: 200,
+          headers: corsHeaders,
+        })
+      }),
+    )
 
     const core = new Core<any, { url: string }>()
     const shouldRetry = vi.fn(() => true)
@@ -62,15 +86,14 @@ describe('XHRUpload', () => {
   })
 
   it('should send response object over upload-error event', async () => {
-    nock('https://fake-endpoint.uppy.io')
-      .defaultReplyHeaders({
-        'access-control-allow-method': 'POST',
-        'access-control-allow-origin': '*',
-      })
-      .options('/')
-      .reply(204, {})
-      .post('/')
-      .reply(400, { status: 400, message: 'Oh no' })
+    server.use(
+      http.post('https://fake-endpoint.uppy.io/', () =>
+        HttpResponse.json(
+          { status: 400, message: 'Oh no' },
+          { status: 400, headers: corsHeaders },
+        ),
+      ),
+    )
 
     const core = new Core()
     const shouldRetry = vi.fn(() => false)
@@ -123,13 +146,15 @@ describe('XHRUpload', () => {
 
   describe('headers', () => {
     it('can be a function', async () => {
-      const scope = nock('https://fake-endpoint.uppy.io').defaultReplyHeaders({
-        'access-control-allow-method': 'POST',
-        'access-control-allow-origin': '*',
-        'access-control-allow-headers': 'x-sample-header',
-      })
-      scope.options('/').reply(200, {})
-      scope.post('/').matchHeader('x-sample-header', 'test.jpg').reply(200, {})
+      let postCount = 0
+      let receivedHeader: string | null = null
+      server.use(
+        http.post('https://fake-endpoint.uppy.io/', ({ request }) => {
+          postCount += 1
+          receivedHeader = request.headers.get('x-sample-header')
+          return HttpResponse.json({}, { status: 200, headers: corsHeaders })
+        }),
+      )
 
       const core = new Core()
       core.use(XHRUpload, {
@@ -148,17 +173,20 @@ describe('XHRUpload', () => {
 
       await core.upload()
 
-      expect(scope.isDone()).toBe(true)
+      expect(postCount).toBe(1)
+      expect(receivedHeader).toBe('test.jpg')
     })
   })
 
   describe('endpoint', () => {
     it('can be a function', async () => {
-      const scope = nock('https://fake-endpoint.uppy.io').defaultReplyHeaders({
-        'access-control-allow-origin': '*',
-      })
-      scope.options('/upload/test.jpg').reply(200, {})
-      scope.post('/upload/test.jpg').reply(200, {})
+      let postCount = 0
+      server.use(
+        http.post('https://fake-endpoint.uppy.io/upload/test.jpg', () => {
+          postCount += 1
+          return HttpResponse.json({}, { status: 200, headers: corsHeaders })
+        }),
+      )
 
       const core = new Core()
       core.use(XHRUpload, {
@@ -178,15 +206,20 @@ describe('XHRUpload', () => {
 
       await core.upload()
 
-      expect(scope.isDone()).toBe(true)
+      expect(postCount).toBe(1)
     })
 
     it('can be a function (bundle)', async () => {
-      const scope = nock('https://fake-endpoint.uppy.io').defaultReplyHeaders({
-        'access-control-allow-origin': '*',
-      })
-      scope.options('/upload-bundle/test.jpg,test2.jpg').reply(200, {})
-      scope.post('/upload-bundle/test.jpg,test2.jpg').reply(200, {})
+      let postCount = 0
+      server.use(
+        http.post(
+          'https://fake-endpoint.uppy.io/upload-bundle/test.jpg,test2.jpg',
+          () => {
+            postCount += 1
+            return HttpResponse.json({}, { status: 200, headers: corsHeaders })
+          },
+        ),
+      )
 
       const core = new Core()
       core.use(XHRUpload, {
@@ -212,7 +245,7 @@ describe('XHRUpload', () => {
 
       await core.upload()
 
-      expect(scope.isDone()).toBe(true)
+      expect(postCount).toBe(1)
     })
   })
 })
diff --git a/yarn.lock b/yarn.lock
