@office-iss/react-native-win32 0.0.0-canary.29 → 0.0.0-canary.290

package/Libraries/Image/NativeImageLoaderIOS.js

@@ -1,32 +1,13 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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
+ * @flow strict-local
  * @format
  */
 
-'use strict';
-
-import type {TurboModule} from '../TurboModule/RCTExport';
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +getConstants: () => {||};
-  // Return [width, height] of image uri
-  +getSize: (uri: string) => Promise<$ReadOnlyArray<number>>;
-  +getSizeWithHeaders: (
-    uri: string,
-    headers: Object,
-  ) => Promise<{
-    width: number,
-    height: number,
-    ...
-  }>;
-  +prefetchImage: (uri: string) => Promise<boolean>;
-  +queryCache: (uris: Array<string>) => Promise<Object>;
-}
-
-export default (TurboModuleRegistry.getEnforcing<Spec>('ImageLoader'): Spec);
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS';
+import NativeImageLoaderIOS from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderIOS';
+export default NativeImageLoaderIOS;

package/Libraries/Image/NativeImageLoaderWin32.js

@@ -1,40 +1,13 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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
+ * @flow strict-local
  * @format
  */
 
-'use strict';
-
-import type {TurboModule} from '../TurboModule/RCTExport';
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +getConstants: () => {||};
-  // [Win32 uses callback instead of promise
-  +getSize: (
-    uri: string,
-    callback: (width: number, height: number, err?: string) => void,
-  ) => void;
-  // Win32]
-
-  // [Win32 These aren't actually implemented, and will just blow up if called
-  // currently.
-  +getSizeWithHeaders: (
-    uri: string,
-    headers: Object,
-  ) => Promise<{
-    width: number,
-    height: number,
-    ...
-  }>;
-  +prefetchImage: (uri: string) => Promise<boolean>;
-  +queryCache: (uris: Array<string>) => Promise<Object>;
-  // Win32]
-}
-
-export default (TurboModuleRegistry.getEnforcing<Spec>('ImageLoader'): Spec);
+export * from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderWin32';
+import NativeImageLoaderWin32 from '../../src/private/specs_DEPRECATED/modules/NativeImageLoaderWin32';
+export default NativeImageLoaderWin32;

package/Libraries/Image/NativeImageStoreAndroid.js

@@ -0,0 +1,13 @@
+/**
+ * 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 * from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid';
+import NativeImageStoreAndroid from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreAndroid';
+export default NativeImageStoreAndroid;

package/Libraries/Image/NativeImageStoreIOS.js

@@ -0,0 +1,13 @@
+/**
+ * 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 * from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreIOS';
+import NativeImageStoreIOS from '../../src/private/specs_DEPRECATED/modules/NativeImageStoreIOS';
+export default NativeImageStoreIOS;

package/Libraries/Image/RelativeImageStub.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -13,9 +13,9 @@
 // This is a stub for flow to make it understand require('./icon.png')
 // See metro/src/Bundler/index.js
 
-const AssetRegistry = require('./AssetRegistry');
+const AssetRegistry = require('@react-native/assets-registry/registry');
 
-module.exports = (AssetRegistry.registerAsset({
+const RelativeImageStub = (AssetRegistry.registerAsset({
   __packager_asset: true,
   fileSystemLocation: '/full/path/to/directory',
   httpServerLocation: '/assets/full/path/to/directory',
@@ -26,3 +26,5 @@ module.exports = (AssetRegistry.registerAsset({
   name: 'icon',
   type: 'png',
 }): number);
+
+module.exports = RelativeImageStub;

package/Libraries/Image/Tests/ImageWin32Test.d.ts

@@ -1,8 +1,9 @@
-export declare const title = "<ImageWin32Test>";
-export declare const displayName = "Image Win32 test";
-export declare const description = "Image Win32 test";
-export declare const examples: {
-    title: string;
-    description: string;
-    render(): JSX.Element;
-}[];
+import React from 'react';
+export declare const title = "ImageWin32Test";
+export declare const displayName = "Image Win32 test";
+export declare const description = "Image Win32 test";
+export declare const examples: {
+    title: string;
+    description: string;
+    render(): React.JSX.Element;
+}[];

package/Libraries/Image/Tests/ImageWin32Test.js

@@ -1,19 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.examples = exports.description = exports.displayName = exports.title = void 0;
-var React = require("react");
-var react_native_1 = require("react-native");
-var testImage = require('./img/dpitest.png');
-exports.title = '<ImageWin32Test>';
-exports.displayName = 'Image Win32 test';
-exports.description = 'Image Win32 test';
-exports.examples = [
-    {
-        title: 'Win32 Image control test',
-        description: 'Test Image',
-        render: function () {
-            return (React.createElement(react_native_1.Image, { style: { width: 100, height: 100 }, source: testImage }));
-        },
-    },
-];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW1hZ2VXaW4zMlRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvTGlicmFyaWVzL0ltYWdlL1Rlc3RzL0ltYWdlV2luMzJUZXN0LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBK0I7QUFDL0IsNkNBQXFDO0FBRXJDLElBQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0FBRWxDLFFBQUEsS0FBSyxHQUFHLGtCQUFrQixDQUFDO0FBQzNCLFFBQUEsV0FBVyxHQUFHLGtCQUFrQixDQUFDO0FBQ2pDLFFBQUEsV0FBVyxHQUFHLGtCQUFrQixDQUFDO0FBQ2pDLFFBQUEsUUFBUSxHQUFHO0lBQ3BCO1FBQ0UsS0FBSyxFQUFFLDBCQUEwQjtRQUNqQyxXQUFXLEVBQUUsWUFBWTtRQUN6QixNQUFNLEVBQU47WUFDRSxPQUFPLENBQ0wsb0JBQUMsb0JBQUssSUFDSixLQUFLLEVBQUcsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsRUFDbkMsTUFBTSxFQUFHLFNBQVMsR0FDbEIsQ0FDSCxDQUFDO1FBQ0osQ0FBQztLQUNGO0NBQ0YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIFJlYWN0IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IEltYWdlIH0gZnJvbSAncmVhY3QtbmF0aXZlJztcblxuY29uc3QgdGVzdEltYWdlID0gcmVxdWlyZSgnLi9pbWcvZHBpdGVzdC5wbmcnKTtcblxuZXhwb3J0IGNvbnN0IHRpdGxlID0gJzxJbWFnZVdpbjMyVGVzdD4nO1xuZXhwb3J0IGNvbnN0IGRpc3BsYXlOYW1lID0gJ0ltYWdlIFdpbjMyIHRlc3QnO1xuZXhwb3J0IGNvbnN0IGRlc2NyaXB0aW9uID0gJ0ltYWdlIFdpbjMyIHRlc3QnO1xuZXhwb3J0IGNvbnN0IGV4YW1wbGVzID0gW1xuICAgIHtcbiAgICAgIHRpdGxlOiAnV2luMzIgSW1hZ2UgY29udHJvbCB0ZXN0JyxcbiAgICAgIGRlc2NyaXB0aW9uOiAnVGVzdCBJbWFnZScsXG4gICAgICByZW5kZXIoKTogSlNYLkVsZW1lbnQge1xuICAgICAgICByZXR1cm4gKFxuICAgICAgICAgIDxJbWFnZVxuICAgICAgICAgICAgc3R5bGU9eyB7IHdpZHRoOiAxMDAsIGhlaWdodDogMTAwIH0gfVxuICAgICAgICAgICAgc291cmNlPXsgdGVzdEltYWdlIH1cbiAgICAgICAgICAvPlxuICAgICAgICApO1xuICAgICAgfSxcbiAgICB9LFxuICBdO1xuIl19
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.examples = exports.description = exports.displayName = exports.title = void 0;
+const react_1 = __importDefault(require("react"));
+const react_native_1 = require("react-native");
+const testImage = require('./img/dpitest.png');
+exports.title = 'ImageWin32Test';
+exports.displayName = 'Image Win32 test';
+exports.description = 'Image Win32 test';
+exports.examples = [
+    {
+        title: 'Win32 Image control test',
+        description: 'Test Image',
+        render() {
+            return (react_1.default.createElement(react_native_1.Image, { style: { width: 100, height: 100 }, source: testImage }));
+        },
+    },
+];
+//# sourceMappingURL=ImageWin32Test.js.map

package/Libraries/Image/Tests/ImageWin32Test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImageWin32Test.js","sourceRoot":"","sources":["../../../src-win/Libraries/Image/Tests/ImageWin32Test.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,+CAAqC;AAErC,MAAM,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAElC,QAAA,KAAK,GAAG,gBAAgB,CAAC;AACzB,QAAA,WAAW,GAAG,kBAAkB,CAAC;AACjC,QAAA,WAAW,GAAG,kBAAkB,CAAC;AACjC,QAAA,QAAQ,GAAG;IACpB;QACE,KAAK,EAAE,0BAA0B;QACjC,WAAW,EAAE,YAAY;QACzB,MAAM;YACJ,OAAO,CACL,8BAAC,oBAAK,IACJ,KAAK,EAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,EACnC,MAAM,EAAG,SAAS,GAClB,CACH,CAAC;QACJ,CAAC;KACF;CACF,CAAC","sourcesContent":["import React from 'react'\nimport { Image } from 'react-native';\n\nconst testImage = require('./img/dpitest.png');\n\nexport const title = 'ImageWin32Test';\nexport const displayName = 'Image Win32 test';\nexport const description = 'Image Win32 test';\nexport const examples = [\n    {\n      title: 'Win32 Image control test',\n      description: 'Test Image',\n      render() {\n        return (\n          <Image\n            style={ { width: 100, height: 100 } }\n            source={ testImage }\n          />\n        );\n      },\n    },\n  ];\n"]}

package/Libraries/Image/TextInlineImageNativeComponent.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,11 +10,40 @@
 
 'use strict';
 
-const requireNativeComponent = require('../ReactNative/requireNativeComponent');
-import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import type {HostComponent} from '../../src/private/types/HostComponent';
+import type {ViewProps} from '../Components/View/ViewPropTypes';
+import type {PartialViewConfig} from '../Renderer/shims/ReactNativeTypes';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
+import type {ImageResizeMode} from './ImageResizeMode';
 
-const TextInlineImage: HostComponent<mixed> = requireNativeComponent<mixed>(
-  'RCTTextInlineImage',
-);
+import * as NativeComponentRegistry from '../NativeComponent/NativeComponentRegistry';
 
-module.exports = TextInlineImage;
+type NativeProps = $ReadOnly<{
+  ...ViewProps,
+  resizeMode?: ?ImageResizeMode,
+  src?: ?$ReadOnlyArray<?$ReadOnly<{uri?: ?string, ...}>>,
+  tintColor?: ?ColorValue,
+  headers?: ?{[string]: string},
+}>;
+
+export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
+  uiViewClassName: 'RCTTextInlineImage',
+  bubblingEventTypes: {},
+  directEventTypes: {},
+  validAttributes: {
+    resizeMode: true,
+    src: true,
+    tintColor: {
+      process: require('../StyleSheet/processColor').default,
+    },
+    headers: true,
+  },
+};
+
+const TextInlineImage: HostComponent<NativeProps> =
+  NativeComponentRegistry.get<NativeProps>(
+    'RCTTextInlineImage',
+    () => __INTERNAL_VIEW_CONFIG,
+  );
+
+export default TextInlineImage;

package/Libraries/Image/assetPaths.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Dont use flow here, since this file is used by saveAssetPlugin.js which will run without flow transform
+ * @format
+ */
+
+'use strict';
+
+// Some windows machines may not have long paths enabled
+// https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
+// Assets in nested node_modules (common when using pnpm) - end up creating very long paths
+// Using this function we shorten longer paths to prevent paths from hitting the path limit
+function ensureShortPath(str) {
+  if (str.length < 40) return str;
+
+  const assetsPrefix = 'assets/';
+
+  if (!str.startsWith(assetsPrefix)) {
+    console.warn(`Unexpected asset uri - ${str} may not load correctly.`);
+  }
+
+  const postStr = str.slice(assetsPrefix.length);
+  var hash = 0,
+    i,
+    chr;
+  for (i = 0; i < postStr.length; i++) {
+    chr = postStr.charCodeAt(i);
+    hash = (hash << 5) - hash + chr;
+    hash |= 0; // Convert to 32bit integer
+  }
+  return assetsPrefix + hash.toString();
+}
+
+module.exports = ensureShortPath;

package/Libraries/Image/nativeImageSource.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -8,22 +8,20 @@
  * @format
  */
 
-'use strict';
+import type {ImageURISource} from './ImageSource';
 
 import Platform from '../Utilities/Platform';
 
-import type {ImageURISource} from './ImageSource';
-
-type NativeImageSourceSpec = $ReadOnly<{|
+type NativeImageSourceSpec = $ReadOnly<{
   android?: string,
   ios?: string,
   default?: string,
 
   // For more details on width and height, see
-  // https://reactnative.dev/docs/images.html#why-not-automatically-size-everything
+  // https://reactnative.dev/docs/images#why-not-automatically-size-everything
   height: number,
   width: number,
-|}>;
+}>;
 
 /**
  * In hybrid apps, use `nativeImageSource` to access images that are already
@@ -38,7 +36,7 @@ type NativeImageSourceSpec = $ReadOnly<{|
  * automates measurements and allows adding new images without rebuilding the
  * native app. For more details visit:
  *
- *   https://reactnative.dev/docs/images.html
+ *   https://reactnative.dev/docs/images
  *
  */
 function nativeImageSource(spec: NativeImageSourceSpec): ImageURISource {
@@ -63,4 +61,4 @@ function nativeImageSource(spec: NativeImageSourceSpec): ImageURISource {
   };
 }
 
-module.exports = nativeImageSource;
+export default nativeImageSource;

package/Libraries/Image/resolveAssetSource.js

@@ -1,44 +1,48 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
  *
  * @format
- * @flow
+ * @flow strict-local
  */
 
-// Resolves an asset into a `source` for `Image`.
+// Utilities for resolving an asset into a `source` for e.g. `Image`
 
-'use strict';
+import type {ResolvedAssetSource} from './AssetSourceResolver';
+import typeof AssetSourceResolverT from './AssetSourceResolver';
+import type {ImageSource} from './ImageSource';
 
-const AssetRegistry = require('./AssetRegistry');
-const AssetSourceResolver = require('./AssetSourceResolver');
+import SourceCode from '../NativeModules/specs/NativeSourceCode';
 
-import type {ResolvedAssetSource} from './AssetSourceResolver';
+const AssetSourceResolver: AssetSourceResolverT =
+  require('./AssetSourceResolver').default;
+const {pickScale} = require('./AssetUtils');
+const AssetRegistry = require('@react-native/assets-registry/registry');
 
-let _customSourceTransformer, _serverURL, _scriptURL;
+type CustomSourceTransformer = (
+  resolver: AssetSourceResolver,
+) => ?ResolvedAssetSource;
 
+let _customSourceTransformers: Array<CustomSourceTransformer> = [];
+let _serverURL: ?string;
+let _scriptURL: ?string;
 let _sourceCodeScriptURL: ?string;
+
 function getSourceCodeScriptURL(): ?string {
-  if (_sourceCodeScriptURL) {
+  if (_sourceCodeScriptURL != null) {
     return _sourceCodeScriptURL;
   }
 
-  let sourceCode =
-    global.nativeExtensions && global.nativeExtensions.SourceCode;
-  if (!sourceCode) {
-    sourceCode = require('../NativeModules/specs/NativeSourceCode').default;
-  }
-  _sourceCodeScriptURL = sourceCode.getConstants().scriptURL;
+  _sourceCodeScriptURL = SourceCode.getConstants().scriptURL;
   return _sourceCodeScriptURL;
 }
 
 function getDevServerURL(): ?string {
   if (_serverURL === undefined) {
     const sourceCodeScriptURL = getSourceCodeScriptURL();
-    const match =
-      sourceCodeScriptURL && sourceCodeScriptURL.match(/^https?:\/\/.*?\//);
+    const match = sourceCodeScriptURL?.match(/^https?:\/\/.*?\//);
     if (match) {
       // jsBundle was loaded from network
       _serverURL = match[0];
@@ -51,19 +55,25 @@ function getDevServerURL(): ?string {
 }
 
 function _coerceLocalScriptURL(scriptURL: ?string): ?string {
-  if (scriptURL) {
-    if (scriptURL.startsWith('assets://')) {
+  let normalizedScriptURL = scriptURL;
+
+  if (normalizedScriptURL != null) {
+    if (normalizedScriptURL.startsWith('assets://')) {
       // android: running from within assets, no offline path to use
       return null;
     }
-    scriptURL = scriptURL.substring(0, scriptURL.lastIndexOf('/') + 1);
-    if (!scriptURL.includes('://')) {
+    normalizedScriptURL = normalizedScriptURL.substring(
+      0,
+      normalizedScriptURL.lastIndexOf('/') + 1,
+    );
+    if (!normalizedScriptURL.includes('://')) {
       // Add file protocol in case we have an absolute file path and not a URL.
       // This shouldn't really be necessary. scriptURL should be a URL.
-      scriptURL = 'file://' + scriptURL;
+      normalizedScriptURL = 'file://' + normalizedScriptURL;
     }
   }
-  return scriptURL;
+
+  return normalizedScriptURL;
 }
 
 function getScriptURL(): ?string {
@@ -73,18 +83,35 @@ function getScriptURL(): ?string {
   return _scriptURL;
 }
 
+/**
+ * `transformer` can optionally be used to apply a custom transformation when
+ * resolving an asset source. This methods overrides all other custom transformers
+ * that may have been previously registered.
+ */
 function setCustomSourceTransformer(
-  transformer: (resolver: AssetSourceResolver) => ResolvedAssetSource,
+  transformer: CustomSourceTransformer,
 ): void {
-  _customSourceTransformer = transformer;
+  _customSourceTransformers = [transformer];
+}
+
+/**
+ * Adds a `transformer` into the chain of custom source transformers, which will
+ * be applied in the order registered, until one returns a non-null value.
+ */
+function addCustomSourceTransformer(
+  transformer: CustomSourceTransformer,
+): void {
+  _customSourceTransformers.push(transformer);
 }
 
 /**
  * `source` is either a number (opaque type returned by require('./foo.png'))
  * or an `ImageSource` like { uri: '<http location || file path>' }
  */
-function resolveAssetSource(source: any): ?ResolvedAssetSource {
-  if (typeof source === 'object') {
+function resolveAssetSource(source: ?ImageSource): ?ResolvedAssetSource {
+  if (source == null || typeof source === 'object') {
+    // $FlowFixMe[incompatible-exact] `source` doesn't exactly match `ResolvedAssetSource`
+    // $FlowFixMe[incompatible-return] `source` doesn't exactly match `ResolvedAssetSource`
     return source;
   }
 
@@ -98,12 +125,21 @@ function resolveAssetSource(source: any): ?ResolvedAssetSource {
     getScriptURL(),
     asset,
   );
-  if (_customSourceTransformer) {
-    return _customSourceTransformer(resolver);
+
+  // Apply (chained) custom source transformers, if any
+  if (_customSourceTransformers) {
+    for (const customSourceTransformer of _customSourceTransformers) {
+      const transformedSource = customSourceTransformer(resolver);
+      if (transformedSource != null) {
+        return transformedSource;
+      }
+    }
   }
+
   return resolver.defaultAsset();
 }
 
-module.exports = resolveAssetSource;
-module.exports.pickScale = AssetSourceResolver.pickScale;
-module.exports.setCustomSourceTransformer = setCustomSourceTransformer;
+resolveAssetSource.pickScale = pickScale;
+resolveAssetSource.setCustomSourceTransformer = setCustomSourceTransformer;
+resolveAssetSource.addCustomSourceTransformer = addCustomSourceTransformer;
+export default resolveAssetSource;

package/Libraries/Image/resolveAssetSource.win32.js

@@ -9,7 +9,8 @@
 'use strict';
 
 const resolveAssetSource = require('./resolveAssetSource.js'); // Get base impl
-const Platform = require('../Utilities/Platform');
+const Platform = require('../Utilities/Platform').default;
+const ensureShortPath = require('./assetPaths.js');
 
 type IPackagerAsset = {
   __packager_asset: boolean,
@@ -56,7 +57,7 @@ class AssetResolverLateScaleResolution {
    */
   _scaledAssetURLInBundle() {
     const path = this._resolver.bundleUrl || 'file://';
-    return this._fromSource(path + this._getAssetPath());
+    return this._fromSource(path + this._getAssetPath(true));
   }
 
   /**
@@ -66,7 +67,7 @@ class AssetResolverLateScaleResolution {
   _assetServerURL() {
     return this._fromSource(
       this._resolver.serverUrl +
-        this._getAssetPath() +
+        this._getAssetPath(false) +
         '?platform=' +
         Platform.OS +
         '&hash=' +
@@ -77,8 +78,8 @@ class AssetResolverLateScaleResolution {
   /**
    * Returns a path like 'assets/AwesomeModule/icon.png'
    */
-  _getAssetPath(): string {
-    const assetDir = this._getBasePath();
+  _getAssetPath(local: boolean): string {
+    const assetDir = this._getBasePath(local);
     return (
       assetDir +
       '/' +
@@ -88,11 +89,22 @@ class AssetResolverLateScaleResolution {
     );
   }
 
-  _getBasePath() {
+  _getBasePath(local: boolean) {
     let basePath = this._resolver.asset.httpServerLocation;
     if (basePath[0] === '/') {
       basePath = basePath.substr(1);
     }
+
+    if (local) {
+      const safePath = basePath.replace(/\.\.\//g, '_');
+      // If this asset was created with the newer saveAssetPlugin, then we should shorten the path
+      // This conditional is added to allow back compat of older bundles which might have been created without the saveAssetPlugin
+      if (this._resolver.asset.__useShortPath) {
+        return ensureShortPath(safePath);
+      }
+      return safePath;
+    }
+
     return basePath;
   }
 
@@ -103,7 +115,7 @@ class AssetResolverLateScaleResolution {
       height: this._resolver.asset.height,
       uri: source,
       // Include scales info in returned object
-      // This may make it easier to do scale lookups on native side if we dont have that infomation from any kind of manifest
+      // This may make it easier to do scale lookups on native side if we don't have that information from any kind of manifest
       scales: this._resolver.asset.scales,
     };
   }

package/Libraries/Interaction/FrameRateLogger.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -8,8 +8,6 @@
  * @flow strict-local
  */
 
-'use strict';
-
 import NativeFrameRateLogger from './NativeFrameRateLogger';
 
 const invariant = require('invariant');
@@ -32,36 +30,26 @@ const invariant = require('invariant');
  */
 const FrameRateLogger = {
   /**
-   * Enable `debug` to see local logs of what's going on. `reportStackTraces` will grab stack traces
-   * during UI thread stalls and upload them if the native module supports it.
+   * Enable `debug` to see local logs of what's going on.
    */
-  setGlobalOptions: function(options: {
-    debug?: boolean,
-    reportStackTraces?: boolean,
-    ...
-  }) {
+  setGlobalOptions: function (options: {debug?: boolean, ...}) {
     if (options.debug !== undefined) {
       invariant(
         NativeFrameRateLogger,
         'Trying to debug FrameRateLogger without the native module!',
       );
     }
-    if (NativeFrameRateLogger) {
-      // Needs to clone the object first to avoid modifying the argument.
-      const optionsClone = {
-        debug: !!options.debug,
-        reportStackTraces: !!options.reportStackTraces,
-      };
-      NativeFrameRateLogger.setGlobalOptions(optionsClone);
-    }
+    NativeFrameRateLogger?.setGlobalOptions({
+      debug: !!options.debug,
+    });
   },
 
   /**
    * Must call `setContext` before any events can be properly tracked, which is done automatically
    * in `AppRegistry`, but navigation is also a common place to hook in.
    */
-  setContext: function(context: string) {
-    NativeFrameRateLogger && NativeFrameRateLogger.setContext(context);
+  setContext: function (context: string) {
+    NativeFrameRateLogger?.setContext(context);
   },
 
   /**
@@ -69,7 +57,7 @@ const FrameRateLogger = {
    * automatically.
    */
   beginScroll() {
-    NativeFrameRateLogger && NativeFrameRateLogger.beginScroll();
+    NativeFrameRateLogger?.beginScroll();
   },
 
   /**
@@ -77,8 +65,8 @@ const FrameRateLogger = {
    * automatically.
    */
   endScroll() {
-    NativeFrameRateLogger && NativeFrameRateLogger.endScroll();
+    NativeFrameRateLogger?.endScroll();
   },
 };
 
-module.exports = FrameRateLogger;
+export default FrameRateLogger;