expo 56.0.8 → 56.0.10

package/android/build.gradle

@@ -10,7 +10,7 @@ buildscript {
 }
 
 group = 'host.exp.exponent'
-version = '56.0.8'
+version = '56.0.10'
 
 expoModule {
   // We can't prebuild the module because it depends on the generated files.
@@ -21,7 +21,7 @@ android {
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "56.0.8"
+    versionName "56.0.10"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

package/android/src/main/java/expo/modules/fetch/NativeRequest.kt

@@ -6,9 +6,11 @@ import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.sharedobjects.SharedObject
 import okhttp3.Call
 import okhttp3.CookieJar
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import java.net.URL
 
@@ -16,6 +18,19 @@ private data class RequestHolder(var request: Request?)
 
 internal val METHODS_REQUIRING_BODY = arrayOf("POST", "PUT", "PATCH")
 
+internal fun buildRequestBody(method: String, requestBody: ByteArray?, mediaType: MediaType?): RequestBody? {
+  return requestBody?.toRequestBody(mediaType) ?: run {
+    // OkHttp requires a non-null body for POST/PATCH/PUT, unlike WinterTC fetch. Provide an empty
+    // (zero-length) body to match it, not `byteArrayOf(0)`, which sends a single 0x00 byte.
+    // Ref: https://github.com/expo/expo/issues/46668
+    if (method in METHODS_REQUIRING_BODY) {
+      ByteArray(0).toRequestBody(mediaType)
+    } else {
+      null
+    }
+  }
+}
+
 internal class NativeRequest(appContext: AppContext, internal val response: NativeResponse) :
   SharedObject(appContext) {
   private val requestHolder = RequestHolder(null)
@@ -36,17 +51,7 @@ internal class NativeRequest(appContext: AppContext, internal val response: Nati
 
     val headers = requestInit.headers.toHeaders()
     val mediaType = headers["Content-Type"]?.toMediaTypeOrNull()
-    val reqBody = requestBody?.toRequestBody(mediaType) ?: run {
-      // OkHttp requires a non-null body for POST, PATCH, and PUT requests.
-      // WinterTC fetch, however, does not have this limitation.
-      // Provide an empty body to make OkHttp behave like WinterTC fetch.
-      // Ref: https://github.com/expo/expo/issues/35950#issuecomment-3245173248
-      if (requestInit.method in METHODS_REQUIRING_BODY) {
-        byteArrayOf(0).toRequestBody(mediaType)
-      } else {
-        null
-      }
-    }
+    val reqBody = buildRequestBody(requestInit.method, requestBody, mediaType)
     val request = Request.Builder()
       .headers(headers)
       .method(requestInit.method, reqBody)

package/android/src/test/java/expo/modules/fetch/NativeRequestTest.kt

@@ -0,0 +1,33 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+package expo.modules.fetch
+
+import com.google.common.truth.Truth.assertThat
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import org.junit.Test
+
+class NativeRequestTest {
+  private val jsonMediaType = "application/json".toMediaTypeOrNull()
+
+  @Test
+  fun `null body on a method requiring a body produces an empty body, not a null byte`() {
+    val body = buildRequestBody("POST", null, jsonMediaType)
+    assertThat(body).isNotNull()
+    // Regression test for https://github.com/expo/expo/issues/46668:
+    // OkHttp requires a non-null body for POST/PUT/PATCH, but the body must be
+    // empty (Content-Length: 0) rather than a single 0x00 byte (Content-Length: 1).
+    assertThat(body!!.contentLength()).isEqualTo(0L)
+  }
+
+  @Test
+  fun `null body on a method not requiring a body produces no body`() {
+    assertThat(buildRequestBody("GET", null, jsonMediaType)).isNull()
+  }
+
+  @Test
+  fun `a provided body is preserved`() {
+    val body = buildRequestBody("POST", "hello".toByteArray(), jsonMediaType)
+    assertThat(body).isNotNull()
+    assertThat(body!!.contentLength()).isEqualTo(5L)
+  }
+}

package/bundledNativeModules.json

@@ -1,8 +1,8 @@
 {
-  "@expo/fingerprint": "~0.19.3",
-  "@expo/metro-runtime": "~56.0.13",
+  "@expo/fingerprint": "~0.19.4",
+  "@expo/metro-runtime": "~56.0.15",
   "@expo/vector-icons": "^15.0.2",
-  "@expo/ui": "~56.0.15",
+  "@expo/ui": "~56.0.17",
   "@react-native-async-storage/async-storage": "2.2.0",
   "@react-native-community/datetimepicker": "9.1.0",
   "@react-native-masked-view/masked-view": "0.3.2",
@@ -16,28 +16,28 @@
   "expo-analytics-amplitude": "~11.3.0",
   "expo-app-auth": "~11.1.0",
   "expo-app-loader-provider": "~8.0.0",
-  "expo-app-metrics": "~56.0.16",
+  "expo-app-metrics": "~56.0.18",
   "expo-apple-authentication": "~56.0.4",
   "expo-application": "~56.0.3",
-  "expo-asset": "~56.0.15",
-  "expo-audio": "~56.0.11",
-  "expo-auth-session": "~56.0.13",
-  "expo-background-fetch": "~56.0.16",
-  "expo-background-task": "~56.0.16",
+  "expo-asset": "~56.0.17",
+  "expo-audio": "~56.0.12",
+  "expo-auth-session": "~56.0.14",
+  "expo-background-fetch": "~56.0.18",
+  "expo-background-task": "~56.0.18",
   "expo-battery": "~56.0.4",
   "expo-blur": "~56.0.3",
   "expo-brightness": "~56.0.5",
-  "expo-brownfield": "~56.0.17",
-  "expo-build-properties": "~56.0.16",
+  "expo-brownfield": "~56.0.19",
+  "expo-build-properties": "~56.0.18",
   "expo-calendar": "~56.0.8",
   "expo-camera": "~56.0.7",
   "expo-cellular": "~56.0.5",
   "expo-checkbox": "~56.0.1",
-  "expo-clipboard": "~56.0.3",
-  "expo-constants": "~56.0.16",
-  "expo-contacts": "~56.0.7",
+  "expo-clipboard": "~56.0.4",
+  "expo-constants": "~56.0.18",
+  "expo-contacts": "~56.0.8",
   "expo-crypto": "~56.0.4",
-  "expo-dev-client": "~56.0.18",
+  "expo-dev-client": "~56.0.20",
   "expo-device": "~56.0.4",
   "expo-document-picker": "~56.0.4",
   "expo-file-system": "~56.0.7",
@@ -46,55 +46,55 @@
   "expo-glass-effect": "~56.0.4",
   "expo-google-app-auth": "~8.3.0",
   "expo-haptics": "~56.0.3",
-  "expo-image": "~56.0.9",
+  "expo-image": "~56.0.11",
   "expo-image-loader": "~56.0.3",
-  "expo-image-manipulator": "~56.0.16",
-  "expo-image-picker": "~56.0.15",
+  "expo-image-manipulator": "~56.0.18",
+  "expo-image-picker": "~56.0.17",
   "expo-intent-launcher": "~56.0.4",
-  "expo-insights": "~56.0.15",
+  "expo-insights": "~56.0.17",
   "expo-keep-awake": "~56.0.3",
   "expo-linear-gradient": "~56.0.4",
-  "expo-linking": "~56.0.13",
+  "expo-linking": "~56.0.14",
   "expo-local-authentication": "~56.0.4",
   "expo-localization": "~56.0.6",
-  "expo-location": "~56.0.15",
+  "expo-location": "~56.0.17",
   "expo-mail-composer": "~56.0.4",
   "expo-manifests": "~56.0.4",
   "expo-maps": "~56.0.6",
   "expo-mcp": "~0.2.1",
   "expo-media-library": "~56.0.6",
   "expo-mesh-gradient": "~56.0.3",
-  "expo-module-template": "~56.0.12",
-  "expo-modules-core": "~56.0.14",
+  "expo-module-template": "~56.0.13",
+  "expo-modules-core": "~56.0.16",
   "expo-navigation-bar": "~56.0.3",
-  "expo-network": "~56.0.4",
-  "expo-notifications": "~56.0.15",
-  "expo-observe": "~56.0.18",
+  "expo-network": "~56.0.5",
+  "expo-notifications": "~56.0.17",
+  "expo-observe": "~56.0.20",
   "expo-print": "~56.0.3",
   "expo-live-photo": "~56.0.3",
-  "expo-router": "~56.2.8",
+  "expo-router": "~56.2.10",
   "expo-screen-capture": "~56.0.4",
   "expo-screen-orientation": "~56.0.5",
   "expo-secure-store": "~56.0.4",
-  "expo-sensors": "~56.0.5",
-  "expo-server": "~56.0.4",
-  "expo-sharing": "~56.0.15",
+  "expo-sensors": "~56.0.6",
+  "expo-server": "~56.0.5",
+  "expo-sharing": "~56.0.17",
   "expo-sms": "~56.0.3",
   "expo-speech": "~56.0.3",
   "expo-splash-screen": "~56.0.10",
-  "expo-sqlite": "~56.0.4",
+  "expo-sqlite": "~56.0.5",
   "expo-status-bar": "~56.0.4",
   "expo-store-review": "~56.0.3",
-  "expo-symbols": "~56.0.5",
+  "expo-symbols": "~56.0.6",
   "expo-system-ui": "~56.0.5",
-  "expo-task-manager": "~56.0.16",
+  "expo-task-manager": "~56.0.18",
   "expo-tracking-transparency": "~56.0.5",
-  "expo-updates": "~56.0.17",
+  "expo-updates": "~56.0.19",
   "expo-video-thumbnails": "~56.0.3",
-  "expo-video": "~56.1.2",
+  "expo-video": "~56.1.3",
   "expo-web-browser": "~56.0.5",
-  "expo-widgets": "~56.0.16",
-  "jest-expo": "~56.0.4",
+  "expo-widgets": "~56.0.18",
+  "jest-expo": "~56.0.5",
   "lottie-react-native": "~7.3.4",
   "react": "19.2.3",
   "react-dom": "19.2.3",

package/ios/AppDelegates/ExpoReactNativeFactory.h

@@ -7,6 +7,11 @@
 @protocol RCTHostRuntimeDelegate;
 
 NS_SWIFT_NAME(ExpoReactNativeFactoryObjC)
+#if !TARGET_OS_OSX
 @interface EXReactNativeFactory : RCTReactNativeFactory <RCTHostDelegate>
+#else
+// TODO: remove when bumping to react-native-macos 0.85
+@interface EXReactNativeFactory : RCTReactNativeFactory <RCTHostDelegate, RCTHostRuntimeDelegate>
+#endif
 
 @end

package/ios/AppDelegates/ExpoReactNativeFactory.mm

@@ -28,6 +28,14 @@
 
 #pragma mark - RCTHostDelegate
 
+#if TARGET_OS_OSX
+// TODO: remove when bumping react-native-macos to 0.85
+- (void)hostDidStart:(nonnull RCTHost *)host
+{
+  host.runtimeDelegate = self;
+}
+#endif
+
 // [JS thread]
 - (void)host:(nonnull RCTHost *)host didInitializeRuntime:(facebook::jsi::Runtime &)runtime
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "56.0.8",
+  "version": "56.0.10",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -68,25 +68,25 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "^56.1.13",
+    "@expo/cli": "^56.1.15",
     "@expo/config": "~56.0.9",
     "@expo/config-plugins": "~56.0.8",
     "@expo/devtools": "~56.0.2",
     "@expo/dom-webview": "~56.0.5",
-    "@expo/fingerprint": "^0.19.3",
+    "@expo/fingerprint": "^0.19.4",
     "@expo/local-build-cache-provider": "^56.0.8",
-    "@expo/log-box": "^56.0.12",
+    "@expo/log-box": "^56.0.13",
     "@expo/metro": "~56.0.0",
-    "@expo/metro-config": "~56.0.13",
+    "@expo/metro-config": "~56.0.14",
     "@ungap/structured-clone": "^1.3.0",
-    "babel-preset-expo": "~56.0.14",
-    "expo-asset": "~56.0.15",
-    "expo-constants": "~56.0.16",
+    "babel-preset-expo": "~56.0.15",
+    "expo-asset": "~56.0.17",
+    "expo-constants": "~56.0.18",
     "expo-file-system": "~56.0.7",
     "expo-font": "~56.0.5",
     "expo-keep-awake": "~56.0.3",
-    "expo-modules-autolinking": "~56.0.14",
-    "expo-modules-core": "~56.0.14",
+    "expo-modules-autolinking": "~56.0.15",
+    "expo-modules-core": "~56.0.16",
     "pretty-format": "^29.7.0",
     "react-refresh": "^0.14.2",
     "whatwg-url-minimum": "^0.1.2"
@@ -101,8 +101,8 @@
     "rimraf": "^6.1.2",
     "web-streams-polyfill": "^3.3.2",
     "@expo/dom-webview": "56.0.5",
-    "expo-updates": "56.0.17",
-    "@expo/metro-runtime": "56.0.13"
+    "@expo/metro-runtime": "56.0.15",
+    "expo-updates": "56.0.19"
   },
   "peerDependencies": {
     "@expo/dom-webview": "*",
@@ -139,7 +139,7 @@
       "scripts/resolveAppEntry.js"
     ]
   },
-  "gitHead": "7df487c3b35d509e8988c87c0abcf8a7d76aa202",
+  "gitHead": "b1e94a5c1c5b19472a42ca25752a3533699bc46a",
   "scripts": {
     "build": "tsc",
     "clean": "rimraf build",

package/src/async-require/__tests__/asyncRequireModule.test.ts

@@ -63,18 +63,35 @@ describe('asyncRequireModule', () => {
       }
 
       function asyncRequireImpl(moduleID, paths, moduleName) {
-        var maybeLoadBundlePromise = maybeLoadBundle(moduleID, paths);
         var importAll = function() { return require.importAll(moduleID, moduleName); };
-
-        if (maybeLoadBundlePromise != null) {
-          return maybeLoadBundlePromise.then(importAll);
+        try {
+          // Try importing first to skip bundle loading when the bundle is already preloaded.
+          return importAll();
+        } catch (error) {
+          var maybeLoadBundlePromise = maybeLoadBundle(moduleID, paths);
+          if (maybeLoadBundlePromise != null) {
+            return maybeLoadBundlePromise.then(importAll);
+          }
+          throw error;
         }
-
-        return importAll();
       }
 
-      async function asyncRequire(moduleID, paths, moduleName) {
-        return asyncRequireImpl(moduleID, paths, moduleName);
+      function asyncRequire(moduleID, paths, moduleName) {
+        var ret = asyncRequireImpl(moduleID, paths, moduleName);
+        if (!(ret instanceof Promise)) {
+          return {
+            _result: ret,
+            then: function(resolve, reject) {
+              return Promise.resolve(ret).then(resolve, reject);
+            },
+          };
+        }
+        return {
+          _result: ret,
+          then: function(resolve, reject) {
+            return ret.then(resolve, reject);
+          },
+        };
       }
 
       asyncRequire.unstable_importMaybeSync = function(moduleID, paths) {
@@ -112,7 +129,13 @@ describe('asyncRequireModule', () => {
     expect(result).toEqual({ default: 'module-42' });
   });
 
-  it('passes moduleName through when bundle loading is required', async () => {
+  it('falls back to bundle load when importAll throws, then retries with moduleName', async () => {
+    mockImportAll
+      .mockImplementationOnce(() => {
+        throw new Error('Module not loaded');
+      })
+      .mockImplementationOnce(() => ({ default: 'module-42' }));
+
     let resolveBundle!: () => void;
     const bundlePromise = new Promise<void>((resolve) => {
       resolveBundle = resolve;
@@ -123,17 +146,62 @@ describe('asyncRequireModule', () => {
     const paths = { '42': '/bundles/my-module.bundle' };
     const resultPromise = asyncRequire(42, paths, 'my-module');
 
-    // importAll should not have been called yet (waiting for bundle)
-    expect(mockImportAll).not.toHaveBeenCalled();
+    // Initial importAll attempt happened; second is gated on the bundle promise.
+    expect(mockImportAll).toHaveBeenCalledTimes(1);
+    expect((globalThis as any).__loadBundleAsync).toHaveBeenCalledWith('/bundles/my-module.bundle');
 
-    // Resolve the bundle loading
     resolveBundle();
     const result = await resultPromise;
 
+    expect(mockImportAll).toHaveBeenCalledTimes(2);
+    expect(mockImportAll).toHaveBeenLastCalledWith(42, 'my-module');
+    expect(result).toEqual({ default: 'module-42' });
+  });
+
+  it('does not load the bundle when importAll succeeds (preloaded bundle case)', async () => {
+    (globalThis as any).__loadBundleAsync = jest.fn(() => Promise.resolve());
+
+    const paths = { '42': '/bundles/my-module.bundle' };
+    const result = await asyncRequire(42, paths, 'my-module');
+
     expect(mockImportAll).toHaveBeenCalledWith(42, 'my-module');
+    expect((globalThis as any).__loadBundleAsync).not.toHaveBeenCalled();
     expect(result).toEqual({ default: 'module-42' });
   });
 
+  it('re-throws the import error when no bundle path is configured', () => {
+    mockImportAll.mockImplementationOnce(() => {
+      throw new Error('Module not loaded');
+    });
+
+    expect(() => asyncRequire(42, null, 'my-module')).toThrow('Module not loaded');
+  });
+
+  describe('thenable return value', () => {
+    it('exposes a synchronous _result when no bundle load was needed', () => {
+      const ret = asyncRequire(42, null, 'my-module');
+
+      expect(typeof ret.then).toBe('function');
+      expect(ret._result).toEqual({ default: 'module-42' });
+    });
+
+    it('exposes a Promise _result when a bundle load was needed', async () => {
+      mockImportAll
+        .mockImplementationOnce(() => {
+          throw new Error('Module not loaded');
+        })
+        .mockImplementationOnce(() => ({ default: 'module-42' }));
+
+      (globalThis as any).__loadBundleAsync = jest.fn(() => Promise.resolve());
+
+      const ret = asyncRequire(42, { '42': '/bundles/my-module.bundle' }, 'my-module');
+
+      expect(typeof ret.then).toBe('function');
+      expect(ret._result).toBeInstanceOf(Promise);
+      await expect(ret._result).resolves.toEqual({ default: 'module-42' });
+    });
+  });
+
   describe('unstable_importMaybeSync', () => {
     it('returns synchronously when no bundle loading needed', () => {
       const result = asyncRequire.unstable_importMaybeSync(42, null);

package/src/async-require/asyncRequireModule.ts

@@ -67,22 +67,43 @@ function asyncRequireImpl<T>(
   paths: DependencyMapPaths,
   moduleName?: string
 ): Promise<T> | T {
-  const maybeLoadBundlePromise = maybeLoadBundle(moduleID, paths);
   const importAll = () => (require as unknown as MetroRequire).importAll<T>(moduleID, moduleName);
-
-  if (maybeLoadBundlePromise != null) {
-    return maybeLoadBundlePromise.then(importAll);
+  try {
+    // Try importing first to prevent double-loading script when the page already preloaded it
+    return importAll();
+  } catch (error) {
+    const maybeLoadBundlePromise = maybeLoadBundle(moduleID, paths);
+    if (maybeLoadBundlePromise != null) {
+      return maybeLoadBundlePromise.then(importAll);
+    }
+    throw error;
   }
-
-  return importAll();
 }
 
-async function asyncRequire<T>(
+function asyncRequire<T>(
   moduleID: number,
   paths: DependencyMapPaths,
   moduleName?: string
-): Promise<T> {
-  return asyncRequireImpl<T>(moduleID, paths, moduleName);
+): PromiseLike<T> & { _result?: T | Promise<T> } {
+  const ret = asyncRequireImpl<T>(moduleID, paths, moduleName);
+  if (!(ret instanceof Promise)) {
+    // We return a thenable with an added `unstable_importMaybeSync`-like
+    // `_result` property to bypass this being force-converted to a promise
+    // for rehydration
+    return {
+      _result: ret,
+      then(resolve, reject) {
+        return Promise.resolve(ret).then(resolve, reject);
+      },
+    };
+  } else {
+    return {
+      _result: ret,
+      then(resolve, reject) {
+        return ret.then(resolve, reject);
+      },
+    };
+  }
 }
 
 // Synchronous version of asyncRequire, which can still return a promise

package/src/async-require/setupHMR.ts

@@ -1,3 +1,5 @@
+import type * as React from 'react';
+
 import HMRClient from './hmr';
 
 if (typeof window !== 'undefined') {
@@ -17,11 +19,64 @@ if (typeof window !== 'undefined') {
   LEVELS.forEach((level) => {
     const originalFunction = console[level];
     console[level] = function (...args: any[]) {
-      HMRClient.log(level, args);
+      HMRClient.log(level, level === 'error' ? addErrorStacks(args, true) : args);
       originalFunction.apply(console, args);
     };
   });
+
+  window.addEventListener('error', (event) => {
+    // Not capturing current stack as it would only point to this function,
+    // the stack chain is preserved by the browser.
+    HMRClient.log('error', addErrorStacks([event.error]));
+  });
+
+  window.addEventListener('unhandledrejection', (event) => {
+    // Not capturing current stack as it would only point to this function,
+    // the stack chain is preserved by the browser.
+    HMRClient.log('error', addErrorStacks([event.reason]));
+  });
 }
 
 // This is called native on native platforms
 HMRClient.setup({ isEnabled: true });
+
+function addErrorStacks(data: unknown[], shouldCaptureCurrentStack = false) {
+  const dataWithStacks = [...data];
+  let hasStack = false;
+  data.forEach((item) => {
+    // on native handled in packages/@expo/metro-runtime/src/metroServerLogs.native.ts
+    // https://github.com/expo/expo/blob/118528654c982b6df2f4b3e73bbf2ae0b78d84a2/packages/%40expo/metro-runtime/src/metroServerLogs.native.ts#L30
+    // this differs from native implementation where error from native modules
+    // would not pass instanceof Error check
+    if (item instanceof Error && item.stack) {
+      hasStack = true;
+      dataWithStacks.push(item.stack);
+    }
+  });
+
+  if (!hasStack && shouldCaptureCurrentStack) {
+    // for console.* to point to the call site
+    const stack = captureCurrentStack();
+    if (typeof stack === 'string') {
+      hasStack = true;
+      dataWithStacks.push(stack);
+    }
+  }
+
+  const react = require('react') as typeof React;
+  const componentStack = react.captureOwnerStack?.();
+  if (componentStack) {
+    dataWithStacks.push(componentStack);
+  }
+
+  return dataWithStacks;
+}
+
+class NamelessError extends Error {
+  name = '';
+}
+
+function captureCurrentStack() {
+  // If you're reading this, look deeper into the call stack to find the actual error source.
+  return new NamelessError().stack;
+}