@office-iss/react-native-win32 0.72.5 → 0.72.6

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Wed, 27 Sep 2023 21:02:07 GMT",
+      "date": "Mon, 09 Oct 2023 15:13:04 GMT",
+      "tag": "@office-iss/react-native-win32_v0.72.6",
+      "version": "0.72.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "2255827c0902a9740b9e029ce22f02fb445093e1",
+            "comment": "Have RCTNetworking.win32 fork RCTNetworking.ios (#12199)"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 27 Sep 2023 21:02:34 GMT",
       "tag": "@office-iss/react-native-win32_v0.72.5",
       "version": "0.72.5",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,25 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Wed, 27 Sep 2023 21:02:07 GMT and should not be manually modified.
+This log was last generated on Mon, 09 Oct 2023 15:13:04 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.72.5
+## 0.72.6
 
-Wed, 27 Sep 2023 21:02:07 GMT
+Mon, 09 Oct 2023 15:13:04 GMT
 
 ### Patches
 
-- Bump react-native dependency to 0.72.5 (30809111+acoates-ms@users.noreply.github.com)
+- Have RCTNetworking.win32 fork RCTNetworking.ios (#12199) (julio.rocha@microsoft.com)
 
+## 0.72.5
+
+Wed, 27 Sep 2023 21:02:34 GMT
+
+### Patches
+
+- Bump react-native dependency to 0.72.5 (30809111+acoates-ms@users.noreply.github.com)
+
 ## 0.72.4
 
 Mon, 11 Sep 2023 15:14:55 GMT

package/Libraries/Network/RCTNetworking.win32.js

@@ -1,6 +1,8 @@
 /**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
+ * 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-local
  * @format
@@ -9,11 +11,10 @@
 'use strict';
 
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-const RCTNetworkingNative =
-  require('../BatchedBridge/NativeModules').Networking; // [Windows]
-import {type NativeResponseType} from './XMLHttpRequest';
-import convertRequestBody, {type RequestBody} from './convertRequestBody';
 import {type EventSubscription} from '../vendor/emitter/EventEmitter';
+import convertRequestBody, {type RequestBody} from './convertRequestBody';
+import NativeNetworkingIOS from './NativeNetworkingIOS';
+import {type NativeResponseType} from './XMLHttpRequest';
 
 type RCTNetworkingEventDefinitions = $ReadOnly<{
   didSendNetworkData: [
@@ -61,11 +62,6 @@ type RCTNetworkingEventDefinitions = $ReadOnly<{
   ],
 }>;
 
-let _requestId = 1;
-function generateRequestId(): number {
-  return _requestId++;
-}
-
 const RCTNetworking = {
   addListener<K: $Keys<RCTNetworkingEventDefinitions>>(
     eventType: K,
@@ -88,13 +84,11 @@ const RCTNetworking = {
     callback: (requestId: number) => void,
     withCredentials: boolean,
   ) {
-    const requestId = generateRequestId();
     const body = convertRequestBody(data);
-    RCTNetworkingNative.sendRequest(
+    NativeNetworkingIOS.sendRequest(
       {
         method,
         url,
-        requestId,
         data: {...body, trackingName},
         headers,
         responseType,
@@ -107,11 +101,11 @@ const RCTNetworking = {
   },
 
   abortRequest(requestId: number) {
-    RCTNetworkingNative.abortRequest(requestId);
+    NativeNetworkingIOS.abortRequest(requestId);
   },
 
   clearCookies(callback: (result: boolean) => void) {
-    RCTNetworkingNative.clearCookies(callback);
+    NativeNetworkingIOS.clearCookies(callback);
   },
 };
 

package/overrides.json

@@ -343,10 +343,10 @@
       "baseHash": "daeb879969c322e67efcb9595d6bb171b9dad6d8"
     },
     {
-      "type": "derived",
+      "type": "copy",
       "file": "src/Libraries/Network/RCTNetworking.win32.js",
-      "baseFile": "packages/react-native/Libraries/Network/RCTNetworking.android.js",
-      "baseHash": "67d0d4757fcd7a1c2c0f6de642f713f0fa300e28",
+      "baseFile": "packages/react-native/Libraries/Network/RCTNetworking.ios.js",
+      "baseHash": "39fc8e1003b0f6345ec4fea060f455d06939a321",
       "issue": 4318
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.72.5",
+  "version": "0.72.6",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",