expo 54.0.31 → 54.0.33

package/android/build.gradle

@@ -32,7 +32,7 @@ buildscript {
 def reactNativeVersion = project.extensions.getByType(ExpoModuleExtension).reactNativeVersion
 
 group = 'host.exp.exponent'
-version = '54.0.31'
+version = '54.0.33'
 
 expoModule {
   // We can't prebuild the module because it depends on the generated files.
@@ -43,7 +43,7 @@ android {
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "54.0.31"
+    versionName "54.0.33"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

package/build/async-require/hmr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../../src/async-require/hmr.ts"],"names":[],"mappings":"AA4CA,KAAK,QAAQ,GACT,OAAO,GACP,MAAM,GACN,MAAM,GACN,OAAO,GACP,KAAK,GACL,OAAO,GACP,gBAAgB,GAChB,UAAU,GACV,OAAO,CAAC;AAEZ,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;IAChB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACxC,KAAK,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CAC5C,CAAC;AAMF;;;GAGG;AACH,QAAA,MAAM,SAAS,EAAE,wBAwMhB,CAAC;AAuEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"hmr.d.ts","sourceRoot":"","sources":["../../src/async-require/hmr.ts"],"names":[],"mappings":"AA4CA,KAAK,QAAQ,GACT,OAAO,GACP,MAAM,GACN,MAAM,GACN,OAAO,GACP,KAAK,GACL,OAAO,GACP,gBAAgB,GAChB,UAAU,GACV,OAAO,CAAC;AAEZ,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;IAChB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACxC,KAAK,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CAC5C,CAAC;AAMF;;;GAGG;AACH,QAAA,MAAM,SAAS,EAAE,wBAiMhB,CAAC;AA4EF,eAAe,SAAS,CAAC"}

package/bundledNativeModules.json

@@ -41,8 +41,8 @@
   "expo-device": "~8.0.10",
   "expo-document-picker": "~14.0.8",
   "expo-file-system": "~19.0.21",
-  "expo-font": "~14.0.10",
-  "expo-gl": "~16.0.9",
+  "expo-font": "~14.0.11",
+  "expo-gl": "~16.0.10",
   "expo-glass-effect": "~0.1.8",
   "expo-google-app-auth": "~8.3.0",
   "expo-haptics": "~15.0.8",
@@ -71,7 +71,7 @@
   "expo-notifications": "~0.32.16",
   "expo-print": "~15.0.8",
   "expo-live-photo": "~1.0.8",
-  "expo-router": "~6.0.21",
+  "expo-router": "~6.0.23",
   "expo-screen-capture": "~8.0.9",
   "expo-screen-orientation": "~9.0.8",
   "expo-secure-store": "~15.0.8",
@@ -92,7 +92,7 @@
   "expo-video-thumbnails": "~10.0.8",
   "expo-video": "~3.0.15",
   "expo-web-browser": "~15.0.10",
-  "jest-expo": "~54.0.16",
+  "jest-expo": "~54.0.17",
   "lottie-react-native": "~7.3.1",
   "react": "19.1.0",
   "react-dom": "19.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "54.0.31",
+  "version": "54.0.33",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -75,20 +75,20 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "54.0.21",
+    "@expo/cli": "54.0.23",
     "@expo/config": "~12.0.13",
     "@expo/config-plugins": "~54.0.4",
     "@expo/devtools": "0.1.8",
     "@expo/fingerprint": "0.15.4",
     "@expo/metro": "~54.2.0",
-    "@expo/metro-config": "54.0.13",
+    "@expo/metro-config": "54.0.14",
     "@expo/vector-icons": "^15.0.3",
     "@ungap/structured-clone": "^1.3.0",
-    "babel-preset-expo": "~54.0.9",
+    "babel-preset-expo": "~54.0.10",
     "expo-asset": "~12.0.12",
     "expo-constants": "~18.0.13",
     "expo-file-system": "~19.0.21",
-    "expo-font": "~14.0.10",
+    "expo-font": "~14.0.11",
     "expo-keep-awake": "~15.0.8",
     "expo-modules-autolinking": "3.0.24",
     "expo-modules-core": "3.0.29",
@@ -124,5 +124,5 @@
       "optional": true
     }
   },
-  "gitHead": "e615daa250a27c60da3cea1f0572dcde93df5b68"
+  "gitHead": "cfd65241fb73317b63e6736e7890a784a69940fc"
 }

package/src/async-require/asyncRequireModule.ts

@@ -17,8 +17,32 @@ type MetroRequire = {
 
 type DependencyMapPaths = { [moduleID: number | string]: unknown } | null;
 
+declare const crossOriginIsolated: boolean | undefined;
 declare let __METRO_GLOBAL_PREFIX__: string;
 
+// Shim script that wraps around a given worker entrypoint and:
+// - Remaps `fetch` to the base URL given
+// - Remaps `importScripts` to the base URL given
+// This doesn't cover all cases and won't fix that:
+// - self.location will be set to a blob URL
+// - new URL won't relatively resolve
+// - XMLHttpRequest, WebSocket, etc won't relatively resolve
+function makeWorkerContent(url: string): string {
+  return `
+    const ASYNC_WORKER_BASE = ${JSON.stringify(url)};
+    const IMPORT_SCRIPTS = importScripts;
+    const FETCH = fetch;
+    const fromBaseURL = (input) => new URL(input, ASYNC_WORKER_BASE).href;
+    self.fetch = function(input, init) {
+      return FETCH(typeof input === 'string' ? fromBaseURL(input) : input, init);
+    };
+    self.importScripts = function(...urls) {
+      return IMPORT_SCRIPTS.apply(self, urls.map(fromBaseURL));
+    };
+    importScripts(ASYNC_WORKER_BASE);
+  `;
+}
+
 function maybeLoadBundle(moduleID: number, paths: DependencyMapPaths): void | Promise<void> {
   const loadBundle: (bundlePath: unknown) => Promise<void> = (global as any)[
     `${__METRO_GLOBAL_PREFIX__}__loadBundleAsync`
@@ -91,6 +115,26 @@ asyncRequire.unstable_resolve = function unstable_resolve(
   return id;
 };
 
+// Wraps around `new Worker` and if `crossOriginIsolated` is truthy, indicating CORP/COEP is active,
+// instantiates the worker with an inline script instead, which works around the CORS error. This is
+// necessary if the worker script won't have the same CORP/COEP headers as the document
+asyncRequire.unstable_createWorker = function unstable_createWorker(
+  workerUrl: string,
+  workerOpts?: WorkerOptions
+) {
+  if (typeof crossOriginIsolated !== 'undefined' && crossOriginIsolated) {
+    try {
+      const content = makeWorkerContent(workerUrl);
+      workerUrl = URL.createObjectURL(new Blob([content], { type: 'text/javascript' }));
+      return new Worker(workerUrl, workerOpts);
+    } finally {
+      URL.revokeObjectURL(workerUrl);
+    }
+  } else {
+    return new Worker(workerUrl, workerOpts);
+  }
+};
+
 // TODO(@kitten): Missing metro type definitions
 declare const module: any;
 

package/src/async-require/hmr.ts

@@ -235,29 +235,22 @@ const HMRClient: HMRClientNativeInterface = {
       }
     });
 
-    client.on('close', (closeEvent: { code: number; reason: string }) => {
+    client.on('close', (closeEvent?: { code: number; reason: string }) => {
       hideLoading();
-
+      const reason = closeEvent?.reason;
+      const code = closeEvent?.code || 1000;
       // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1
       // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
-      const isNormalOrUnsetCloseReason =
-        closeEvent == null ||
-        closeEvent.code === 1000 ||
-        closeEvent.code === 1005 ||
-        closeEvent.code == null;
-
-      setHMRUnavailableReason(
-        `${
-          isNormalOrUnsetCloseReason
-            ? 'Disconnected from Metro.'
-            : `Disconnected from Metro (${closeEvent.code}: "${closeEvent.reason}").`
-        }
-
-To reconnect:
-- Ensure that Metro is running and available on the same network
-- Reload this app (will trigger further help if Metro cannot be connected to)
-      `
-      );
+      const title =
+        reason && code !== 1000 && code !== 1001 && code !== 1005
+          ? `Disconnected from Metro (${code}: "${reason}")`
+          : `Disconnected from Metro (${code})`;
+      const message =
+        title +
+        '\nTo reconnect:' +
+        '\n- Ensure that Metro is running and available on the same network' +
+        '\n- Reload this app (will trigger further help if Metro cannot be connected to)';
+      setHMRUnavailableReason(message);
     });
 
     if (isEnabled) {
@@ -283,8 +276,13 @@ function setHMRUnavailableReason(reason: string) {
   // previously managed to connect successfully. We don't want to show
   // the warning to native engineers who use cached bundles without Metro.
   if (hmrClient.isEnabled() && didConnect) {
-    console.warn(reason);
-    // (Not using the `warning` module to prevent a Buck cycle.)
+    // NOTE(@kitten): The timeout works around a Firefox quirk
+    // In Firefox, unlike in Chrome, WebSockets fire a `close` event when a tab refreshes/navigates/closes, since this closes the WebSocket
+    // However, there's no good way to detect that this is happening or that the client initiated the `close` event
+    // To work around this, we schedule a timeout for our warning for 500ms which is long enough for this timer to never trigger
+    setTimeout(() => {
+      console.warn(reason);
+    }, 500);
   }
 }