[0.72] Integrate RN 0.72.3 (#11878)

* Upgrade our dependency on RN to 0.72.3. * Updates the `Fabric/ImageRequest.cpp` override.
microsoft · Jul 12, 2023 · 4b90fba · 4b90fba
1 parent 225cb65
commit 4b90fba
Show file tree

Hide file tree

Showing 22 changed files with 301 additions and 280 deletions.
diff --git a/change/@office-iss-react-native-win32-f52ab5db-c51d-444a-965e-d4a8846e3e26.json b/change/@office-iss-react-native-win32-f52ab5db-c51d-444a-965e-d4a8846e3e26.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "[0.72] Integrate RN 0.72.3",
+  "packageName": "@office-iss/react-native-win32",
+  "email": "jthysell@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-741a69d7-acdc-4318-ae23-10aa6339fe02.json b/change/react-native-windows-741a69d7-acdc-4318-ae23-10aa6339fe02.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "[0.72] Integrate RN 0.72.3",
+  "packageName": "react-native-windows",
+  "email": "jthysell@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/@office-iss/react-native-win32-tester/overrides.json b/packages/@office-iss/react-native-win32-tester/overrides.json
@@ -5,7 +5,7 @@
   "excludePatterns": [
     "src/js/examples-win32/**"
   ],
-  "baseVersion": "0.72.0",
+  "baseVersion": "0.72.3",
   "overrides": [
     {
       "type": "patch",

diff --git a/packages/@office-iss/react-native-win32-tester/package.json b/packages/@office-iss/react-native-win32-tester/package.json
@@ -30,7 +30,7 @@
     "@types/node": "^16.0.0",
     "eslint": "^8.19.0",
     "just-scripts": "^1.3.3",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-platform-override": "^1.9.4",
     "typescript": "^4.9.5"
   },

diff --git a/packages/@office-iss/react-native-win32/overrides.json b/packages/@office-iss/react-native-win32/overrides.json
@@ -7,7 +7,7 @@
     "**/__snapshots__/**",
     "src/rntypes/**"
   ],
-  "baseVersion": "0.72.0",
+  "baseVersion": "0.72.3",
   "overrides": [
     {
       "type": "derived",

diff --git a/packages/@office-iss/react-native-win32/package.json b/packages/@office-iss/react-native-win32/package.json
@@ -26,16 +26,16 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native-community/cli": "11.3.2",
-    "@react-native-community/cli-platform-android": "11.3.2",
-    "@react-native-community/cli-platform-ios": "11.3.2",
+    "@react-native-community/cli": "11.3.5",
+    "@react-native-community/cli-platform-android": "11.3.5",
+    "@react-native-community/cli-platform-ios": "11.3.5",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.6",
-    "@react-native/gradle-plugin": "^0.72.10",
+    "@react-native/gradle-plugin": "^0.72.11",
     "@react-native/js-polyfills": "^0.72.1",
     "@react-native/normalize-colors": "^0.72.0",
-    "@react-native/virtualized-lists": "^0.72.5",
+    "@react-native/virtualized-lists": "^0.72.6",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "art": "^0.10.0",
@@ -47,8 +47,8 @@
     "jest-environment-node": "^29.2.1",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "0.76.5",
-    "metro-source-map": "0.76.5",
+    "metro-runtime": "0.76.7",
+    "metro-source-map": "0.76.7",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
@@ -83,13 +83,13 @@
     "just-scripts": "^1.3.3",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-platform-override": "^1.9.4",
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "react": "18.2.0",
-    "react-native": "^0.72.0"
+    "react-native": "^0.72.3"
   },
   "beachball": {
     "defaultNpmTag": "latest",

diff --git a/packages/@react-native-windows/automation-channel/package.json b/packages/@react-native-windows/automation-channel/package.json
@@ -31,7 +31,7 @@
     "just-scripts": "^1.3.2",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-windows": "0.72.1",
     "typescript": "^4.9.5"
   },

diff --git a/packages/@react-native-windows/tester/overrides.json b/packages/@react-native-windows/tester/overrides.json
@@ -5,7 +5,7 @@
   "excludePatterns": [
     "src/js/examples-win/**"
   ],
-  "baseVersion": "0.72.0",
+  "baseVersion": "0.72.3",
   "overrides": [
     {
       "type": "patch",

diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json
@@ -31,7 +31,7 @@
     "@types/node": "^16.0.0",
     "eslint": "^8.19.0",
     "just-scripts": "^1.3.3",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-platform-override": "^1.9.4",
     "react-native-windows": "0.72.1",
     "typescript": "^4.9.5"

diff --git a/packages/@react-native/monorepo/overrides.json b/packages/@react-native/monorepo/overrides.json
@@ -1,11 +1,11 @@
 {
-  "baseVersion": "0.72.0",
+  "baseVersion": "0.72.3",
   "overrides": [
     {
       "type": "patch",
       "file": "package.json",
       "baseFile": "package.json",
-      "baseHash": "5d8ecbedec444403040d3ea44c5c6add9fa00deb"
+      "baseHash": "0a0ebaa4960b60c85109362c4713764b16e0a7be"
     }
   ]
 }
diff --git a/packages/@react-native/monorepo/package.json b/packages/@react-native/monorepo/package.json
@@ -53,7 +53,7 @@
     "@babel/plugin-transform-regenerator": "^7.20.0",
     "@definitelytyped/dtslint": "^0.0.127",
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native/metro-config": "^0.72.6",
+    "@react-native/metro-config": "^0.72.9",
     "@reactions/component": "^2.0.2",
     "@types/react": "^18.0.18",
     "@typescript-eslint/parser": "^5.30.5",
@@ -82,9 +82,9 @@
     "jest": "^29.2.1",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.14.0",
-    "metro-babel-register": "0.76.5",
-    "metro-memory-fs": "0.76.5",
-    "metro-react-native-babel-transformer": "0.76.5",
+    "metro-babel-register": "0.76.7",
+    "metro-memory-fs": "0.76.7",
+    "metro-react-native-babel-transformer": "0.76.7",
     "mkdirp": "^0.5.1",
     "mock-fs": "^5.1.4",
     "prettier": "^2.4.1",

diff --git a/packages/@react-native/tester/overrides.json b/packages/@react-native/tester/overrides.json
@@ -1,5 +1,5 @@
 {
-  "baseVersion": "0.72.0",
+  "baseVersion": "0.72.3",
   "overrides": [
     {
       "type": "copy",

diff --git a/packages/e2e-test-app-fabric/package.json b/packages/e2e-test-app-fabric/package.json
@@ -18,7 +18,7 @@
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-windows": "0.72.1"
   },
   "devDependencies": {

diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json
@@ -19,7 +19,7 @@
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-windows": "0.72.1",
     "react-native-xaml": "^0.0.74"
   },

diff --git a/packages/integration-test-app/package.json b/packages/integration-test-app/package.json
@@ -16,7 +16,7 @@
     "@typescript-eslint/parser": "^5.21.0",
     "chai": "^4.2.0",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-windows": "0.72.1"
   },
   "devDependencies": {

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -15,7 +15,7 @@
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-windows": "0.72.1"
   },
   "devDependencies": {

diff --git a/packages/sample-apps/package.json b/packages/sample-apps/package.json
@@ -15,7 +15,7 @@
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-windows": "0.72.1"
   },
   "devDependencies": {

diff --git a/vnext/Microsoft.ReactNative/Fabric/ImageRequest.cpp b/vnext/Microsoft.ReactNative/Fabric/ImageRequest.cpp
@@ -5,22 +5,20 @@
 
 #include <react/renderer/imagemanager/ImageRequest.h>
 
-namespace facebook {
-namespace react {
-
-ImageRequest::ImageRequest(ImageSource imageSource, std::shared_ptr<const ImageTelemetry> telemetry)
-    : imageSource_(std::move(imageSource)), telemetry_(std::move(telemetry)) {
+namespace facebook::react {
+
+ImageRequest::ImageRequest(
+    ImageSource imageSource,
+    std::shared_ptr<const ImageTelemetry> telemetry,
+    SharedFunction<> cancelationFunction)
+    : imageSource_(std::move(imageSource)),
+      telemetry_(std::move(telemetry)),
+      cancelRequest_(std::move(cancelationFunction)) {
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
 }
 
-void ImageRequest::setCancelationFunction(std::function<void(void)> cancelationFunction) {
-  cancelRequest_ = cancelationFunction;
-}
-
 void ImageRequest::cancel() const {
-  if (cancelRequest_) {
-    cancelRequest_();
-  }
+  cancelRequest_();
 }
 
 const ImageSource &ImageRequest::getImageSource() const {
@@ -39,5 +37,4 @@ const std::shared_ptr<const ImageResponseObserverCoordinator> &ImageRequest::get
   return coordinator_;
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/vnext/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp b/vnext/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp
@@ -79,7 +79,7 @@ void generateBitmap(
 facebook::react::ImageRequest WindowsImageManager::requestImage(
     const facebook::react::ImageSource &imageSource,
     facebook::react::SurfaceId surfaceId) const {
-  auto imageRequest = facebook::react::ImageRequest(imageSource, nullptr);
+  auto imageRequest = facebook::react::ImageRequest(imageSource, nullptr, {});
 
   auto weakObserverCoordinator = (std::weak_ptr<const facebook::react::ImageResponseObserverCoordinator>)
                                      imageRequest.getSharedObserverCoordinator();

diff --git a/vnext/overrides.json b/vnext/overrides.json
@@ -8,7 +8,7 @@
     "**/__snapshots__/**",
     "src/rntypes/**"
   ],
-  "baseVersion": "0.72.0",
+  "baseVersion": "0.72.3",
   "overrides": [
     {
       "type": "derived",
@@ -50,7 +50,7 @@
       "type": "derived",
       "file": "Microsoft.ReactNative/Fabric/ImageRequest.cpp",
       "baseFile": "packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp",
-      "baseHash": "106181f5367b924b2ee2572842e9f2159427e3c2"
+      "baseHash": "99012d5d02bdafa53a4638ecd1f56ada5fc050a5"
     },
     {
       "type": "patch",

diff --git a/vnext/package.json b/vnext/package.json
@@ -23,17 +23,17 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native-community/cli": "11.3.2",
-    "@react-native-community/cli-platform-android": "11.3.2",
-    "@react-native-community/cli-platform-ios": "11.3.2",
+    "@react-native-community/cli": "11.3.5",
+    "@react-native-community/cli-platform-android": "11.3.5",
+    "@react-native-community/cli-platform-ios": "11.3.5",
     "@react-native-windows/cli": "0.72.0",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.6",
-    "@react-native/gradle-plugin": "^0.72.10",
+    "@react-native/gradle-plugin": "^0.72.11",
     "@react-native/js-polyfills": "^0.72.1",
     "@react-native/normalize-colors": "^0.72.0",
-    "@react-native/virtualized-lists": "^0.72.5",
+    "@react-native/virtualized-lists": "^0.72.6",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
@@ -44,8 +44,8 @@
     "jest-environment-node": "^29.2.1",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "0.76.5",
-    "metro-source-map": "0.76.5",
+    "metro-runtime": "0.76.7",
+    "metro-source-map": "0.76.7",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
@@ -80,14 +80,14 @@
     "metro-config": "0.76.4",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.72.0",
+    "react-native": "0.72.3",
     "react-native-platform-override": "^1.9.4",
     "react-refresh": "^0.4.0",
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "react": "18.2.0",
-    "react-native": "^0.72.0"
+    "react-native": "^0.72.3"
   },
   "beachball": {
     "defaultNpmTag": "latest",
@@ -147,4 +147,4 @@
   "engines": {
     "node": ">= 16"
   }
-}
+}