Move AssetRegistry implementation into main package

huntie · meta-codesync[bot] · commit a633c67554a4 · 2026-06-25T03:18:16.000-07:00
Summary: Resolves T275935135.

Differential Revision: D108750302
diff --git a/packages/assets-registry/README.md b/packages/assets-registry/README.md
@@ -13,6 +13,9 @@ Most apps never import this directly — assets are handled through `<Image>`.
 
 ### `@react-native/assets-registry/registry`
 
+> [!Note]
+> Aliases to [`AssetRegistry`](https://reactnative.dev/docs/assetregistry) (since 0.87). Prefer importing directly from the `'react-native'` package in libraries.
+
 | Export | Signature | Notes |
 |---|---|---|
 | `registerAsset` | `(asset: PackagerAsset) => number` | Stores the asset; returns a numeric ID |
diff --git a/packages/assets-registry/package.json b/packages/assets-registry/package.json
@@ -26,5 +26,8 @@
     "!**/__fixtures__/**",
     "!**/__mocks__/**",
     "!**/__tests__/**"
-  ]
+  ],
+  "peerDependencies": {
+    "react-native": "*"
+  }
 }
diff --git a/packages/assets-registry/path-support.js b/packages/assets-registry/path-support.js
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict
+ * @flow strict-local
  * @format
  */
 
diff --git a/packages/assets-registry/registry.js b/packages/assets-registry/registry.js
@@ -4,41 +4,20 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict
+ * @flow strict-local
  * @format
  */
 
 'use strict';
 
-/*::
-export type AssetDestPathResolver = 'android' | 'generic';
+import {AssetRegistry} from 'react-native';
 
-export type PackagerAsset = {
-  readonly __packager_asset: boolean,
-  readonly fileSystemLocation: string,
-  readonly httpServerLocation: string,
-  readonly width: ?number,
-  readonly height: ?number,
-  readonly scales: Array<number>,
-  readonly hash: string,
-  readonly name: string,
-  readonly type: string,
-  readonly resolver?: AssetDestPathResolver,
-  ...
-};
+/*::
+export type {AssetDestPathResolver, PackagerAsset} from 'react-native';
 */
 
-const assets /*: Array<PackagerAsset> */ = [];
-
-function registerAsset(asset /*: PackagerAsset */) /*: number */ {
-  // `push` returns new array length, so the first asset will
-  // get id 1 (not 0) to make the value truthy
-  return assets.push(asset);
-}
-
-function getAssetByID(assetId /*: number */) /*: PackagerAsset */ {
-  return assets[assetId - 1];
-}
-
 // eslint-disable-next-line @react-native/monorepo/no-commonjs-exports
-module.exports = {registerAsset, getAssetByID};
+module.exports = {
+  registerAsset: AssetRegistry.registerAsset,
+  getAssetByID: AssetRegistry.getAssetByID,
+};
diff --git a/packages/react-native/Libraries/Image/AssetRegistry.js b/packages/react-native/Libraries/Image/AssetRegistry.js
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict
+ * @flow strict-local
  * @format
  */
 
diff --git a/packages/react-native/Libraries/Image/AssetSourceResolver.js b/packages/react-native/Libraries/Image/AssetSourceResolver.js
@@ -10,31 +10,10 @@
 
 'use strict';
 
-export type ResolvedAssetSource = {
-  readonly __packager_asset: boolean,
-  readonly width: ?number,
-  readonly height: ?number,
-  readonly uri: string,
-  readonly scale: number,
-};
-
-// From @react-native/assets-registry
-type AssetDestPathResolver = 'android' | 'generic';
-
-// From @react-native/assets-registry
-type PackagerAsset = Readonly<{
-  __packager_asset: boolean,
-  fileSystemLocation: string,
-  httpServerLocation: string,
-  width: ?number,
-  height: ?number,
-  scales: Array<number>,
-  hash: string,
-  name: string,
-  type: string,
-  resolver?: AssetDestPathResolver,
-  ...
-}>;
+import type {
+  AssetDestPathResolver,
+  PackagerAsset,
+} from '../../src/private/assets/AssetRegistry';
 
 const PixelRatio = require('../Utilities/PixelRatio').default;
 const Platform = require('../Utilities/Platform').default;
@@ -46,6 +25,14 @@ const {
 } = require('@react-native/assets-registry/path-support');
 const invariant = require('invariant');
 
+export type ResolvedAssetSource = {
+  readonly __packager_asset: boolean,
+  readonly width: ?number,
+  readonly height: ?number,
+  readonly uri: string,
+  readonly scale: number,
+};
+
 /**
  * Returns a path like 'assets/AwesomeModule/icon@2x.png'
  */
diff --git a/packages/react-native/Libraries/Image/RelativeImageStub.js b/packages/react-native/Libraries/Image/RelativeImageStub.js
@@ -13,7 +13,7 @@
 // This is a stub for flow to make it understand require('./icon.png')
 // See metro/src/Bundler/index.js
 
-const AssetRegistry = require('@react-native/assets-registry/registry');
+const {AssetRegistry} = require('../../src/private/assets/AssetRegistry');
 
 const RelativeImageStub = AssetRegistry.registerAsset({
   __packager_asset: true,
diff --git a/packages/react-native/Libraries/Image/__tests__/resolveAssetSource-test.js b/packages/react-native/Libraries/Image/__tests__/resolveAssetSource-test.js
@@ -8,7 +8,7 @@
  * @format
  */
 
-import type {PackagerAsset} from '../../../../assets-registry/registry';
+import type {PackagerAsset} from '../../../src/private/assets/AssetRegistry';
 import type {ResolvedAssetSource} from '../AssetSourceResolver';
 
 describe('resolveAssetSource', () => {
@@ -20,7 +20,8 @@ describe('resolveAssetSource', () => {
   beforeEach(() => {
     jest.resetModules();
 
-    AssetRegistry = require('@react-native/assets-registry/registry');
+    AssetRegistry =
+      require('../../../src/private/assets/AssetRegistry').AssetRegistry;
     resolveAssetSource = require('../resolveAssetSource').default;
     NativeSourceCode =
       require('../../NativeModules/specs/NativeSourceCode').default;
diff --git a/packages/react-native/Libraries/Image/resolveAssetSource.js b/packages/react-native/Libraries/Image/resolveAssetSource.js
@@ -16,10 +16,10 @@ import type {ImageSource} from './ImageSource';
 
 import SourceCode from '../NativeModules/specs/NativeSourceCode';
 
+const {AssetRegistry} = require('../../src/private/assets/AssetRegistry');
 const AssetSourceResolver: AssetSourceResolverT =
   require('./AssetSourceResolver').default;
 const {pickScale} = require('./AssetUtils');
-const AssetRegistry = require('@react-native/assets-registry/registry');
 
 type CustomSourceTransformer = (
   resolver: AssetSourceResolver,
diff --git a/packages/react-native/ReactNativeApi.d.ts b/packages/react-native/ReactNativeApi.d.ts
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<42200de8ca10d30541e23b67547d9a13>>
+ * @generated SignedSource<<51a4ff32766e21cd2638ff58450f31f9>>
  *
  * This file was generated by scripts/js-api/build-types/index.js.
  */
@@ -151,6 +151,10 @@ declare const AnimatedScrollView_default: AnimatedComponentType<
 >
 declare const AppState: typeof AppState_default
 declare const AppState_default: AppStateImpl
+declare const AssetRegistry: {
+  getAssetByID(assetId: number): PackagerAsset
+  registerAsset(asset: PackagerAsset): number
+}
 declare const attachNativeEvent: typeof $$AnimatedImplementation.attachNativeEvent
 declare const BackHandler: typeof BackHandler_default
 declare const BackHandler_default: TBackHandler
@@ -1638,6 +1642,8 @@ declare interface ArrayLike_2<T> extends Iterable<T> {
   [indexer: number]: T
   readonly length: number
 }
+declare type AssetDestPathResolver = "android" | "generic"
+declare type AssetRegistry = typeof AssetRegistry
 declare type attachNativeEvent = typeof attachNativeEvent
 declare function attachNativeEventImpl(
   viewRef: any,
@@ -3479,6 +3485,17 @@ declare type OptionalVirtualizedSectionListProps<
 declare type OrientationChangeEvent = {
   readonly orientation: "landscape" | "portrait"
 }
+declare type PackagerAsset = {
+  readonly fileSystemLocation: string
+  readonly hash: string
+  readonly height: number | undefined
+  readonly httpServerLocation: string
+  readonly name: string
+  readonly resolver?: AssetDestPathResolver
+  readonly scales: Array<number>
+  readonly type: string
+  readonly width: number | undefined
+}
 declare type PanResponder = typeof PanResponder
 declare type PanResponderCallbacks = {
   readonly onMoveShouldSetPanResponder?: ActiveCallback
@@ -5927,6 +5944,8 @@ export {
   AppStateEvent, // 80f034c3
   AppStateStatus, // 447e5ef2
   Appearance, // 83e9641a
+  AssetDestPathResolver, // 59047424
+  AssetRegistry, // 6070bb45
   AutoCapitalize, // c0e857a0
   BackHandler, // f139fc69
   BackPressEventName, // 4620fb76
@@ -6060,6 +6079,7 @@ export {
   NativeUIEvent, // 44ac26ac
   Networking, // bbc5be42
   OpaqueColorValue, // 25f3fa5b
+  PackagerAsset, // d1c88cf4
   PanResponder, // f8f71cac
   PanResponderCallbacks, // 6d63e7be
   PanResponderGestureState, // 54baf558
diff --git a/packages/react-native/index.js b/packages/react-native/index.js
@@ -211,6 +211,9 @@ module.exports = {
   get AppState() {
     return require('./Libraries/AppState/AppState').default;
   },
+  get AssetRegistry() {
+    return require('./src/private/assets/AssetRegistry').AssetRegistry;
+  },
   get BackHandler() {
     return require('./Libraries/Utilities/BackHandler').default;
   },
diff --git a/packages/react-native/index.js.flow b/packages/react-native/index.js.flow
@@ -279,6 +279,12 @@ export type {
 } from './Libraries/AppState/AppState';
 export {default as AppState} from './Libraries/AppState/AppState';
 
+export {AssetRegistry} from './src/private/assets/AssetRegistry';
+export type {
+  AssetDestPathResolver,
+  PackagerAsset,
+} from './src/private/assets/AssetRegistry';
+
 export type {BackPressEventName} from './Libraries/Utilities/BackHandler';
 export {default as BackHandler} from './Libraries/Utilities/BackHandler';
 
diff --git a/packages/react-native/src/private/assets/AssetRegistry.js b/packages/react-native/src/private/assets/AssetRegistry.js
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+export type AssetDestPathResolver = 'android' | 'generic';
+
+export type PackagerAsset = Readonly<{
+  __packager_asset: boolean,
+  fileSystemLocation: string,
+  httpServerLocation: string,
+  width: ?number,
+  height: ?number,
+  scales: Array<number>,
+  hash: string,
+  name: string,
+  type: string,
+  resolver?: AssetDestPathResolver,
+  ...
+}>;
+
+const assets: Array<PackagerAsset> = [];
+
+/**
+ * Runtime registry that maps asset IDs generated in a Metro bundle to asset
+ * metadata. It backs `<Image>`, `Image.resolveAssetSource()`, and any code
+ * that resolves `require('./img.png')` on native.
+ *
+ * Most apps do not use this directly — assets are handled through `<Image>`.
+ */
+export const AssetRegistry = {
+  /**
+   * Register an asset. Returns the asset ID.
+   */
+  registerAsset(asset: PackagerAsset): number {
+    // `push` returns the new length, so the first asset gets id 1 (not 0),
+    // keeping ids truthy.
+    return assets.push(asset);
+  },
+
+  /**
+   * Retrieve a registered asset by ID.
+   */
+  getAssetByID(assetId: number): PackagerAsset {
+    return assets[assetId - 1];
+  },
+};
diff --git a/scripts/shared/monorepoUtils.js b/scripts/shared/monorepoUtils.js
@@ -155,7 +155,11 @@ async function updatePackageJson(
     }
 
     for (const dependency in newPackageVersions) {
-      if (dependency in deps) {
+      if (
+        dependency in deps &&
+        // Preserve wildcard specifiers
+        deps[dependency] !== '*'
+      ) {
         deps[dependency] = newPackageVersions[dependency];
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* This source code is licensed under the MIT license found in the`
`5`	`5`	`* LICENSE file in the root directory of this source tree.`
`6`	`6`	`*`
`7`		`- * @flow strict`
	`7`	`+ * @flow strict-local`
`8`	`8`	`* @format`
`9`	`9`	`*/`
`10`	`10`