Bump folly to 2024.10.14.00 (#14532)

* merge in folly 2024.10.14.00

* download fastfloat into node_modules

* Change files

* fix includes

* fix cachelocality

* fix desktop.dll

* clean paths and fix ARM64EC

* add FastFloatCommitHash to folly CGManifest

* fix types

* revert package.lock and fix json file path

* manually fix spacing

* fix

* feedback

Author: TatianaKapos

change/react-native-windows-4080fb51-cbec-4c0c-b2e6-3a14a8be8965.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "merge in folly 2024.10.14.00",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

vnext/Desktop.DLL/react-native-win32.x64.def

@@ -5,12 +5,9 @@
 ; **************************************************************************************************
 
 EXPORTS
-??0dynamic@folly@@QEAA@$$QEAU01@@Z
 ??8folly@@YA_NAEBUdynamic@0@0@Z
 ??4dynamic@folly@@QEAAAEAU01@$$QEAU01@@Z
-?hash@dynamic@folly@@QEBA_KXZ
 ??Mfolly@@YA_NAEBUdynamic@0@0@Z
-?destroy@dynamic@folly@@AEAAXXZ
 ??0TypeError@folly@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Type@dynamic@1@@Z
 ??0dynamic@folly@@QEAA@AEBU01@@Z
 ??$safe_assert_terminate@$0A@@detail@folly@@YAXPEBUsafe_assert_arg@01@ZZ
@@ -29,7 +26,6 @@ EXPORTS
 ?Make@IWebSocketResource@Networking@React@Microsoft@@SA?AV?$shared_ptr@UIWebSocketResource@Networking@React@Microsoft@@@std@@XZ
 ?Make@JSBigAbiString@react@facebook@@SA?AV?$unique_ptr@$$CBUJSBigAbiString@react@facebook@@U?$default_delete@$$CBUJSBigAbiString@react@facebook@@@std@@@std@@$$QEAV?$unique_ptr@U?$IAbiArray@D@AbiSafe@@UAbiObjectDeleter@2@@5@@Z
 ?at@dynamic@folly@@QEGBAAEBU12@V?$Range@PEBD@2@@Z
-?atImpl@dynamic@folly@@AEGBAAEBU12@AEBU12@@Z
 ?getRuntimeExecutor@Instance@react@facebook@@QEAA?AV?$function@$$A6AX$$QEAV?$function@$$A6AXAEAVRuntime@jsi@facebook@@@Z@std@@@Z@std@@XZ
 ?callJSFunction@Instance@react@facebook@@QEAAX$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0$$QEAUdynamic@folly@@@Z
 ?createI18nModule@windows@react@@YA?AV?$unique_ptr@VCxxModule@module@xplat@facebook@@U?$default_delete@VCxxModule@module@xplat@facebook@@@std@@@std@@V?$unique_ptr@UII18nModule@windows@react@@U?$default_delete@UII18nModule@windows@react@@@std@@@4@@Z
@@ -40,13 +36,11 @@ EXPORTS
 ?get_ptr@dynamic@folly@@QEGBAPEBU12@V?$Range@PEBD@2@@Z
 ?get_ptrImpl@dynamic@folly@@AEGBAPEBU12@AEBU12@@Z
 ?loadScriptFromString@Instance@react@facebook@@QEAAXV?$unique_ptr@$$CBVJSBigString@react@facebook@@U?$default_delete@$$CBVJSBigString@react@facebook@@@std@@@std@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@_N@Z
-?makeConversionError@folly@@YA?AVConversionError@1@W4ConversionCode@1@V?$Range@PEBD@1@@Z
 ?moduleNames@ModuleRegistry@react@facebook@@QEAA?AV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@XZ
 ?assertionFailure@detail@folly@@YAXPEBD00I0H@Z
 ?parseJson@folly@@YA?AUdynamic@1@V?$Range@PEBD@1@@Z
 ?setGlobalVariable@Instance@react@facebook@@QEAAXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@$$CBVJSBigString@react@facebook@@U?$default_delete@$$CBVJSBigString@react@facebook@@@std@@@5@@Z
 ?size@dynamic@folly@@QEBA_KXZ
-?str_to_bool@detail@folly@@YA?AV?$Expected@_NW4ConversionCode@folly@@@2@PEAV?$Range@PEBD@2@@Z
 ?toJson@folly@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUdynamic@1@@Z
 ?typeName@dynamic@folly@@QEBAPEBDXZ
 ?Utf16ToUtf8@Unicode@Common@Microsoft@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@5@@Z

vnext/Desktop.DLL/react-native-win32.x86.def

@@ -5,12 +5,9 @@
 ; **************************************************************************************************
 
 EXPORTS
-??0dynamic@folly@@QAE@$$QAU01@@Z
 ??8folly@@YG_NABUdynamic@0@0@Z
 ??Mfolly@@YG_NABUdynamic@0@0@Z
 ??4dynamic@folly@@QAEAAU01@$$QAU01@@Z
-?hash@dynamic@folly@@QBEIXZ
-?destroy@dynamic@folly@@AAEXXZ
 ??0TypeError@folly@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4Type@dynamic@1@@Z
 ??0dynamic@folly@@QAE@ABU01@@Z
 ??4dynamic@folly@@QAEAAU01@ABU01@@Z
@@ -30,7 +27,6 @@ EXPORTS
 ?Make@JSBigAbiString@react@facebook@@SG?AV?$unique_ptr@$$CBUJSBigAbiString@react@facebook@@U?$default_delete@$$CBUJSBigAbiString@react@facebook@@@std@@@std@@$$QAV?$unique_ptr@U?$IAbiArray@D@AbiSafe@@UAbiObjectDeleter@2@@5@@Z
 ?moduleNames@ModuleRegistry@react@facebook@@QAE?AV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@XZ
 ?at@dynamic@folly@@QGBEABU12@V?$Range@PBD@2@@Z
-?atImpl@dynamic@folly@@AGBEABU12@ABU12@@Z
 ?getRuntimeExecutor@Instance@react@facebook@@QAE?AV?$function@$$A6GX$$QAV?$function@$$A6GXAAVRuntime@jsi@facebook@@@Z@std@@@Z@std@@XZ
 ?callJSFunction@Instance@react@facebook@@QAEX$$QAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@0$$QAUdynamic@folly@@@Z
 ?createI18nModule@windows@react@@YG?AV?$unique_ptr@VCxxModule@module@xplat@facebook@@U?$default_delete@VCxxModule@module@xplat@facebook@@@std@@@std@@V?$unique_ptr@UII18nModule@windows@react@@U?$default_delete@UII18nModule@windows@react@@@std@@@4@@Z
@@ -40,11 +36,9 @@ EXPORTS
 ?get_ptr@dynamic@folly@@QGBEPBU12@V?$Range@PBD@2@@Z
 ?get_ptrImpl@dynamic@folly@@AGBEPBU12@ABU12@@Z
 ?loadScriptFromString@Instance@react@facebook@@QAEXV?$unique_ptr@$$CBVJSBigString@react@facebook@@U?$default_delete@$$CBVJSBigString@react@facebook@@@std@@@std@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@_N@Z
-?makeConversionError@folly@@YG?AVConversionError@1@W4ConversionCode@1@V?$Range@PBD@1@@Z
 ?parseJson@folly@@YG?AUdynamic@1@V?$Range@PBD@1@@Z
 ?setGlobalVariable@Instance@react@facebook@@QAEXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@$$CBVJSBigString@react@facebook@@U?$default_delete@$$CBVJSBigString@react@facebook@@@std@@@5@@Z
 ?size@dynamic@folly@@QBEIXZ
-?str_to_bool@detail@folly@@YG?AV?$Expected@_NW4ConversionCode@folly@@@2@PAV?$Range@PBD@2@@Z
 ?toJson@folly@@YG?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@ABUdynamic@1@@Z
 ?typeName@dynamic@folly@@QBEPBDXZ
 ?Utf16ToUtf8@Unicode@Common@Microsoft@@YG?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@ABV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@5@@Z

vnext/Directory.Build.props

@@ -19,9 +19,11 @@
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == '' AND '$(BuildingInRnwRepo)' == 'true'">true</EnableSourceLink>
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
-    <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit and build Folly.vcxproj (to update its cgmanifest.json) too. -->
-    <FollyVersion>2024.01.01.00</FollyVersion>
-    <FollyCommitHash>234d39a36a43106747d10cc19efada72fd810dd3</FollyCommitHash>
+    <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit, find the matching fastfloat dependency and build Folly.vcxproj (to update its cgmanifest.json) too. -->
+    <FollyVersion>2024.10.14.00</FollyVersion>
+    <FastFloatVersion>6.1.4</FastFloatVersion>
+    <FollyCommitHash>ad90720829db5ba0c3d0e44994856dcce33d7940</FollyCommitHash>
+    <FastFloatCommitHash>ad90720829db5ba0c3d0e44994856dcce33d7940</FastFloatCommitHash>
     <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
     <FmtVersion>10.1.0</FmtVersion>
     <FmtCommitHash>ca2e3685b160617d3d95fcd9e789c4e06ca88</FmtCommitHash>

vnext/Folly/Folly.vcxproj

@@ -64,7 +64,7 @@
     <ClCompile Include="$(FollyDir)\folly\system\ThreadId.cpp" />
     <ClCompile Include="$(FollyDir)\folly\lang\SafeAssert.cpp" />
     <ClCompile Include="$(FollyDir)\folly\lang\ToAscii.cpp" />
-    <ClCompile Include="$(FollyDir)\folly\json_pointer.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\json\json_pointer.cpp" />
     <ClCompile Include="$(FollyDir)\folly\Format.cpp" />
     <ClCompile Include="$(FollyDir)\folly\String.cpp" />
     <ClCompile Include="$(FollyDir)\folly\container\detail\F14Table.cpp" />
@@ -73,8 +73,8 @@
       <ObjectFileName>$(IntDir)\portabilityString.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="$(FollyDir)\folly\Demangle.cpp" />
-    <ClCompile Include="$(FollyDir)\folly\dynamic.cpp" />
-    <ClCompile Include="$(FollyDir)\folly\json.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\json\dynamic.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\json\json.cpp" />
     <ClCompile Include="$(FollyDir)\folly\hash\SpookyHashV2.cpp" />
     <ClCompile Include="$(FollyDir)\folly\ScopeGuard.cpp" />
     <ClCompile Include="$(FollyDir)\folly\Unicode.cpp" />
@@ -106,7 +106,7 @@
     <ClInclude Include="$(FollyDir)\folly\Demangle.h" />
     <ClInclude Include="$(FollyDir)\folly\detail\AtomicHashUtils.h" />
     <ClInclude Include="$(FollyDir)\folly\detail\AtomicUnorderedMapUtils.h" />
-    <ClInclude Include="$(FollyDir)\folly\detail\CacheLocality.h" />
+    <ClInclude Include="$(FollyDir)\folly\concurrency\CacheLocality.h" />
     <ClInclude Include="$(FollyDir)\folly\detail\DiscriminatedPtrDetail.h" />
     <ClInclude Include="$(FollyDir)\folly\detail\FileUtilDetail.h" />
     <ClInclude Include="$(FollyDir)\folly\detail\FingerprintPolynomial.h" />
@@ -127,6 +127,9 @@
     <ClInclude Include="$(FollyDir)\folly\dynamic-inl.h" />
     <ClInclude Include="$(FollyDir)\folly\dynamic.h" />
     <ClInclude Include="$(FollyDir)\folly\DynamicConverter.h" />
+    <ClInclude Include="$(FollyDir)\folly\json\dynamic-inl.h" />
+    <ClInclude Include="$(FollyDir)\folly\json\dynamic.h" />
+    <ClInclude Include="$(FollyDir)\folly\json\DynamicConverter.h" />
     <ClInclude Include="$(FollyDir)\folly\Exception.h" />
     <ClInclude Include="$(FollyDir)\folly\ExceptionString.h" />
     <ClInclude Include="$(FollyDir)\folly\ExceptionWrapper.h" />
@@ -151,7 +154,7 @@
     <ClInclude Include="$(FollyDir)\folly\IPAddressException.h" />
     <ClInclude Include="$(FollyDir)\folly\IPAddressV4.h" />
     <ClInclude Include="$(FollyDir)\folly\IPAddressV6.h" />
-    <ClInclude Include="$(FollyDir)\folly\json.h" />
+    <ClInclude Include="$(FollyDir)\folly\json\json.h" />
     <ClInclude Include="$(FollyDir)\folly\lang\ToAscii.h" />
     <ClInclude Include="$(FollyDir)\folly\Lazy.h" />
     <ClInclude Include="$(FollyDir)\folly\Likely.h" />
@@ -220,6 +223,10 @@
     <ClInclude Include="$(FollyDir)\folly\SpinLock.h" />
     <ClInclude Include="$(FollyDir)\folly\stop_watch.h" />
     <ClInclude Include="$(FollyDir)\folly\String-inl.h" />
+    <ClInclude Include="$(FollyDir)\hash\MurmurHash.h" />
+    <ClInclude Include="$(FollyDir)\hash\SpookyHashV1.h" />
+    <ClInclude Include="$(FollyDir)\hash\SpookyHashV2.h" />
+    <ClInclude Include="$(FollyDir)\functional\ApplyTuple.h" />
     <ClInclude Include="$(FollyDir)\folly\String.h" />
     <ClInclude Include="$(FollyDir)\folly\Subprocess.h" />
     <ClInclude Include="$(FollyDir)\folly\Synchronized.h" />
@@ -234,7 +241,9 @@
     <ClInclude Include="$(FollyDir)\folly\Unit.h" />
     <ClInclude Include="$(FollyDir)\folly\Uri-inl.h" />
     <ClInclude Include="$(FollyDir)\folly\Uri.h" />
+    <ClInclude Include="$(FollyDir)\folly\Utility.h" />
     <ClInclude Include="$(FollyDir)\folly\Varint.h" />
+    <ClInclude Include="$(FollyDir)\..\fast_float-6.1.4\include\fast_float\fast_float.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
@@ -262,7 +271,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ReactNativeWindowsDir)stubs;$(FollyDir);$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ReactNativeWindowsDir)stubs;$(FollyDir);$(FollyDir)\..\fast_float-6.1.4\include;$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FOLLY_CFG_NO_COROUTINES;FOLLY_NO_CONFIG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WINAPI_PARTITION_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedUsingFiles />
       <DisableSpecificWarnings>4251;4293;4305;4800;4804;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -282,6 +291,10 @@
     <FollyZipFile>$(FollyZipDir)\folly-$(FollyVersion).zip</FollyZipFile>
     <CGManifestFile>$(MSBuildThisFileDirectory)cgmanifest.json</CGManifestFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <FastFloatZipDir>$(FollyDir)..\.fastfloatzip</FastFloatZipDir>
+    <FastFloatZipFile>$(FollyDir)..\.fastfloatzip\fastfloat.zip</FastFloatZipFile>
+  </PropertyGroup>
   <Target Name="DownloadFolly" BeforeTargets="PrepareForBuild" Inputs="$(FollyZipFile)" Outputs="$(FollyZipFile)">
     <Message Importance="High" Text="Downloading folly..." />
     <DownloadFile
@@ -290,6 +303,14 @@
       DestinationFolder="$(FollyZipDir)"
       Retries="10" />
   </Target>
+  <Target Name="DownloadFastFloat" BeforeTargets="PrepareForBuild" Inputs="$(FastFloatZipFile)" Outputs="$(FastFloatZipFile)">
+    <Message Importance="High" Text="Downloading FastFloat (folly dependency)..." />
+    <DownloadFile
+      SourceUrl="https://github.com/fastfloat/fast_float/archive/refs/tags/v$(FastFloatVersion).zip"
+      DestinationFileName="$(FastFloatZipFile)"
+      DestinationFolder="$(FastFloatZipDir)"
+      Retries="10" />
+  </Target>
   <Target Name="UnzipFolly" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFolly">
     <Message Condition="!Exists('$(FollyDir)folly\dynamic.h')" Importance="High" Text="Unzipping folly to $([MSBuild]::NormalizePath($(FollyDir)..))." />
     <Unzip
@@ -298,6 +319,14 @@
       DestinationFolder="$([MSBuild]::NormalizePath($(FollyDir)..))"
       OverwriteReadOnlyFiles="true" />
   </Target>
+  <Target Name="UnzipFastFloat" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFastFloat">
+    <Message Condition="!Exists('$(FastFloatZipDir)\include\fast_float.h')" Importance="High" Text="Unzipping FastFloat to $([MSBuild]::NormalizePath($(FastFloatZipDir)..))." />
+    <Unzip
+      Condition="!Exists('$(FastFloatZipDir)\include\fast_float.h')"
+      SourceFiles="$(FastFloatZipFile)"
+      DestinationFolder="$([MSBuild]::NormalizePath($(FollyDir)..))"
+      OverwriteReadOnlyFiles="true" />
+  </Target>
   <Target Name="WriteCGManifest" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadFolly" Inputs="$(FollyZipFile)" Outputs="$(CGManifestFile)">
     <PropertyGroup>
       <CGManifestText>{
@@ -312,6 +341,16 @@
                 }
             },
             "DevelopmentDependency": false
+        },
+        {
+            "Component": {
+                "Type": "git",
+                "Git": {
+                  "RepositoryUrl": "https://github.com/fastfloat/fast_float",
+                  "CommitHash": "$(FastFloatCommitHash)"
+                }
+            },
+            "DevelopmentDependency": false
         }
     ]
 }</CGManifestText>

vnext/Folly/Folly.vcxproj.filters

@@ -48,16 +48,16 @@
     <ClCompile Include="$(FollyDir)\folly\Demangle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(FollyDir)\folly\dynamic.cpp">
+    <ClCompile Include="$(FollyDir)\folly\json\dynamic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(FollyDir)\folly\container\detail\F14Table.cpp">
       <Filter>Source Files\container\detail</Filter>
     </ClCompile>
-    <ClCompile Include="$(FollyDir)\folly\json_pointer.cpp">
+    <ClCompile Include="$(FollyDir)\folly\json\json_pointer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(FollyDir)\folly\json.cpp">
+    <ClCompile Include="$(FollyDir)\folly\json\json.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(FollyDir)\folly\Format.cpp">
@@ -151,6 +151,9 @@
     <ClInclude Include="$(FollyDir)\folly\ConcurrentSkipList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(FollyDir)\..\fast_float-6.1.4\include\fast_float\fast_float.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(FollyDir)\folly\portability\Constexpr.h">
       <Filter>Header Files\portability</Filter>
     </ClInclude>
@@ -183,10 +186,19 @@
     </ClInclude>
     <ClInclude Include="$(FollyDir)\folly\dynamic-inl.h">
       <Filter>Header Files</Filter>
+    </ClInclude>
+     <ClInclude Include="$(FollyDir)\folly\json\dynamic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(FollyDir)\folly\json\dynamic-inl.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="$(FollyDir)\folly\DynamicConverter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(FollyDir)\folly\json\DynamicConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(FollyDir)\folly\portability\Event.h">
       <Filter>Header Files\portability</Filter>
     </ClInclude>
@@ -268,7 +280,7 @@
     <ClInclude Include="$(FollyDir)\folly\IPAddressV6.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(FollyDir)\folly\json.h">
+    <ClInclude Include="$(FollyDir)\folly\json\json.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="$(FollyDir)\folly\Lazy.h">