expo-asset 58.0.12 → 58.0.13

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 58.0.13
+
+### Patch Changes
+
+- [Internal] Use `Image.resolveAssetSource` from `react-native` instead of the `Libraries/Image/resolveAssetSource` deep import. ([#51092](https://github.com/expo/expo/pull/51092) by [@huntie](https://github.com/huntie))
+- [Internal] Import React Native internals from `react-native/unstable-internals-do-not-use`. ([#50860](https://github.com/expo/expo/pull/50860) by [@huntie](https://github.com/huntie))
+
 ## 58.0.12
 
 ### Patch Changes

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'expo.modules.asset'
-version = '58.0.12'
+version = '58.0.13'
 
 android {
   namespace "expo.modules.asset"
   defaultConfig {
     versionCode 1
-    versionName "58.0.12"
+    versionName "58.0.13"
   }
 }
 

package/build/Asset.fx.js

@@ -12,7 +12,7 @@ if (IS_ENV_WITH_LOCAL_ASSETS) {
                 if (asset.uri.startsWith(ANDROID_EMBEDDED_URL_BASE_RESOURCE)) {
                     // TODO(@kitten): See https://github.com/expo/expo/commit/ec940b57a87d99ab4f1d06d87126e662c3f04f04#r155340943
                     // It's unclear whether this is sound since this may be our own AssetSourceResolver, which doesn't have this method
-                    // Please compare `AssetSourceResolver` type from `react-native/Libraries/Image/AssetSourceResolver` against `./AssetSourceResolver`
+                    // Please compare `AssetSourceResolver` type from `react-native/unstable-internals-do-not-use` against `./AssetSourceResolver`
                     return resolver.resourceIdentifierWithoutScale();
                 }
                 return resolver.fromSource(asset.downloaded ? asset.localUri : asset.uri);

package/build/Asset.fx.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Asset.fx.ts"],"sourcesContent":[null],"names":["Asset","ANDROID_EMBEDDED_URL_BASE_RESOURCE","IS_ENV_WITH_LOCAL_ASSETS","resolveAssetSource","setCustomSourceTransformer","setTransformer","expoAssetTransformer","resolver","asset","fileHashes","fromMetadata","uri","startsWith","resourceIdentifierWithoutScale","fromSource","downloaded","localUri","defaultAsset"],"mappings":"AAEA,SAASA,KAAK,EAAEC,kCAAkC,QAAQ,UAAU;AACpE,SAASC,wBAAwB,QAAQ,kBAAkB;AAC3D,OAAOC,sBAAsBC,0BAA0B,QAAQ,uBAAuB;AAEtF,+FAA+F;AAC/F,IAAIF,0BAA0B;IAC5B,MAAMG,iBACJF,mBAAmBC,0BAA0B,IAAIA;IACnDC,eAAe,SAASC,qBAAqBC,QAAQ;QACnD,IAAI;YACF,2FAA2F;YAC3F,IAAI,gBAAgBA,SAASC,KAAK,IAAID,SAASC,KAAK,CAACC,UAAU,EAAE;gBAC/D,MAAMD,QAAQR,MAAMU,YAAY,CAACH,SAASC,KAAK;gBAC/C,IAAIA,MAAMG,GAAG,CAACC,UAAU,CAACX,qCAAqC;oBAC5D,6GAA6G;oBAC7G,mHAAmH;oBACnH,oIAAoI;oBACpI,OAAO,AACLM,SACAM,8BAA8B;gBAClC;gBACA,OAAON,SAASO,UAAU,CAACN,MAAMO,UAAU,GAAGP,MAAMQ,QAAQ,GAAIR,MAAMG,GAAG;YAC3E,OAAO;gBACL,OAAOJ,SAASU,YAAY;YAC9B;QACF,EAAE,OAAM;YACN,OAAOV,SAASU,YAAY;QAC9B;IACF;AACF"}
+{"version":3,"sources":["Asset.fx.ts"],"sourcesContent":[null],"names":["Asset","ANDROID_EMBEDDED_URL_BASE_RESOURCE","IS_ENV_WITH_LOCAL_ASSETS","resolveAssetSource","setCustomSourceTransformer","setTransformer","expoAssetTransformer","resolver","asset","fileHashes","fromMetadata","uri","startsWith","resourceIdentifierWithoutScale","fromSource","downloaded","localUri","defaultAsset"],"mappings":"AAEA,SAASA,KAAK,EAAEC,kCAAkC,QAAQ,UAAU;AACpE,SAASC,wBAAwB,QAAQ,kBAAkB;AAC3D,OAAOC,sBAAsBC,0BAA0B,QAAQ,uBAAuB;AAEtF,+FAA+F;AAC/F,IAAIF,0BAA0B;IAC5B,MAAMG,iBACJF,mBAAmBC,0BAA0B,IAAIA;IACnDC,eAAe,SAASC,qBAAqBC,QAAQ;QACnD,IAAI;YACF,2FAA2F;YAC3F,IAAI,gBAAgBA,SAASC,KAAK,IAAID,SAASC,KAAK,CAACC,UAAU,EAAE;gBAC/D,MAAMD,QAAQR,MAAMU,YAAY,CAACH,SAASC,KAAK;gBAC/C,IAAIA,MAAMG,GAAG,CAACC,UAAU,CAACX,qCAAqC;oBAC5D,6GAA6G;oBAC7G,mHAAmH;oBACnH,8HAA8H;oBAC9H,OAAO,AACLM,SACAM,8BAA8B;gBAClC;gBACA,OAAON,SAASO,UAAU,CAACN,MAAMO,UAAU,GAAGP,MAAMQ,QAAQ,GAAIR,MAAMG,GAAG;YAC3E,OAAO;gBACL,OAAOJ,SAASU,YAAY;YAC9B;QACF,EAAE,OAAM;YACN,OAAOV,SAASU,YAAY;QAC9B;IACF;AACF"}

package/build/AssetSourceResolver.native.d.ts

@@ -1,3 +1,2 @@
-import AssetSourceResolver from 'react-native/Libraries/Image/AssetSourceResolver';
+import { AssetSourceResolver } from 'react-native/unstable-internals-do-not-use';
 export default AssetSourceResolver;
-export * from 'react-native/Libraries/Image/AssetSourceResolver';

package/build/AssetSourceResolver.native.js

@@ -1,5 +1,4 @@
-import AssetSourceResolver from 'react-native/Libraries/Image/AssetSourceResolver';
+import { AssetSourceResolver } from 'react-native/unstable-internals-do-not-use';
 export default AssetSourceResolver;
-export * from 'react-native/Libraries/Image/AssetSourceResolver';
 
 //# sourceMappingURL=AssetSourceResolver.native.js.map

package/build/AssetSourceResolver.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["AssetSourceResolver.native.ts"],"sourcesContent":[null],"names":["AssetSourceResolver"],"mappings":"AAAA,OAAOA,yBAAyB,mDAAmD;AACnF,eAAeA,oBAAoB;AACnC,cAAc,mDAAmD"}
+{"version":3,"sources":["AssetSourceResolver.native.ts"],"sourcesContent":[null],"names":["AssetSourceResolver"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,6CAA6C;AAEjF,eAAeA,oBAAoB"}

package/build/resolveAssetSource.native.d.ts

@@ -1,3 +1,3 @@
-import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
-export default resolveAssetSource;
-export * from 'react-native/Libraries/Image/resolveAssetSource';
+import { Image } from 'react-native';
+declare const _default: typeof Image.resolveAssetSource;
+export default _default;

package/build/resolveAssetSource.native.js

@@ -1,5 +1,4 @@
-import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
-export default resolveAssetSource;
-export * from 'react-native/Libraries/Image/resolveAssetSource';
+import { Image } from 'react-native';
+export default Image.resolveAssetSource;
 
 //# sourceMappingURL=resolveAssetSource.native.js.map

package/build/resolveAssetSource.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["resolveAssetSource.native.ts"],"sourcesContent":[null],"names":["resolveAssetSource"],"mappings":"AAAA,OAAOA,wBAAwB,kDAAkD;AACjF,eAAeA,mBAAmB;AAClC,cAAc,kDAAkD"}
+{"version":3,"sources":["resolveAssetSource.native.ts"],"sourcesContent":[null],"names":["Image","resolveAssetSource"],"mappings":"AAAA,SAASA,KAAK,QAAQ,eAAe;AAErC,eAAeA,MAAMC,kBAAkB,CAAC"}

package/build/ts-declarations/react-native-assets.d.ts

@@ -1,46 +1,3 @@
-declare module 'react-native/Libraries/Image/AssetSourceResolver' {
-  import type { PackagerAsset } from 'react-native/asset-registry';
-
-  export type ResolvedAssetSource = {
-    __packager_asset: boolean;
-    width?: number | null;
-    height?: number | null;
-    uri: string;
-    scale: number;
-  };
-
-  export default class AssetSourceResolver {
-    serverUrl: string | null;
-    jsbundleUrl: string | null;
-    asset: PackagerAsset & { fileHashes?: string[] };
-
-    constructor(serverUrl: string | null, jsbundleUrl: string | null, asset: PackagerAsset);
-
-    isLoadedFromServer(): boolean;
-    isLoadedFromFileSystem(): boolean;
-    defaultAsset(): ResolvedAssetSource;
-    assetServerURL(): ResolvedAssetSource;
-    scaledAssetPath(): ResolvedAssetSource;
-    scaledAssetURLNearBundle(): ResolvedAssetSource;
-    resourceIdentifierWithoutScale(): ResolvedAssetSource;
-    drawableFolderInBundle(): ResolvedAssetSource;
-    fromSource(source: string): ResolvedAssetSource;
-
-    static pickScale(scales: number[], deviceScale: number): number;
-  }
-}
-
-declare module 'react-native/Libraries/Image/resolveAssetSource' {
-  import type { ResolvedAssetSource } from 'react-native/Libraries/Image/AssetSourceResolver';
-  import type AssetSourceResolver from 'react-native/Libraries/Image/AssetSourceResolver';
-
-  export default function resolveAssetSource(source: any): ResolvedAssetSource | null;
-
-  export function setCustomSourceTransformer(
-    transformer: (resolver: AssetSourceResolver) => ResolvedAssetSource
-  ): void;
-}
-
 // The `react-native/asset-registry` build entry point ships untyped. Its exports are the
 // `AssetRegistry` API from `react-native`, which Expo's Metro resolver serves on every platform.
 declare module 'react-native/asset-registry' {

package/local-maven-repo/expo/modules/asset/expo.modules.asset/{58.0.12/expo.modules.asset-58.0.12.module → 58.0.13/expo.modules.asset-58.0.13.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.asset",
     "module": "expo.modules.asset",
-    "version": "58.0.12",
+    "version": "58.0.13",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.asset-58.0.12.aar",
-          "url": "expo.modules.asset-58.0.12.aar",
+          "name": "expo.modules.asset-58.0.13.aar",
+          "url": "expo.modules.asset-58.0.13.aar",
           "size": 30506,
           "sha512": "488b36ee63485a81f93ea026c034315250fc970aa635148fc231019b4123ba5718bfe342a019e2d492224857da29bbbbbd1c74490113e2992f3ec155d5d2b7aa",
           "sha256": "6638572bc255e7dd1653db31deff0bc5150b52a04b0fc4e9d9db5ac63e7cbbf8",
@@ -78,8 +78,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.asset-58.0.12.aar",
-          "url": "expo.modules.asset-58.0.12.aar",
+          "name": "expo.modules.asset-58.0.13.aar",
+          "url": "expo.modules.asset-58.0.13.aar",
           "size": 30506,
           "sha512": "488b36ee63485a81f93ea026c034315250fc970aa635148fc231019b4123ba5718bfe342a019e2d492224857da29bbbbbd1c74490113e2992f3ec155d5d2b7aa",
           "sha256": "6638572bc255e7dd1653db31deff0bc5150b52a04b0fc4e9d9db5ac63e7cbbf8",
@@ -98,8 +98,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.asset-58.0.12-sources.jar",
-          "url": "expo.modules.asset-58.0.12-sources.jar",
+          "name": "expo.modules.asset-58.0.13-sources.jar",
+          "url": "expo.modules.asset-58.0.13-sources.jar",
           "size": 4034,
           "sha512": "9a481faff8f2de1bf629dd0f4a66db1685a5dd4455cc881deb2adbc04471ee8dd096b8c65d2b0ff1460c39011cb9ee9f24eb4273a08496a8ae5e683a8da0b099",
           "sha256": "7088014d29ebd4efb4c3911b5d21ea193a7b935c494abf052ada90f00e914f55",

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.module.md5

@@ -0,0 +1 @@
+9df54414d2b5267340e011b6648809a6

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.module.sha1

@@ -0,0 +1 @@
+7ec3d162e1d0444efafab505ee979d0458be63a6

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.module.sha256

@@ -0,0 +1 @@
+95287d37936f575200b7698e0d3efb24b10ca39c53f62233b99b7718665609a2

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.module.sha512

@@ -0,0 +1 @@
+586459ca76a53047216001ccbe605393de676a90f6e7a42ce5d997b6d712e4225d7d173ed522c4f38b6cfc349721d1d57821e80a8cbc3df23733405c150876bb

package/local-maven-repo/expo/modules/asset/expo.modules.asset/{58.0.12/expo.modules.asset-58.0.12.pom → 58.0.13/expo.modules.asset-58.0.13.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.asset</groupId>
   <artifactId>expo.modules.asset</artifactId>
-  <version>58.0.12</version>
+  <version>58.0.13</version>
   <packaging>aar</packaging>
   <name>expo.modules.asset</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.pom.md5

@@ -0,0 +1 @@
+6e017efc6e3c4656e08e8f42d5f45dca

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.pom.sha1

@@ -0,0 +1 @@
+85dee07f1d7ce781082359b699f66b734eeab191

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.pom.sha256

@@ -0,0 +1 @@
+69b753b85e06b6ca68f9f4857e5961554f393312e6e4fbc00c1c48e1bb644e8e

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.13/expo.modules.asset-58.0.13.pom.sha512

@@ -0,0 +1 @@
+9711ad4d7a378d4955cf35b1f423f851873d20012eeabf1d8ca7efc97f8349c14d2c65c61f92251dd01a87706d9dbda00ebdce764fe7e6455b091b6a2c6b37de

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-asset",
-  "version": "58.0.12",
+  "version": "58.0.13",
   "description": "An Expo universal module to download assets and pass them into other APIs",
   "keywords": [
     "asset",
@@ -57,7 +57,7 @@
     "@types/node": "^22.14.0",
     "@types/react": "~19.3.0",
     "@types/react-native__assets": "^1.0.3",
-    "expo-module-scripts": "56.0.7"
+    "expo-module-scripts": "56.0.8"
   },
   "peerDependencies": {
     "expo": "*",

package/src/Asset.fx.ts

@@ -1,4 +1,4 @@
-import type { default as AssetSourceResolver } from 'react-native/Libraries/Image/AssetSourceResolver';
+import type { AssetSourceResolver } from 'react-native/unstable-internals-do-not-use';
 
 import { Asset, ANDROID_EMBEDDED_URL_BASE_RESOURCE } from './Asset';
 import { IS_ENV_WITH_LOCAL_ASSETS } from './PlatformUtils';
@@ -16,7 +16,7 @@ if (IS_ENV_WITH_LOCAL_ASSETS) {
         if (asset.uri.startsWith(ANDROID_EMBEDDED_URL_BASE_RESOURCE)) {
           // TODO(@kitten): See https://github.com/expo/expo/commit/ec940b57a87d99ab4f1d06d87126e662c3f04f04#r155340943
           // It's unclear whether this is sound since this may be our own AssetSourceResolver, which doesn't have this method
-          // Please compare `AssetSourceResolver` type from `react-native/Libraries/Image/AssetSourceResolver` against `./AssetSourceResolver`
+          // Please compare `AssetSourceResolver` type from `react-native/unstable-internals-do-not-use` against `./AssetSourceResolver`
           return (
             resolver as unknown as AssetSourceResolver
           ).resourceIdentifierWithoutScale() as any;

package/src/AssetSourceResolver.native.ts

@@ -1,3 +1,3 @@
-import AssetSourceResolver from 'react-native/Libraries/Image/AssetSourceResolver';
+import { AssetSourceResolver } from 'react-native/unstable-internals-do-not-use';
+
 export default AssetSourceResolver;
-export * from 'react-native/Libraries/Image/AssetSourceResolver';

package/src/resolveAssetSource.native.ts

@@ -1,3 +1,3 @@
-import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
-export default resolveAssetSource;
-export * from 'react-native/Libraries/Image/resolveAssetSource';
+import { Image } from 'react-native';
+
+export default Image.resolveAssetSource;

package/src/ts-declarations/react-native-assets.d.ts

@@ -1,46 +1,3 @@
-declare module 'react-native/Libraries/Image/AssetSourceResolver' {
-  import type { PackagerAsset } from 'react-native/asset-registry';
-
-  export type ResolvedAssetSource = {
-    __packager_asset: boolean;
-    width?: number | null;
-    height?: number | null;
-    uri: string;
-    scale: number;
-  };
-
-  export default class AssetSourceResolver {
-    serverUrl: string | null;
-    jsbundleUrl: string | null;
-    asset: PackagerAsset & { fileHashes?: string[] };
-
-    constructor(serverUrl: string | null, jsbundleUrl: string | null, asset: PackagerAsset);
-
-    isLoadedFromServer(): boolean;
-    isLoadedFromFileSystem(): boolean;
-    defaultAsset(): ResolvedAssetSource;
-    assetServerURL(): ResolvedAssetSource;
-    scaledAssetPath(): ResolvedAssetSource;
-    scaledAssetURLNearBundle(): ResolvedAssetSource;
-    resourceIdentifierWithoutScale(): ResolvedAssetSource;
-    drawableFolderInBundle(): ResolvedAssetSource;
-    fromSource(source: string): ResolvedAssetSource;
-
-    static pickScale(scales: number[], deviceScale: number): number;
-  }
-}
-
-declare module 'react-native/Libraries/Image/resolveAssetSource' {
-  import type { ResolvedAssetSource } from 'react-native/Libraries/Image/AssetSourceResolver';
-  import type AssetSourceResolver from 'react-native/Libraries/Image/AssetSourceResolver';
-
-  export default function resolveAssetSource(source: any): ResolvedAssetSource | null;
-
-  export function setCustomSourceTransformer(
-    transformer: (resolver: AssetSourceResolver) => ResolvedAssetSource
-  ): void;
-}
-
 // The `react-native/asset-registry` build entry point ships untyped. Its exports are the
 // `AssetRegistry` API from `react-native`, which Expo's Metro resolver serves on every platform.
 declare module 'react-native/asset-registry' {

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.module.md5

@@ -1 +0,0 @@
-2cb62f896a7e6dc43927675e3fc8c5d8

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.module.sha1

@@ -1 +0,0 @@
-a71dd01c453b727092ffe8d0070c51ef4ab9050c

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.module.sha256

@@ -1 +0,0 @@
-ba0ee668a9f6ea86f9c60e16e87bf4a40109500b979273b3f502c88e4e2bc575

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.module.sha512

@@ -1 +0,0 @@
-a7f3cf02eb10cae31361d861876d2f5be7af01415a275c0f991f5d1ae25047358aa854b2318edf6288ee950f9b95fe4eecad5cfe7a099982aedb30c5773e0cb9

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.pom.md5

@@ -1 +0,0 @@
-694058d4a13b4a8121170a0b146efedc

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.pom.sha1

@@ -1 +0,0 @@
-1641feff0280f1712b29521964e3530067159ca8

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.pom.sha256

@@ -1 +0,0 @@
-ec2c53399fb5bd29661e31ff08d5d666f7c758ffd614d82a5b15c593d323691e

package/local-maven-repo/expo/modules/asset/expo.modules.asset/58.0.12/expo.modules.asset-58.0.12.pom.sha512

@@ -1 +0,0 @@
-7a0e18bcd58570afcdae48048323aa166128fe9273494b2e632ac2666e4b0648e89cfdab3d09fac25e0733bdd47a4e76240e3fc1ae5614d17dd163133b7b5cc6