react-native-windows 0.84.0 → 0.84.1

package/Directory.Build.props

@@ -15,7 +15,7 @@
 
     <!--
       SourceLink is disabled by default since customer projects are still building our projects and therefore we don't want to force customers to use this.
-      The PR (windows-vs-pr.yml) and CI (publish.yml() turn it back on.
+      In-repo builds (BuildingInRnwRepo=true) turn it back on below.
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == '' AND '$(BuildingInRnwRepo)' == 'true'">true</EnableSourceLink>
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
@@ -25,14 +25,6 @@
     <DebugType Condition="'$(Configuration)' == 'Release'">pdbonly</DebugType>
     <IncludeSymbols Condition="'$(Configuration)' == 'Release'">true</IncludeSymbols>
     <IncludeSource Condition="'$(Configuration)' == 'Release'">false</IncludeSource>
-    <!-- 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>8.0.0</FastFloatVersion>
-    <FollyCommitHash>ad90720829db5ba0c3d0e44994856dcce33d7940</FollyCommitHash>
-    <FastFloatCommitHash>77cc847c842c49e7e3477c1e95da2b6540166d66</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>11.0.2</FmtVersion>
-    <FmtCommitHash>0c9fce2ffefecfdce794e1859584e25877b7b592</FmtCommitHash>
     <!-- Commit hash for https://github.com/microsoft/node-api-jsi code. -->
     <NodeApiJsiCommitHash>4b8a4a59c4e1b7b988b809dedffd89a7662aa785</NodeApiJsiCommitHash>
   </PropertyGroup>
@@ -49,14 +41,7 @@
 
     <YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)ReactCommon\yoga</YogaDir>
 
-    <FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
-    <FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>
-
-    <FastFloatDir Condition="'$(FastFloatDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fastfloat\fast_float-$(FastFloatVersion)</FastFloatDir>
-    <FastFloatDir>$([MSBuild]::NormalizeDirectory($(FastFloatDir)))</FastFloatDir>
-
-    <FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
-    <FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
+    <ExternalDir Condition="'$(ExternalDir)' == ''">$(ReactNativeWindowsDir)external\</ExternalDir>
 
     <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)</NodeApiJsiDir>
     <NodeApiJsiDir>$([MSBuild]::NormalizeDirectory($(NodeApiJsiDir)))</NodeApiJsiDir>

package/Folly/ThreadNameStub.cpp

@@ -2,9 +2,7 @@
 
 // Avoid bringing in a bunch of folly threading just for setThreadName
 namespace folly {
-    bool setThreadName(StringPiece)
-    {
-      return false;
-    }
-  }
-  
+bool setThreadName(StringPiece) {
+  return false;
+}
+} // namespace folly

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -1329,7 +1329,7 @@ void WindowsTextInputComponentView::updateLayoutMetrics(
     facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
   // Set Position & Size Properties
 
-  if ((layoutMetrics.pointScaleFactor != m_layoutMetrics.pointScaleFactor)) {
+  if (m_textServices && layoutMetrics.pointScaleFactor > 0) {
     LRESULT res;
     winrt::check_hresult(m_textServices->TxSendMessage(
         (WM_USER + 328), // EM_SETDPI

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -99,7 +99,7 @@
       <AdditionalOptions>%(AdditionalOptions) /bigobj /ZH:SHA_256</AdditionalOptions>
       <AdditionalOptions Condition="$(PlatformToolsetVersion)&lt;145">%(AdditionalOptions) /await</AdditionalOptions>
       <AdditionalIncludeDirectories>
-        $(FmtDir)\include;
+        $(ExternalDir)fmt\include;
         $(ReactNativeWindowsDir)Microsoft.ReactNative;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\Pch;
         $(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost;
@@ -412,16 +412,10 @@
       </PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="$(ReactNativeWindowsDir)Folly\Folly.natvis" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">
       <Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Folly\Folly.vcxproj">
-      <Project>{a990658c-ce31-4bcc-976f-0fc6b1af693d}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\ReactCommon\ReactCommon.vcxproj">
       <Project>{a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd}</Project>
     </ProjectReference>

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Natvis Include="$(ReactNativeWindowsDir)Folly\Folly.natvis" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="XamlLoadState.cpp" />

package/PropertySheets/CIBuildOptimizations.props

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
-    CI-specific C++ build optimizations for the publish pipeline.
+    CI-specific C++ build optimizations.
 
-    This file is injected via /p:ForceImportAfterCppTargets in .ado/publish.yml.
+    This file is injected via /p:ForceImportAfterCppTargets by the Desktop and Universal build jobs.
     It overrides defaults that are tuned for developer workflows (incremental builds,
     file tracking) with settings that are better for CI clean builds.
 

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.84.0</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.84.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>84</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>1</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>691d92a59015db74e72c316204564f7a9d8d7680</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>7f6011f841bd7636804e3506ee47824110d4191d</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -6,7 +6,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2605.6002-2279da22 </HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2608.12001-35d34796</HermesVersion>
     <HermesPackageName Condition="'$(HermesPackageName)' == ''">Microsoft.JavaScript.Hermes</HermesPackageName>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\$(HermesPackageName)\$(HermesVersion)</HermesPackage>

package/PropertySheets/NuGet.LockFile.props

@@ -8,9 +8,18 @@
        -->
 
   <PropertyGroup>
-    <RestoreLockedMode Condition="'$(RestoreLockedMode)'=='' OR '$(BuildingInRnwRepo)'=='true'">true</RestoreLockedMode>
+    <!-- Locked vs. force-evaluate is decided centrally in the repo-root Directory.Build.props (force-evaluate locally, locked in CI); don't force locked mode on here or it conflicts with force-evaluate (NU1512). -->
+    <RestoreLockedMode Condition="'$(RestoreLockedMode)'==''">false</RestoreLockedMode>
+
+    <!-- RnwNewArchOnly is for projects that always build with RnwNewArch so they don't add .newarch to the filename. -->
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(SolutionName)'=='ReactWindows-Desktop'">true</RnwNewArchOnly>
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(RnwExternalPropsLoaded)'=='Microsoft.ReactNative.Composition.CppApp.props'">true</RnwNewArchOnly>
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(RnwExternalPropsLoaded)'=='Microsoft.ReactNative.Composition.Package.props'">true</RnwNewArchOnly>
+    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'==''">false</RnwNewArchOnly>
 
     <NuGetLockFileName>packages</NuGetLockFileName>
+    <NuGetLockFileName Condition="'$(UseHermes)'=='false'">$(NuGetLockFileName).chakra</NuGetLockFileName>
+    <NuGetLockFileName Condition="'$(RnwNewArch)'=='true' AND '$(RnwNewArchOnly)'=='false'">$(NuGetLockFileName).newarch</NuGetLockFileName>
     <NuGetLockFileName Condition="'$(UseExperimentalWinUI3)'=='true'">$(NuGetLockFileName).experimentalwinui3</NuGetLockFileName>
     <NuGetLockFilePath>.\$(NuGetLockFileName).lock.json</NuGetLockFilePath>
   </PropertyGroup>

package/PropertySheets/React.Cpp.props

@@ -143,9 +143,9 @@
 
       <!-- Add include directories expected by React Native C++ code and headers -->
       <AdditionalIncludeDirectories>
-        $(FollyDir);
-        $(FmtDir)include;
-        $(FastFloatDir)include;
+        $(ExternalDir)folly;
+        $(ExternalDir)fmt\include;
+        $(ExternalDir)fast-float\include;
         $(ReactNativeDir)\ReactCommon;
         $(ReactNativeDir)\ReactCommon\callinvoker;
         $(ReactNativeDir)\ReactCommon\jsi;

package/ReactCommon/ReactCommon.vcxproj

@@ -239,11 +239,6 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleWithJSIBindings.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Folly\Folly.vcxproj">
-      <Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="boost" Version="1.84.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />

package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1

@@ -7,7 +7,33 @@ param(
 $StartingLocation = Get-Location
 Set-Location -Path $RepoRoot
 
+$failedRestores = [System.Collections.Generic.List[string]]::new()
+
+function Restore-Solution([string] $solution, [string[]] $extraArgs) {
+    Write-Host "Restoring $solution $($extraArgs -join ' ')"
+    & msbuild /t:Restore /p:RestoreForceEvaluate=true @extraArgs $solution
+    if ($LASTEXITCODE -ne 0) {
+        $failedRestores.Add(("$solution $($extraArgs -join ' ')").Trim())
+    }
+}
+
 try {
+    # Some node_modules packages ship a NuGet.Config that re-adds the public nuget.org feed. That
+    # breaks the repo's single-ADO-feed compliance and trips corporate network blocks on api.nuget.org.
+    # Strip any nuget.org source so restore only uses the repo's ADO feed.
+    Get-ChildItem -File -Recurse -Path $RepoRoot -Filter NuGet.Config -ErrorAction SilentlyContinue |
+        Where-Object { $_.FullName -match '\\node_modules\\' } | ForEach-Object {
+            $configPath = $_.FullName
+            try { [xml]$doc = Get-Content -LiteralPath $configPath -Raw } catch { return }
+            $sources = $doc.SelectSingleNode('/configuration/packageSources')
+            if (-not $sources) { return }
+            $badSources = @($sources.SelectNodes('add') | Where-Object { $_.GetAttribute('value') -match 'nuget\.org' })
+            if ($badSources.Count -eq 0) { return }
+            $badSources | ForEach-Object { [void]$sources.RemoveChild($_) }
+            $doc.Save($configPath)
+            Write-Host "Removed nuget.org feed from $configPath"
+        }
+
     if (-not $SkipLockDeletion) {
         # Delete existing lock files
         $existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
@@ -22,17 +48,46 @@ try {
 
     # Run all solutions with their defaults
     $($packagesSolutions; $vnextSolutions) | Foreach-Object {
-        Write-Host Restoring $_.FullName with defaults
-        & msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName
+        Restore-Solution $_.FullName @()
     }
 
     # Re-run solutions that build with UseExperimentalWinUI3
-    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
+    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
     $($packagesSolutions; $vnextSolutions) | Where-Object { $experimentalSolutions -contains $_.Name } | Foreach-Object {
-        Write-Host Restoring $_.FullName with UseExperimentalWinUI3=true
-        & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseExperimentalWinUI3=true $_.FullName
+        Restore-Solution $_.FullName @('/p:UseExperimentalWinUI3=true')
+    }
+
+    # Re-run solutions that build with Chakra (UseHermes=false)
+    $chakraSolutions = @("ReactUWPTestApp.sln", "integrationtest.sln");
+    $($packagesSolutions; $vnextSolutions) | Where-Object { $chakraSolutions -contains $_.Name } | Foreach-Object {
+        Restore-Solution $_.FullName @('/p:UseHermes=false')
     }
 }
 finally {
     Set-Location -Path "$StartingLocation"
-}
+}
+
+# Restore failures used to be ignored (msbuild's exit code was never checked), so a broken run
+# looked successful while leaving lock files deleted. Fail loudly on both failure modes.
+if ($failedRestores.Count -gt 0) {
+    Write-Host ''
+    Write-Host "ERROR: NuGet restore returned a non-zero exit code for $($failedRestores.Count) solution pass(es):" -ForegroundColor Red
+    $failedRestores | ForEach-Object { Write-Host "    $_" -ForegroundColor Red }
+}
+
+# A committed lock that was deleted but never came back means a project failed or was skipped during restore.
+$missingTrackedLocks = @(git -C $RepoRoot ls-files -- '*.lock.json' | Where-Object { -not (Test-Path (Join-Path $RepoRoot $_)) })
+if ($missingTrackedLocks.Count -gt 0) {
+    Write-Host ''
+    Write-Host "ERROR: $($missingTrackedLocks.Count) committed lock file(s) were deleted but not regenerated:" -ForegroundColor Red
+    $missingTrackedLocks | ForEach-Object { Write-Host "    $_" -ForegroundColor Red }
+}
+
+if ($failedRestores.Count -gt 0 -or $missingTrackedLocks.Count -gt 0) {
+    Write-Host ''
+    Write-Host 'Lock file regeneration is INCOMPLETE - do not commit. Fix the errors above and re-run.' -ForegroundColor Red
+    exit 1
+}
+
+Write-Host ''
+Write-Host 'All solutions restored and every committed lock file was regenerated.' -ForegroundColor Green

package/Scripts/Tfs/Layout-Desktop-Headers.ps1

@@ -10,36 +10,10 @@ param(
 )
 
 [xml]$props = gc $PSScriptRoot\..\..\Directory.Build.props
-[string] $FollyVersion = $props.Project.PropertyGroup.FollyVersion;
-$FollyVersion = $FollyVersion.Trim() # The extracted FollyVersion contains a space at the end that isn't actually present, issue #6216
-$FollyRoot = "$SourceRoot\node_modules\.folly";
-$FollyOverrideRoot = "$ReactWindowsRoot\Folly\TEMP_UntilFollyUpdate";
+# Folly source is committed in vnext/external/folly/ - no download needed
+$FollyRoot = "$ReactWindowsRoot\external\folly";
 
-[string] $FmtVersion = $props.Project.PropertyGroup.FmtVersion;
-$FmtVersion = $FmtVersion.Trim() # The extracted FmtVersion contains a space at the end that isn't actually present, issue #6216
-$FmtRoot = "$SourceRoot\node_modules\.fmt\fmt-${FmtVersion}";
-
-# Download Folly if running on a machine which hasn't run native build logic to acquire it
-if (!(Test-Path $FollyRoot)) {
-	Write-Host "Downloading Folly $FollyVersion"
-	$FollyZip = "$SourceRoot\node_modules\.folly\folly-${FollyVersion}.zip"
-	$FollyDest = "$SourceRoot\node_modules\.folly"
-
-	New-Item $FollyRoot -ItemType Directory
-	Invoke-RestMethod -Uri "https://github.com/facebook/folly/archive/v$FollyVersion.zip" -OutFile $FollyZip
-	Expand-Archive -LiteralPath $FollyZip -DestinationPath $FollyRoot
-}
-
-# Download Fmt if running on a machine which hasn't run native build logic to acquire it
-if (!(Test-Path $FmtRoot)) {
-	Write-Host "Downloading Fmt $FmtVersion"
-	$FmtZip = "$SourceRoot\node_modules\.fmt\fmt-${FmtVersion}.zip"
-	$FmtDest = "$SourceRoot\node_modules\.fmt"
-
-	New-Item $FmtRoot -ItemType Directory
-	Invoke-RestMethod -Uri "https://github.com/fmtlib/fmt/archive/refs/tags/$FmtVersion.zip" -OutFile $FmtZip
-	Expand-Archive -LiteralPath $FmtZip -DestinationPath $FmtDest
-}
+$FmtRoot = "$ReactWindowsRoot\external\fmt";
 
 Write-Host "Source root: [$SourceRoot]"
 Write-Host "Destination root: [$TargetRoot]"
@@ -70,13 +44,6 @@ Get-ChildItem -Path $FollyRoot -Name -Recurse -Include $patterns | ForEach-Objec
 	-Force
 }
 
-# Folly overrides
-Get-ChildItem -Path $FollyOverrideRoot -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
-	-Path        $FollyOverrideRoot\$_ `
-	-Destination (New-Item -ItemType Directory $TargetRoot\inc\folly\folly-$FollyVersion\folly\$(Split-Path $_) -Force) `
-	-Force
-}
-
 # Fmt headers
 Get-ChildItem -Path $FmtRoot\include -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
 	-Path        $FmtRoot\include\$_ `
@@ -115,4 +82,4 @@ Get-ChildItem -Path $ReactWindowsRoot\Desktop.DLL -Recurse -Include '*.def' | Fo
 Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
 
 # Natvis files
-Copy-Item -Force -Path $ReactWindowsRoot\Folly\Folly.natvis -Destination (New-Item -ItemType Directory $TargetRoot\natvis -Force)
+Copy-Item -Force -Path $ReactWindowsRoot\external\folly\Folly.natvis -Destination (New-Item -ItemType Directory $TargetRoot\natvis -Force)

package/Scripts/UpdateNightlyDependencies.ps1

@@ -0,0 +1,47 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string] $PackageJsonPath,
+
+    [Parameter(Mandatory = $true)]
+    [string] $ReactNativeVersion,
+
+    [Parameter(Mandatory = $true)]
+    [string] $ReactNativeCliVersion
+)
+
+$ErrorActionPreference = 'Stop'
+
+$packageJson = Get-Content -LiteralPath $PackageJsonPath -Raw | ConvertFrom-Json
+$dependencySections = @(
+    'dependencies',
+    'devDependencies',
+    'optionalDependencies',
+    'peerDependencies',
+    'resolutions'
+)
+
+foreach ($sectionName in $dependencySections) {
+    $section = $packageJson.PSObject.Properties[$sectionName]
+    if ($null -eq $section) {
+        continue
+    }
+
+    foreach ($dependency in $section.Value.PSObject.Properties) {
+        $name = $dependency.Name
+        if ($name -eq 'react-native' -and $dependency.Value -notmatch '\*') {
+            $dependency.Value = $ReactNativeVersion
+        }
+        elseif ($name -eq '@react-native/new-app-screen') {
+            $dependency.Value = $ReactNativeVersion
+        }
+        elseif ($name -match '^@react-native/.+-(config|preset)$') {
+            $dependency.Value = $ReactNativeVersion
+        }
+        elseif ($name -match '^@react-native-community/cli(?:-platform-(?:ios|android))?$') {
+            $dependency.Value = $ReactNativeCliVersion
+        }
+    }
+}
+
+$packageJson | ConvertTo-Json -Depth 100 | Set-Content -LiteralPath $PackageJsonPath -Encoding utf8NoBOM

package/Scripts/creaternwapp.cmd

@@ -72,6 +72,9 @@ if not "%part%"=="" (
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwapp.cmd: Setting npm to use verdaccio at http://localhost:4873
+  set NPM_CONFIG_REGISTRY=http://localhost:4873
+  set YARN_NPM_REGISTRY_SERVER=http://localhost:4873
+  set YARN_UNSAFE_HTTP_WHITELIST=localhost
   call npm config set registry http://localhost:4873
 )
 
@@ -120,13 +123,6 @@ if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   set RNCLI_TEMPLATE=--template "@react-native-community/template@0.84.1"
 )
 
-if not "x%RN_VERSION:-rc=%"=="x%RN_VERSION%" (
-  @echo creaternwapp.cmd Override @react-native-community/template version for RC
-  REM RC versions may not have a corresponding template published to npm
-  REM Windows we need to manually update this with every integration #15124
-  set RNCLI_TEMPLATE=--template "@react-native-community/template@0.84.1"
-)
-
 @echo creaternwapp.cmd: Creating base RN app project with: npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
 call npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
 
@@ -150,12 +146,13 @@ call yarn install
 
 @echo creaternwapp.cmd: Creating commit to save current state
 if not exist ".git\" call git init .
+call git config user.name "React-Native-Windows Bot"
+call git config user.email "53619745+rnbot@users.noreply.github.com"
 call git add .
 call git commit -m "npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true"
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwapp.cmd: Setting yarn to use verdaccio at http://localhost:4873
-  call yarn config set registry http://localhost:4873
   call yarn config set npmRegistryServer http://localhost:4873
   call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
 )

package/Scripts/creaternwlib.cmd

@@ -77,6 +77,9 @@ if not "%part%"=="" (
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwlib.cmd: Setting npm to use verdaccio at http://localhost:4873
+  set NPM_CONFIG_REGISTRY=http://localhost:4873
+  set YARN_NPM_REGISTRY_SERVER=http://localhost:4873
+  set YARN_UNSAFE_HTTP_WHITELIST=localhost
   call npm config set registry http://localhost:4873
 )
 
@@ -116,15 +119,8 @@ for /f "delims=" %%a in ('npm show react@%R_VERSION% version') do @set R_VERSION
 
 @echo creaternwlib.cmd Creating RNW lib "%LIB_NAME%" with react@%R_VERSION%, react-native@%RN_VERSION%, and react-native-windows@%RNW_VERSION%
 
-set CRNL_RN_VERSION_ARG=--react-native-version %RN_VERSION%
-if not "x%RN_VERSION:-rc=%"=="x%RN_VERSION%" (
-  @echo creaternwlib.cmd Override --react-native-version for RC build, will fix up versions later
-  REM RC versions may not have a corresponding template published to npm, omit --react-native-version
-  set CRNL_RN_VERSION_ARG=
-)
-
-@echo creaternwlib.cmd Creating base RN library project with: npx --yes create-react-native-library@0.48.9 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --local false --type %RN_TEMPLATE_TYPE% %CRNL_RN_VERSION_ARG% --example vanilla %LIB_NAME%
-call npx --yes create-react-native-library@0.48.9 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --local false --type %RN_TEMPLATE_TYPE% %CRNL_RN_VERSION_ARG% --example vanilla %LIB_NAME%
+@echo creaternwlib.cmd Creating base RN library project with: npx --yes create-react-native-library@0.63.0 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --type %RN_TEMPLATE_TYPE% --tools=eslint --tools=jest --tools=lefthook --tools=release-it --tools=vite --react-native-version %RN_VERSION% --example vanilla %LIB_NAME%
+call npx --yes create-react-native-library@0.63.0 --slug %LIB_NAME% --description %LIB_NAME% --author-name "React-Native-Windows Bot" --author-email 53619745+rnbot@users.noreply.github.com --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --type %RN_TEMPLATE_TYPE% --tools=eslint --tools=jest --tools=lefthook --tools=release-it --tools=vite --react-native-version %RN_VERSION% --example vanilla %LIB_NAME%
 
 if %ERRORLEVEL% neq 0 (
   @echo creaternwlib.cmd: Unable to create base RN library project
@@ -145,24 +141,14 @@ if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   popd
 )
 
-if not "x%RN_VERSION:-rc=%"=="x%RN_VERSION%" (
-  @echo creaternwlib.cmd Fixing react-native RC version
-  pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pushd example
-  pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
-  popd
-)
-
 @echo creaternwlib.cmd: Calling yarn install
 call yarn install
 
+call git config user.name "React-Native-Windows Bot"
+call git config user.email "53619745+rnbot@users.noreply.github.com"
+
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwlib.cmd: Setting yarn to use verdaccio at http://localhost:4873
-  call yarn config set registry http://localhost:4873
   call yarn config set npmRegistryServer http://localhost:4873
   call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
 )
@@ -181,7 +167,8 @@ call yarn install
 
 @echo creaternwlib.cmd Creating commit to save current state
 call git add .
-call git commit -m "chore: add rnw dependency"
+rem --no-verify skips the generated project's lefthook hooks (run via bash, absent on Windows agents)
+call git commit --no-verify -m "chore: add rnw dependency"
 
 @echo creaternwlib.cmd Running init-windows with: yarn react-native init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
 call yarn react-native init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging

package/Shared/Shared.vcxitems

@@ -624,4 +624,6 @@
   <ItemGroup Condition="'$(SupportWinUI3Islands)' == 'true'">
     <ApplicationDefinition Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\App.xaml" />
   </ItemGroup>
+  <!-- External (vendored) third-party library sources -->
+  <Import Project="$(ExternalDir)External.vcxitems" />
 </Project>

package/{Folly → external}/.clang-format

@@ -1,2 +1 @@
 DisableFormat: true
-SortIncludes: false

package/external/External.vcxitems

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Aggregates all vendored external (third-party) library sources.
+  Each dependency has its own .vcxitems next to its source tree.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="fmt\fmt.vcxitems" />
+  <Import Project="folly\folly.vcxitems" />
+  <Import Project="fast-float\fast-float.vcxitems" />
+</Project>

package/external/fast-float/.syncignore

@@ -0,0 +1,10 @@
+/sync-config.json
+/.syncignore
+/cgmanifest.json
+/CMakeLists.txt
+/cmake/
+/tests/
+/benchmarks/
+/script/
+/.github/
+/CONTRIBUTORS