@office-iss/react-native-win32 0.71.15 → 0.71.17

package/CHANGELOG.json

@@ -2,7 +2,37 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Mon, 28 Aug 2023 15:14:00 GMT",
+      "date": "Tue, 03 Oct 2023 02:36:38 GMT",
+      "tag": "@office-iss/react-native-win32_v0.71.17",
+      "version": "0.71.17",
+      "comments": {
+        "patch": [
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "2dabf59f4f401cba6b7f83ec350bd79cb82fed19",
+            "comment": "Have RCTNetworking.win32 fork RCTNetworking.ios (#12199)"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 11 Sep 2023 15:13:29 GMT",
+      "tag": "@office-iss/react-native-win32_v0.71.16",
+      "version": "0.71.16",
+      "comments": {
+        "patch": [
+          {
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "18112893dd511de823af08cc36b01b818cb305f1",
+            "comment": "Webpack assets do not prefix paths with /, which causes a lost char in asset path"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 28 Aug 2023 15:14:29 GMT",
       "tag": "@office-iss/react-native-win32_v0.71.15",
       "version": "0.71.15",
       "comments": {

package/CHANGELOG.md

@@ -1,18 +1,34 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Mon, 28 Aug 2023 15:14:00 GMT and should not be manually modified.
+This log was last generated on Tue, 03 Oct 2023 02:36:38 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.71.15
+## 0.71.17
 
-Mon, 28 Aug 2023 15:14:00 GMT
+Tue, 03 Oct 2023 02:36:38 GMT
 
 ### Patches
 
-- fix a11yState and add support for aria-required and -multiselectable (krsiler@microsoft.com)
-- Remove flow usage from saveAssetPlugin codeflow (30809111+acoates-ms@users.noreply.github.com)
+- Have RCTNetworking.win32 fork RCTNetworking.ios (#12199) (julio.rocha@microsoft.com)
 
+## 0.71.16
+
+Mon, 11 Sep 2023 15:13:29 GMT
+
+### Patches
+
+- Webpack assets do not prefix paths with /, which causes a lost char in asset path (30809111+acoates-ms@users.noreply.github.com)
+
+## 0.71.15
+
+Mon, 28 Aug 2023 15:14:29 GMT
+
+### Patches
+
+- fix a11yState and add support for aria-required and -multiselectable (krsiler@microsoft.com)
+- Remove flow usage from saveAssetPlugin codeflow (30809111+acoates-ms@users.noreply.github.com)
+
 ## 0.71.14
 
 Fri, 11 Aug 2023 00:26:16 GMT

package/Libraries/Image/resolveAssetSource.win32.js

@@ -90,10 +90,13 @@ class AssetResolverLateScaleResolution {
   }
 
   _getBasePath(local: boolean) {
+    let basePath = this._resolver.asset.httpServerLocation;
+    if (basePath[0] === '/') {
+      basePath = basePath.substr(1);
+    }
+
     if (local) {
-      const safePath = this._resolver.asset.httpServerLocation
-        .substr(1)
-        .replace(/\.\.\//g, '_');
+      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) {
@@ -102,10 +105,6 @@ class AssetResolverLateScaleResolution {
       return safePath;
     }
 
-    let basePath = this._resolver.asset.httpServerLocation;
-    if (basePath[0] === '/') {
-      basePath = basePath.substr(1);
-    }
     return basePath;
   }
 

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

@@ -319,10 +319,10 @@
       "baseHash": "a14d9698dc312aaba608b2877349d4c54600b56c"
     },
     {
-      "type": "derived",
+      "type": "copy",
       "file": "src/Libraries/Network/RCTNetworking.win32.js",
-      "baseFile": "Libraries/Network/RCTNetworking.android.js",
-      "baseHash": "391a7efd0d2529eb536c1c7cf852f5ee538ff0b6",
+      "baseFile": "Libraries/Network/RCTNetworking.ios.js",
+      "baseHash": "b9d169d83ea1ccd04321190896b5e5e02809f940",
       "issue": 4318
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.71.15",
+  "version": "0.71.17",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "license": "MIT",
   "main": "./index.win32.js",