expo 54.0.0-canary-20250722-599a28f → 54.0.0-canary-20250826-f475166

package/ios/AppDelegates/ExpoReactNativeFactory.swift

@@ -1,10 +1,23 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
-import React_RCTAppDelegate
+import React
 
-public class ExpoReactNativeFactory: RCTReactNativeFactory {
+@MainActor public class ExpoReactNativeFactory: RCTReactNativeFactory {
   private let reactDelegate = ExpoReactDelegate(handlers: ExpoAppDelegateSubscriberRepository.reactDelegateHandlers)
 
+  @objc public override init(delegate: any RCTReactNativeFactoryDelegate) {
+    let releaseLevel = (Bundle.main.object(forInfoDictionaryKey: "ReactNativeReleaseLevel") as? String)
+      .flatMap { [
+        "canary": RCTReleaseLevel.Canary,
+        "experimental": RCTReleaseLevel.Experimental,
+        "stable": RCTReleaseLevel.Stable
+      ][$0.lowercased()]
+      }
+    ?? RCTReleaseLevel.Stable
+
+    super.init(delegate: delegate, releaseLevel: releaseLevel)
+  }
+
   @objc func createRCTRootViewFactory() -> RCTRootViewFactory {
     // Alan: This is temporary. We need to cast to ExpoReactNativeFactoryDelegate here because currently, if you extend RCTReactNativeFactory
     // from Swift, customizeRootView will not work on the new arch because the cast to RCTRootView will never

package/ios/AppDelegates/ExpoReactNativeFactoryDelegate.swift

@@ -1,4 +1,4 @@
-import React_RCTAppDelegate
+import React
 
 open class ExpoReactNativeFactoryDelegate: RCTDefaultReactNativeFactoryDelegate {
   open override func customize(_ rootView: UIView) {

package/ios/AppDelegates/RCTAppDelegateUmbrella.h

@@ -14,7 +14,12 @@
 #endif // USE_HERMES
 #endif // __has_include(<reacthermes/HermesExecutorFactory.h>)
 
+#if __has_include(<React_RCTAppDelegate/React-RCTAppDelegate-umbrella.h>)
 #import <React_RCTAppDelegate/React-RCTAppDelegate-umbrella.h>
+#else
+#import <React_RCTAppDelegate/React_RCTAppDelegate-umbrella.h>
+#endif
+
 
 #if INLINE_USE_HERMES
 

package/ios/Fetch/ExpoFetchCustomExtension.swift

@@ -5,7 +5,7 @@
  */
 @objc(EXFetchCustomExtension)
 public class ExpoFetchCustomExtension: NSObject {
-  @objc
+  @MainActor @objc
   public static func setCustomURLSessionConfigurationProvider(_ provider: NSURLSessionConfigurationProvider?) {
     urlSessionConfigurationProvider = provider
   }

package/ios/Fetch/ExpoFetchModule.swift

@@ -1,11 +1,11 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
-import ExpoModulesCore
+@preconcurrency import ExpoModulesCore
 
 private let fetchRequestQueue = DispatchQueue(label: "expo.modules.fetch.RequestQueue")
-internal var urlSessionConfigurationProvider: NSURLSessionConfigurationProvider?
+@MainActor internal var urlSessionConfigurationProvider: NSURLSessionConfigurationProvider?
 
-public final class ExpoFetchModule: Module {
+@MainActor public final class ExpoFetchModule: @preconcurrency Module {
   private lazy var urlSession = createURLSession()
   private let urlSessionDelegate: URLSessionSessionDelegateProxy
 

package/ios/Fetch/ExpoURLSessionTask.swift

@@ -5,7 +5,7 @@ import ExpoModulesCore
 /**
  An URLSessionDataTask wrapper.
  */
-internal final class ExpoURLSessionTask: NSObject, URLSessionTaskDelegate, URLSessionDataDelegate {
+internal final class ExpoURLSessionTask: NSObject, URLSessionTaskDelegate, URLSessionDataDelegate, @unchecked Sendable {
   private let delegate: ExpoURLSessionTaskDelegate
   private var task: URLSessionDataTask?
 
@@ -88,7 +88,7 @@ internal final class ExpoURLSessionTask: NSObject, URLSessionTaskDelegate, URLSe
   }
 }
 
-internal protocol ExpoURLSessionTaskDelegate: AnyObject {
+internal protocol ExpoURLSessionTaskDelegate: AnyObject, Sendable {
   func urlSessionDidStart(_ session: ExpoURLSessionTask)
   func urlSession(_ session: ExpoURLSessionTask, didReceive response: URLResponse)
   func urlSession(_ session: ExpoURLSessionTask, didReceive data: Data)

package/ios/Fetch/NativeRequest.swift

@@ -5,7 +5,7 @@ import ExpoModulesCore
 /**
  A SharedObject for request.
  */
-internal final class NativeRequest: SharedObject {
+internal final class NativeRequest: SharedObject, @unchecked Sendable {
   internal let response: NativeResponse
   internal let task: ExpoURLSessionTask
 

package/ios/Fetch/NativeResponse.swift

@@ -5,7 +5,7 @@ import ExpoModulesCore
 /**
  A SharedObject for response.
  */
-internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate {
+internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate, @unchecked Sendable {
   internal let sink: ResponseSink
 
   private let dispatchQueue: DispatchQueue
@@ -72,7 +72,7 @@ internal final class NativeResponse: SharedObject, ExpoURLSessionTaskDelegate {
   /**
    Waits for given states and when it meets the requirement, executes the callback.
    */
-  func waitFor(states: [ResponseState], callback: @escaping (ResponseState) -> Void) {
+  func waitFor(states: [ResponseState], callback: @escaping @Sendable (ResponseState) -> Void) {
     if states.contains(state) {
       callback(state)
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "54.0.0-canary-20250722-599a28f",
+  "version": "54.0.0-canary-20250826-f475166",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -20,6 +20,7 @@
     "android",
     "bin",
     "build",
+    "internal",
     "ios",
     "scripts",
     "src",
@@ -43,7 +44,8 @@
     "requiresExtraSetup.json",
     "tsconfig.base.json",
     "types",
-    "virtual"
+    "virtual",
+    "template.tgz"
   ],
   "scripts": {
     "build": "expo-module build",
@@ -73,41 +75,41 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "1.0.0-canary-20250722-599a28f",
-    "@expo/config": "11.0.14-canary-20250722-599a28f",
-    "@expo/config-plugins": "10.0.4-canary-20250722-599a28f",
-    "@expo/fingerprint": "0.13.5-canary-20250722-599a28f",
-    "@expo/metro-config": "0.21.0-canary-20250722-599a28f",
-    "@expo/vector-icons": "^14.0.0",
-    "babel-preset-expo": "13.3.0-canary-20250722-599a28f",
-    "expo-asset": "11.2.0-canary-20250722-599a28f",
-    "expo-constants": "17.1.8-canary-20250722-599a28f",
-    "expo-file-system": "18.2.0-canary-20250722-599a28f",
-    "expo-font": "13.4.0-canary-20250722-599a28f",
-    "expo-keep-awake": "14.1.5-canary-20250722-599a28f",
-    "expo-modules-autolinking": "2.2.0-canary-20250722-599a28f",
-    "expo-modules-core": "2.6.0-canary-20250722-599a28f",
+    "@expo/cli": "0.26.4-canary-20250826-f475166",
+    "@expo/config": "12.0.5-canary-20250826-f475166",
+    "@expo/config-plugins": "11.0.5-canary-20250826-f475166",
+    "@expo/devtools": "0.1.4-canary-20250826-f475166",
+    "@expo/fingerprint": "0.14.4-canary-20250826-f475166",
+    "@expo/metro": "~0.1.1",
+    "@expo/metro-config": "0.21.6-canary-20250826-f475166",
+    "@expo/vector-icons": "^15.0.0",
+    "@ungap/structured-clone": "^1.3.0",
+    "babel-preset-expo": "14.0.4-canary-20250826-f475166",
+    "expo-asset": "12.0.5-canary-20250826-f475166",
+    "expo-constants": "18.0.5-canary-20250826-f475166",
+    "expo-file-system": "19.0.6-canary-20250826-f475166",
+    "expo-font": "14.0.4-canary-20250826-f475166",
+    "expo-keep-awake": "15.0.4-canary-20250826-f475166",
+    "expo-modules-autolinking": "3.0.4-canary-20250826-f475166",
+    "expo-modules-core": "3.0.7-canary-20250826-f475166",
     "pretty-format": "^29.7.0",
-    "react-native-edge-to-edge": "1.6.0",
+    "react-refresh": "^0.14.2",
     "whatwg-url-without-unicode": "8.0.0-3"
   },
   "devDependencies": {
     "@types/node": "^22.14.0",
-    "@types/react": "~19.0.10",
-    "@types/react-test-renderer": "^19.1.0",
-    "expo-module-scripts": "4.1.10-canary-20250722-599a28f",
+    "@types/react": "~19.1.10",
+    "@types/react-test-renderer": "~19.1.0",
+    "expo-module-scripts": "5.0.4-canary-20250826-f475166",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "react-native": "0.80.1",
-    "web-streams-polyfill": "^3.3.2",
-    "ws": "^8.18.0"
+    "react-native": "0.81.0",
+    "web-streams-polyfill": "^3.3.2"
   },
   "peerDependencies": {
-    "@expo/dom-webview": "0.1.6-canary-20250722-599a28f",
-    "@expo/metro-runtime": "6.0.0-canary-20250722-599a28f",
-    "metro-runtime": "*",
+    "@expo/dom-webview": "0.2.4-canary-20250826-f475166",
+    "@expo/metro-runtime": "6.1.1-canary-20250826-f475166",
     "react": "*",
-    "react-refresh": "*",
     "react-native": "*",
     "react-native-webview": "*"
   },

package/src/Expo.ts

@@ -21,9 +21,13 @@ export {
 } from 'expo-modules-core';
 
 export type {
+  /** @deprecated Move to `SharedRef` with a type-only import instead */
   SharedRef as SharedRefType,
+  /** @deprecated Move to `EventEmitter` with a type-only import instead */
   EventEmitter as EventEmitterType,
+  /** @deprecated Move to `NativeModule` with a type-only import instead */
   NativeModule as NativeModuleType,
+  /** @deprecated Move to `SharedObject` with a type-only import instead */
   SharedObject as SharedObjectType,
 } from 'expo-modules-core/types';
 

package/src/async-require/fetchAsync.native.ts

@@ -7,10 +7,27 @@
  */
 
 // @ts-expect-error
-import Networking from 'react-native/Libraries/Network/RCTNetworking';
+import { Networking } from 'react-native';
 
 type Subscriber = { remove: () => void };
 
+class LoadBundleFromServerError extends Error {
+  name = 'LoadBundleFromServerError';
+
+  constructor(
+    message: string,
+    public url: string,
+    public isTimeout: boolean,
+    options?: ErrorOptions
+  ) {
+    super(message, options);
+  }
+}
+
+class LoadBundleFromServerRequestError extends LoadBundleFromServerError {
+  name = 'LoadBundleFromServerRequestError';
+}
+
 export function fetchAsync(
   url: string
 ): Promise<{ body: string; status: number; headers: Record<string, string> }> {
@@ -21,9 +38,10 @@ export function fetchAsync(
   let dataListener: Subscriber | null = null;
   let completeListener: Subscriber | null = null;
   let responseListener: Subscriber | null = null;
+  let incrementalDataListener: Subscriber | null = null;
   return new Promise<{ body: string; status: number; headers: Record<string, string> }>(
     (resolve, reject) => {
-      const addListener = Networking.addListener.bind(Networking) as (
+      const addListener = Networking.addListener.bind() as (
         event: string,
         callback: (props: [string, any, any]) => any
       ) => Subscriber;
@@ -32,6 +50,18 @@ export function fetchAsync(
           responseText = response;
         }
       });
+      incrementalDataListener = addListener(
+        'didReceiveNetworkIncrementalData',
+        ([requestId, data]) => {
+          if (requestId === id) {
+            if (responseText != null) {
+              responseText += data;
+            } else {
+              responseText = data;
+            }
+          }
+        }
+      );
       responseListener = addListener(
         'didReceiveNetworkResponse',
         ([requestId, status, responseHeaders]) => {
@@ -41,15 +71,22 @@ export function fetchAsync(
           }
         }
       );
-      completeListener = addListener('didCompleteNetworkResponse', ([requestId, error]) => {
-        if (requestId === id) {
-          if (error) {
-            reject(error);
-          } else {
-            resolve({ body: responseText!, status: statusCode!, headers });
+      completeListener = addListener(
+        'didCompleteNetworkResponse',
+        ([requestId, error, isTimeout]) => {
+          if (requestId === id) {
+            if (error) {
+              reject(
+                new LoadBundleFromServerRequestError('Could not load bundle', url, isTimeout, {
+                  cause: error,
+                })
+              );
+            } else {
+              resolve({ body: responseText!, status: statusCode!, headers });
+            }
           }
         }
-      });
+      );
       (Networking.sendRequest as any)(
         'GET',
         'asyncRequest',
@@ -59,7 +96,7 @@ export function fetchAsync(
         },
         '',
         'text',
-        false,
+        true,
         0,
         (requestId: string) => {
           id = requestId;
@@ -71,5 +108,6 @@ export function fetchAsync(
     dataListener?.remove();
     completeListener?.remove();
     responseListener?.remove();
+    incrementalDataListener?.remove();
   });
 }

package/src/async-require/hmr.ts

@@ -8,8 +8,7 @@
  * Based on this but with web support:
  * https://github.com/facebook/react-native/blob/086714b02b0fb838dee5a66c5bcefe73b53cf3df/Libraries/Utilities/HMRClient.js
  */
-// @ts-expect-error: no types for MetroHMRClient
-import MetroHMRClient from 'metro-runtime/src/modules/HMRClient';
+import MetroHMRClient from '@expo/metro/metro-runtime/modules/HMRClient';
 import prettyFormat, { plugins } from 'pretty-format';
 import { DeviceEventEmitter } from 'react-native';
 

package/src/async-require/messageSocket.native.ts

@@ -1,7 +1,4 @@
 /* eslint-env browser */
-// @ts-expect-error: untyped module
-import WebSocket from 'react-native/Libraries/WebSocket/WebSocket';
-
 import getDevServer from './getDevServer';
 
 declare namespace globalThis {

package/src/winter/FormData.ts

@@ -74,15 +74,7 @@ function normalizeArgs(
 ): [string, File | string] {
   if (value instanceof Blob) {
     // @ts-expect-error: `Blob.data.blobId` is react-native's proprietary property.
-    if (value.data?.blobId != null) {
-      // For react-native created Blob objects,
-      // we need to keep its original form as-is without breaking functionality.
-      // However, we need to pass `name` for our file name handling.
-      // @ts-expect-error: Mutating the Blob object to add the `name` property.
-      value.name = blobFilename ?? 'blob';
-    } else {
-      value = { type: value.type, name: blobFilename ?? 'blob', blob: value };
-    }
+    value.name = blobFilename ?? blob.name ?? 'blob';
   } else if (typeof value !== 'object') {
     value = String(value);
   }

package/src/winter/__tests__/structuredClone.test.ios.ts

@@ -0,0 +1,27 @@
+describe('structuredClone', () => {
+  it(`uses the Expo built-in APIs`, () => {
+    expect((structuredClone as any)[Symbol.for('expo.builtin')]).toBe(true);
+  });
+
+  it(`clones primitives`, () => {
+    const obj = {
+      a: 1,
+      b: 'string',
+      c: [1, 2, 3],
+      d: { nested: true },
+      e: new Date(),
+      f: /regex/,
+      g: new Map([['key', 'value']]),
+      h: new Set([1, 2, 3]),
+    };
+
+    const cloned = structuredClone(obj);
+
+    expect(cloned).toEqual(obj);
+    expect(cloned).not.toBe(obj); // Ensure it's a deep clone
+    expect(cloned.e).toBeInstanceOf(Date);
+    expect(cloned.f).toBeInstanceOf(RegExp);
+    expect(cloned.g).toBeInstanceOf(Map);
+    expect(cloned.h).toBeInstanceOf(Set);
+  });
+});

package/src/winter/fetch/FetchResponse.ts

@@ -14,14 +14,14 @@ type UniversalFormData = globalThis.FormData & RNFormData;
  */
 export class FetchResponse extends ConcreteNativeResponse implements Response {
   private streamingState: 'none' | 'started' | 'completed' = 'none';
-  private bodyStream: ReadableStream<Uint8Array> | null = null;
+  private bodyStream: ReadableStream<Uint8Array<ArrayBuffer>> | null = null;
 
   constructor(private readonly abortCleanupFunction: AbortSubscriptionCleanupFunction) {
     super();
     this.addListener('readyForJSFinalization', this.finalize);
   }
 
-  get body(): ReadableStream<Uint8Array> | null {
+  get body(): ReadableStream<Uint8Array<ArrayBuffer>> | null {
     if (this.bodyStream == null) {
       const response = this;
 
@@ -35,7 +35,7 @@ export class FetchResponse extends ConcreteNativeResponse implements Response {
           if (response.streamingState === 'completed') {
             return;
           }
-          response.addListener('didReceiveResponseData', (data: Uint8Array) => {
+          response.addListener('didReceiveResponseData', (data: Uint8Array<ArrayBuffer>) => {
             if (!isControllerClosed) {
               controller.enqueue(data);
             }
@@ -113,7 +113,7 @@ export class FetchResponse extends ConcreteNativeResponse implements Response {
     return JSON.parse(text);
   }
 
-  async bytes(): Promise<Uint8Array> {
+  async bytes(): Promise<Uint8Array<ArrayBuffer>> {
     return new Uint8Array(await this.arrayBuffer());
   }
 

package/src/winter/fetch/NativeRequest.ts

@@ -32,7 +32,7 @@ export declare class NativeResponse extends SharedObject<NativeResponseEvents> {
   readonly statusText: string;
   readonly url: string;
   readonly redirected: boolean;
-  startStreaming(): Promise<Uint8Array | null>;
+  startStreaming(): Promise<Uint8Array<ArrayBuffer> | null>;
   cancelStreaming(reason: string): void;
   arrayBuffer(): Promise<ArrayBuffer>;
   text(): Promise<string>;

package/src/winter/fetch/RequestUtils.ts

@@ -31,6 +31,20 @@ export async function convertReadableStreamToUint8ArrayAsync(
   return result;
 }
 
+// Also accept instances that don't extend blob but have required methods (for filesystem and custom blob module)
+function isBlob(obj: any): obj is Blob {
+  if (typeof obj !== 'object') {
+    return false;
+  }
+  if (!('arrayBuffer' in obj)) {
+    return false;
+  }
+  if (!('type' in obj)) {
+    return false;
+  }
+  return true;
+}
+
 /**
  * Normalize a BodyInit object to a Uint8Array for NativeRequest
  */
@@ -54,7 +68,7 @@ export async function normalizeBodyInitAsync(
     return { body: new Uint8Array(body.buffer, body.byteOffset, body.byteLength) };
   }
 
-  if (body instanceof Blob) {
+  if (body instanceof Blob || isBlob(body)) {
     return {
       body: new Uint8Array(await blobToArrayBufferAsync(body)),
       overriddenHeaders: [['Content-Type', body.type]],

package/src/winter/fetch/__tests__/RequestUtils-test.ts

@@ -5,7 +5,7 @@
 
 import { TextDecoder, TextEncoder } from 'node:util';
 import RNFormData from 'react-native/Libraries/Network/FormData';
-import { ReadableStream } from 'web-streams-polyfill';
+import { ReadableStream as WebReadableStream } from 'web-streams-polyfill';
 
 import { type NativeHeadersType } from '../NativeRequest';
 import {
@@ -25,12 +25,12 @@ globalThis.TextEncoder ??= TextEncoder;
 
 describe(convertReadableStreamToUint8ArrayAsync, () => {
   it('should convert a readable stream to a Uint8Array', async () => {
-    const stream = new ReadableStream<Uint8Array>({
+    const stream = new WebReadableStream<Uint8Array>({
       start(controller) {
         controller.enqueue(new TextEncoder().encode('Hello, world!'));
         controller.close();
       },
-    });
+    }) as ReadableStream<Uint8Array>;
 
     const result = await convertReadableStreamToUint8ArrayAsync(stream);
     const resultString = new TextDecoder().decode(result);
@@ -38,22 +38,22 @@ describe(convertReadableStreamToUint8ArrayAsync, () => {
   });
 
   it('should handle an empty readable stream', async () => {
-    const stream = new ReadableStream({
+    const stream = new WebReadableStream({
       start(controller) {
         controller.close();
       },
-    });
+    }) as ReadableStream;
 
     const result = await convertReadableStreamToUint8ArrayAsync(stream);
     expect(result).toEqual(new Uint8Array());
   });
 
   it('should handle errors in the readable stream', async () => {
-    const stream = new ReadableStream({
+    const stream = new WebReadableStream({
       start(controller) {
         controller.error(new Error('Stream error'));
       },
-    });
+    }) as ReadableStream;
 
     await expect(convertReadableStreamToUint8ArrayAsync(stream)).rejects.toThrow('Stream error');
   });

package/src/winter/fetch/__tests__/convertFormData-test.native.ts

@@ -59,9 +59,7 @@ describe(convertFormDataAsync, () => {
   it(`should convert expo-file-system FileBlob`, async () => {
     const formData = new ExpoFormData();
     const mockFileBlob = {
-      file: {
-        bytes: () => new Uint8Array([65, 66, 67]),
-      },
+      bytes: () => new Uint8Array([65, 66, 67]),
     };
     // @ts-ignore
     formData.append('blob', mockFileBlob);

package/src/winter/fetch/convertFormData.ts

@@ -1,4 +1,33 @@
 import { blobToArrayBufferAsync } from '../../utils/blobUtils';
+import { type ExpoFormDataValue } from '../FormData';
+
+function encodeFilename(filename: string): string {
+  return encodeURIComponent(filename.replace(/\//g, '_'));
+}
+
+type ExpoFormHeaders = {
+  'content-disposition': string | undefined;
+  'content-type': string | undefined;
+};
+
+function getFormDataPartHeaders(part: ExpoFormDataValue, name: string) {
+  const contentDisposition = 'form-data; name="' + name + '"';
+
+  const headers: ExpoFormHeaders = {
+    'content-disposition': contentDisposition,
+    'content-type': undefined,
+  };
+
+  if (typeof part === 'object') {
+    if ('name' in part && typeof part.name === 'string') {
+      headers['content-disposition'] += `; filename="${encodeFilename(part.name)}"`;
+    }
+    if ('type' in part && typeof part.type === 'string') {
+      headers['content-type'] = part.type;
+    }
+  }
+  return headers;
+}
 
 /**
  * Convert FormData to Uint8Array with a boundary
@@ -10,40 +39,40 @@ export async function convertFormDataAsync(
   formData: FormData,
   boundary: string = createBoundary()
 ): Promise<{ body: Uint8Array; boundary: string }> {
-  // @ts-expect-error: React Native's FormData is not compatible with the web's FormData
-  if (typeof formData.getParts !== 'function') {
-    throw new Error('Unsupported FormData implementation');
+  if (typeof formData.entries !== 'function') {
+    // @ts-expect-error: React Native's FormData is not 100% compatible with ours
+    if (typeof formData.getParts == 'function') {
+      formData.entries = function () {
+        // @ts-expect-error
+        return formData.getParts().map((part) => {
+          if (part.string) return part.string;
+          if (part.file) return part.file;
+          if (part.blob) return part.blob;
+        });
+      };
+    } else {
+      throw new Error('Unsupported FormData implementation');
+    }
   }
   // @ts-expect-error: React Native's FormData is not 100% compatible with ours
-  const parts: ExpoFormDataPart[] = formData.getParts();
+  const entries: [string, ExpoFormDataValue][] = formData.entries();
 
   const results: (Uint8Array | string)[] = [];
-  for (const entry of parts) {
+  for (const [name, entry] of entries) {
     results.push(`--${boundary}\r\n`);
-    for (const [headerKey, headerValue] of Object.entries(entry.headers)) {
-      results.push(`${headerKey}: ${headerValue}\r\n`);
+    for (const [headerKey, headerValue] of Object.entries(getFormDataPartHeaders(entry, name))) {
+      if (headerValue) {
+        results.push(`${headerKey}: ${headerValue}\r\n`);
+      }
     }
     results.push(`\r\n`);
-    if ('string' in entry) {
-      results.push(entry.string);
-    } else if ('file' in entry) {
-      results.push(entry.file.bytes());
-    } else if ('blob' in entry) {
-      results.push(new Uint8Array(await blobToArrayBufferAsync(entry.blob)));
-    } else if (entry._data?.blobId != null) {
-      // When `FormData.getParts()` is called, React Native will use the spread syntax to copy the object and lose the Blob type info.
-      // We should find the original Blob instance from the `FormData._parts` internal properties.
-      // @ts-expect-error: react-native's proprietary Blob type
-      const formDatum = formData._parts?.find(
-        ([_name, value]: [name: string, value: any]) => value.data?.blobId === entry._data.blobId
-      );
-      if (formDatum == null) {
-        throw new Error('Cannot find the original Blob instance from FormData');
-      }
-      if (!(formDatum[1] instanceof Blob)) {
-        throw new Error('Unexpected value type for Blob entry in FormData');
-      }
-      results.push(new Uint8Array(await blobToArrayBufferAsync(formDatum[1])));
+    if (typeof entry === 'string') {
+      results.push(entry);
+    } else if (entry instanceof Blob) {
+      results.push(new Uint8Array(await blobToArrayBufferAsync(entry)));
+    } else if (typeof entry === 'object' && 'bytes' in entry) {
+      // @ts-expect-error: File or ExpoBlob don't extend Blob but implement the interface.
+      results.push(await entry.bytes());
     } else {
       throw new Error('Unsupported FormDataPart implementation');
     }