expo 52.0.0-preview.18 → 52.0.0-preview.19

package/android/build.gradle

@@ -33,7 +33,7 @@ def getRNVersion() {
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '52.0.0-preview.18'
+version = '52.0.0-preview.19'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -46,7 +46,7 @@ android {
   namespace "expo.core"
   defaultConfig {
     versionCode 1
-    versionName "52.0.0-preview.18"
+    versionName "52.0.0-preview.19"
     consumerProguardFiles("proguard-rules.pro")
   }
   testOptions {

package/build/dom/base.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Get the base URL for the DOM Components HTML
+ */
+export declare function getBaseURL(): string;
+//# sourceMappingURL=base.d.ts.map

package/build/dom/base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/dom/base.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,UAAU,IAAI,MAAM,CA6CnC"}

package/build/dom/webview-wrapper.d.ts

@@ -2,9 +2,7 @@ import React from 'react';
 import type { DOMProps } from './dom.types';
 interface Props {
     dom: DOMProps;
-    source: {
-        uri: string;
-    };
+    filePath: string;
 }
 declare const RawWebView: React.ForwardRefExoticComponent<Props & React.RefAttributes<object>>;
 export declare function resolveWebView(useExpoDOMWebView: boolean): any;

package/build/dom/webview-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webview-wrapper.d.ts","sourceRoot":"","sources":["../../src/dom/webview-wrapper.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAiB,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAcrF,UAAU,KAAK;IACb,GAAG,EAAE,QAAQ,CAAC;IACd,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,QAAA,MAAM,UAAU,sEA6Kd,CAAC;AAaH,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,OAAO,OASxD;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"webview-wrapper.d.ts","sourceRoot":"","sources":["../../src/dom/webview-wrapper.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,KAAK,EAAiB,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAcrF,UAAU,KAAK;IACb,GAAG,EAAE,QAAQ,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,QAAA,MAAM,UAAU,sEA8Kd,CAAC;AAaH,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,OAAO,OASxD;AAED,eAAe,UAAU,CAAC"}

package/bundledNativeModules.json

@@ -1,5 +1,5 @@
 {
-  "@expo/metro-runtime": "~4.0.0-preview.0",
+  "@expo/metro-runtime": "~4.0.0-preview.1",
   "@expo/vector-icons": "^14.0.2",
   "@react-native-async-storage/async-storage": "1.23.1",
   "@react-native-community/datetimepicker": "8.2.0",
@@ -45,7 +45,7 @@
   "expo-image": "~2.0.0-preview.1",
   "expo-image-loader": "~5.0.0",
   "expo-image-manipulator": "~13.0.5",
-  "expo-image-picker": "~16.0.0",
+  "expo-image-picker": "~16.0.1",
   "expo-intent-launcher": "~12.0.1",
   "expo-insights": "~0.8.1",
   "expo-keep-awake": "~14.0.1",
@@ -55,14 +55,14 @@
   "expo-localization": "~16.0.0",
   "expo-location": "~18.0.1",
   "expo-mail-composer": "~14.0.1",
-  "expo-media-library": "~17.0.0",
-  "expo-module-template": "~10.15.5",
+  "expo-media-library": "~17.0.1",
+  "expo-module-template": "~10.15.6",
   "expo-modules-core": "~2.0.0-preview.9",
   "expo-navigation-bar": "~4.0.2",
   "expo-network": "~7.0.0",
   "expo-notifications": "~0.29.4",
   "expo-print": "~14.0.2",
-  "expo-router": "~4.0.0-preview.11",
+  "expo-router": "~4.0.0-preview.12",
   "expo-screen-capture": "~7.0.0",
   "expo-screen-orientation": "~8.0.0",
   "expo-secure-store": "~14.0.0",
@@ -78,7 +78,7 @@
   "expo-system-ui": "~4.0.2",
   "expo-task-manager": "~12.0.1",
   "expo-tracking-transparency": "~5.0.0",
-  "expo-updates": "~0.26.3",
+  "expo-updates": "~0.26.4",
   "expo-video-thumbnails": "~9.0.0",
   "expo-video": "~2.0.0-preview.0",
   "expo-web-browser": "~14.0.0",

package/fingerprint.d.ts

@@ -0,0 +1 @@
+export * from '@expo/fingerprint';

package/fingerprint.js

@@ -0,0 +1 @@
+module.exports = require('@expo/fingerprint');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "52.0.0-preview.18",
+  "version": "52.0.0-preview.19",
   "description": "The Expo SDK",
   "main": "src/Expo.ts",
   "module": "src/Expo.ts",
@@ -33,6 +33,8 @@
     "devtools.d.ts",
     "fetch.js",
     "fetch.d.ts",
+    "fingerprint.js",
+    "fingerprint.d.ts",
     "react-native.config.js",
     "requiresExtraSetup.json",
     "tsconfig.base.json",
@@ -66,17 +68,18 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "0.19.13",
+    "@expo/cli": "0.19.14",
     "@expo/config": "10.0.2",
-    "@expo/config-plugins": "9.0.4",
-    "@expo/metro-config": "0.19.0-preview.2",
+    "@expo/config-plugins": "9.0.5",
+    "@expo/fingerprint": "0.11.2",
+    "@expo/metro-config": "0.19.0-preview.3",
     "@expo/vector-icons": "^14.0.0",
-    "babel-preset-expo": "~12.0.0-preview.4",
+    "babel-preset-expo": "~12.0.0-preview.5",
     "expo-asset": "~11.0.0",
     "expo-file-system": "~18.0.0",
     "expo-font": "~13.0.0",
     "expo-keep-awake": "~14.0.1",
-    "expo-modules-autolinking": "2.0.0-preview.2",
+    "expo-modules-autolinking": "2.0.0-preview.3",
     "expo-modules-core": "2.0.0-preview.9",
     "fbemitter": "^3.0.0",
     "web-streams-polyfill": "^3.3.2",
@@ -108,5 +111,5 @@
       "optional": true
     }
   },
-  "gitHead": "8f821c2fa246a5206d25b00ca83fd4cfe639e784"
+  "gitHead": "d97ae0839fa465cee14e13ca38f3c6c84c124d82"
 }

package/src/dom/__tests__/base-test.ts

@@ -0,0 +1,102 @@
+jest.mock('react-native/Libraries/Core/Devtools/getDevServer', () =>
+  jest.fn().mockReturnValue({ url: 'http://localhost:8081' })
+);
+
+describe('getBaseURL', () => {
+  let getBaseURL;
+
+  const originalProcessEnv = process.env;
+  const originalExpo = globalThis.expo;
+  beforeEach(() => {
+    // Reset the module to clear the `getBaseURL` underlying cache
+    jest.resetModules();
+    getBaseURL = require('../base').getBaseURL;
+  });
+
+  afterEach(() => {
+    globalThis.expo = originalExpo;
+    process.env = originalProcessEnv;
+  });
+
+  it('should serve from updates directory when using updates', () => {
+    // @ts-expect-error: mock partial properties
+    globalThis.expo = {
+      modules: {
+        ExpoUpdates: {
+          isEnabled: true,
+          isEmbeddedLaunch: false,
+          localAssets: {
+            '5d41402abc4b2a76b9719d911017c592':
+              'file:///path/to/.expo-internal/5d41402abc4b2a76b9719d911017c592.png',
+          },
+        },
+      },
+    };
+
+    expect(getBaseURL()).toBe('file:///path/to/.expo-internal');
+  });
+
+  it('should serve from app builtin directory when using updates with embedded bundle', () => {
+    // @ts-expect-error: mock partial properties
+    globalThis.expo = {
+      modules: {
+        ExpoUpdates: {
+          isEnabled: true,
+          isEmbeddedLaunch: true,
+          localAssets: {
+            '5d41402abc4b2a76b9719d911017c592':
+              'file:///path/to/.expo-internal/5d41402abc4b2a76b9719d911017c592.png',
+          },
+        },
+      },
+    };
+    process.env.NODE_ENV = 'production';
+    switch (process.env.EXPO_OS) {
+      case 'android': {
+        expect(getBaseURL()).toBe('file:///android_asset/www.bundle');
+        break;
+      }
+      case 'ios': {
+        expect(getBaseURL()).toBe('www.bundle');
+        break;
+      }
+      default: {
+        expect(getBaseURL()).toBe('');
+        break;
+      }
+    }
+  });
+
+  it('should serve from app builtin directory for production builds', () => {
+    process.env.NODE_ENV = 'production';
+    switch (process.env.EXPO_OS) {
+      case 'android': {
+        expect(getBaseURL()).toBe('file:///android_asset/www.bundle');
+        break;
+      }
+      case 'ios': {
+        expect(getBaseURL()).toBe('www.bundle');
+        break;
+      }
+      default: {
+        expect(getBaseURL()).toBe('');
+        break;
+      }
+    }
+  });
+
+  it('should serve from dev server for development builds', () => {
+    process.env.NODE_ENV = 'development';
+    switch (process.env.EXPO_OS) {
+      case 'android':
+      case 'ios': {
+        expect(getBaseURL()).toBe('http://localhost:8081/_expo/@dom');
+        break;
+      }
+      default: {
+        expect(getBaseURL()).toBe('');
+        break;
+      }
+    }
+  });
+});

package/src/dom/base.ts

@@ -0,0 +1,51 @@
+let cachedBaseUrl: string | null = null;
+
+/**
+ * Get the base URL for the DOM Components HTML
+ */
+export function getBaseURL(): string {
+  if (cachedBaseUrl != null) {
+    return cachedBaseUrl;
+  }
+
+  // Serving from updates
+  const ExpoUpdates = globalThis.expo?.modules?.['ExpoUpdates'] as
+    | import('expo-updates').ExpoUpdatesModule
+    | undefined;
+  const updatesIsInstalledAndEnabled = ExpoUpdates?.isEnabled ?? false;
+  const updatesIsEmbeddedLaunch = ExpoUpdates?.isEmbeddedLaunch ?? false;
+  const shouldServeDomFromUpdates = updatesIsInstalledAndEnabled && !updatesIsEmbeddedLaunch;
+  // If updates is installed and enabled, and we're not running from an embedded launch, we should serve the DOM Components from the `.expo-internal` directory
+  if (shouldServeDomFromUpdates) {
+    const localAssets = ExpoUpdates?.localAssets ?? {};
+    const anyLocalAsset = Object.values(localAssets)[0];
+    if (anyLocalAsset) {
+      // Try to get the `.expo-internal` directory from the first local asset
+      cachedBaseUrl = anyLocalAsset.slice(0, anyLocalAsset.lastIndexOf('/'));
+      return cachedBaseUrl;
+    }
+  }
+
+  if (process.env.EXPO_OS === 'web') {
+    cachedBaseUrl = process.env.EXPO_BASE_URL ?? '';
+    return cachedBaseUrl;
+  }
+
+  // Serving from local production
+  if (process.env.NODE_ENV === 'production') {
+    if (process.env.EXPO_OS === 'android') {
+      cachedBaseUrl = 'file:///android_asset/www.bundle';
+    } else if (process.env.EXPO_OS === 'ios') {
+      cachedBaseUrl = 'www.bundle';
+    } else {
+      cachedBaseUrl = process.env.EXPO_BASE_URL ?? '';
+    }
+    return cachedBaseUrl;
+  }
+
+  // Serving from local dev server
+  const getDevServer = require('react-native/Libraries/Core/Devtools/getDevServer');
+  const devServer = getDevServer();
+  cachedBaseUrl = new URL('/_expo/@dom', devServer.url).toString();
+  return cachedBaseUrl;
+}

package/src/dom/webview-wrapper.tsx

@@ -2,6 +2,7 @@
 import React from 'react';
 import { AppState } from 'react-native';
 
+import { getBaseURL } from './base';
 import type { BridgeMessage, DOMProps, WebViewProps, WebViewRef } from './dom.types';
 import { _emitGlobalEvent } from './global-events';
 import {
@@ -18,12 +19,10 @@ import RNWebView from './webview/RNWebView';
 
 interface Props {
   dom: DOMProps;
-  source: {
-    uri: string;
-  };
+  filePath: string;
 }
 
-const RawWebView = React.forwardRef<object, Props>(({ dom, source, ...marshalProps }, ref) => {
+const RawWebView = React.forwardRef<object, Props>(({ dom, filePath, ...marshalProps }, ref) => {
   if (ref != null && typeof ref === 'object' && ref.current == null) {
     ref.current = new Proxy(
       {},
@@ -52,6 +51,7 @@ const RawWebView = React.forwardRef<object, Props>(({ dom, source, ...marshalPro
   const webView = resolveWebView(dom?.useExpoDOMWebView ?? false);
   const webviewRef = React.useRef<WebViewRef>(null);
   const domImperativeHandlePropsRef = React.useRef<string[]>([]);
+  const source = { uri: `${getBaseURL()}/${filePath}` };
   const [containerStyle, setContainerStyle] = React.useState<WebViewProps['containerStyle']>(null);
 
   const emit = React.useCallback(