react-native-windows 0.67.0 → 0.68.0-preview.1

package/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec

@@ -23,10 +23,10 @@
   <files>
     <!-- Support netcore3, uap, net46+, net5, c++ -->
     <!-- Use the contents in the target folder since those are built with UseWinUI3, as opposed to the content in $nugetroot$ which -->
-    <file src="$nugetroot$\reunion\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\netcoreapp3.0\Microsoft.ReactNative.winmd" />
-    <file src="$nugetroot$\reunion\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\uap10.0\Microsoft.ReactNative.winmd" />
-    <file src="$nugetroot$\reunion\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\net46\Microsoft.ReactNative.winmd" />
-    <file src="$nugetroot$\reunion\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x64\native\Microsoft.ReactNative.dll" />
-    <file src="$nugetroot$\reunion\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion.dll" target="lib\net5.0\Microsoft.ReactNative.ProjectReunion.dll" />
+    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\netcoreapp3.0\Microsoft.ReactNative.winmd" />
+    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\uap10.0\Microsoft.ReactNative.winmd" />
+    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\net46\Microsoft.ReactNative.winmd" />
+    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x64\native\Microsoft.ReactNative.dll" />
+    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion.dll" target="lib\net5.0\Microsoft.ReactNative.ProjectReunion.dll" />
   </files>
 </package>

package/Scripts/Microsoft.ReactNative.nuspec

@@ -25,26 +25,28 @@
     <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.xml"   target="lib\uap10.0"/> 
     -->
 
+    <!-- Included in Microsoft.ReactNative -->
     <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-arm64\native" />
     <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-arm64\native" />
     <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-arm64\native" />
 
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-arm64\native" />
-
     <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x86\native" />
     <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x86\native" />
     <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x86\native" />
 
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x86\native" />
-
     <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x64\native" />
     <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x64\native" />
     <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x64\native" />
 
+    <!-- Included in Microsoft.ReactNative.Debug -->
+    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-arm64\native" />
+
+    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x86\native" />
+
     <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x64\native" />
     <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x64\native" />
     <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x64\native" />

package/Scripts/OfficeReact.Win32.nuspec

@@ -49,7 +49,6 @@
     <file src="$nugetroot$\inc\Shared\InstanceManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IReactRootView.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IRedBoxHandler.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\IUIManager.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\JSBigAbiString.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\LayoutAnimation.h" target="inc"/>
@@ -78,6 +77,8 @@
 
     <file src="$nugetroot$\Microsoft.ReactNative.Cxx\**" target ="Microsoft.ReactNative.Cxx"/>
 
+    <file src="$nugetroot$\inc\codegen\**\*.*" target ="inc\codegen"/>
+
     <file src="$nugetroot$\natvis\Folly.natvis" target ="natvis\Folly.natvis"/>
   </files>
 </package>

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

@@ -0,0 +1,102 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+	[string] $SourceRoot = ($PSScriptRoot | Split-Path | Split-Path | Split-Path),
+	[string] $TargetRoot = "$SourceRoot\vnext\target",
+	[System.IO.DirectoryInfo] $ReactWindowsRoot = "$SourceRoot\vnext",
+	[System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",	
+	[string[]] $Extensions = ('h', 'hpp', 'def')
+)
+
+[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\folly-${FollyVersion}";
+
+# 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
+}
+
+Write-Host "Source root: [$SourceRoot]"
+Write-Host "Destination root: [$TargetRoot]"
+Write-Host "React Native root: [$ReactNativeRoot]"
+
+md -Force $TargetRoot
+
+$patterns = $Extensions| ForEach-Object {"*.$_"}
+
+# ReactCommon headers
+Get-ChildItem -Path $ReactNativeRoot\ReactCommon -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $ReactNativeRoot\ReactCommon\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# Yoga headers
+Get-ChildItem -Path $ReactNativeRoot\ReactCommon\yoga\yoga -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $ReactNativeRoot\ReactCommon\yoga\yoga\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\Yoga\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# Folly headers
+Get-ChildItem -Path $FollyRoot -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $FollyRoot\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\folly\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# stubs headers
+Get-ChildItem -Path $ReactWindowsRoot\stubs -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $ReactWindowsRoot\stubs\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\stubs\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# React.Windows.Core headers
+Get-ChildItem -Path $ReactWindowsRoot\Shared -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $ReactWindowsRoot\Shared\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\Shared\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# React.Windows.Desktop headers
+Get-ChildItem -Path $ReactWindowsRoot\Desktop -Name -Recurse -Include '*.h','*.hpp','*.winmd' | ForEach-Object { Copy-Item `
+	-Path        $ReactWindowsRoot\Desktop\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\ReactWin32\$(Split-Path $_) -Force) `
+	-Force
+}
+# React.Windows.Desktop DEFs
+Get-ChildItem -Path $ReactWindowsRoot\Desktop.DLL -Recurse -Include '*.def' | ForEach-Object { Copy-Item `
+	-Path        $_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\ -Force) `
+	-Force
+}
+
+# React.Windows.Test headers
+Get-ChildItem -Path $ReactWindowsRoot\Test -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $ReactWindowsRoot\Test\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\Test\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# React.Windows.Test DLL DEF files
+Get-ChildItem -Path $ReactWindowsRoot\Desktop.Test.DLL -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item `
+	-Path        $ReactWindowsRoot\Desktop.Test.DLL\$_ `
+	-Destination (New-Item -ItemType Directory $TargetRoot\inc\$(Split-Path $_) -Force) `
+	-Force
+}
+
+# include headers
+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)

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

@@ -0,0 +1,68 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+	[string] $SourceRoot = ($PSScriptRoot | Split-Path | Split-Path | Split-Path),
+	[string] $TargetRoot = "$SourceRoot\vnext\target",
+	[System.IO.DirectoryInfo] $ReactWindowsRoot = "$SourceRoot\vnext",
+	[System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",	
+	[string[]] $Extensions = ('h', 'hpp')
+)
+
+Write-Host "Source root: [$SourceRoot]"
+Write-Host "Destination root: [$TargetRoot]"
+Write-Host "React Native root: [$ReactNativeRoot]"
+
+md -Force $TargetRoot
+
+$patterns = $Extensions| ForEach-Object {"*.$_"}
+
+
+# include headers
+Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
+
+# Microsoft.ReactNative.CXX project
+Copy-Item -Force -Recurse -Path $ReactWindowsRoot\Microsoft.ReactNative.Cxx -Destination $TargetRoot\
+
+# Copy native module spec files
+Copy-Item -Force -Recurse -Path $ReactWindowsRoot\codegen -Destination $TargetRoot\inc
+
+# Microsoft.ReactNative.CXX project JSI files
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\decorator.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\instrumentation.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi-inl.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\threadsafe.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
+
+# Microsoft.ReactNative.CXX project TurboModule files
+New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\callinvoker\ReactCommon\CallInvoker.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+
+# NUSPEC
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\*.nuspec -Destination $TargetRoot
+
+#Copy StripAdditionalPlatformsFromNuspec.ps1 for use by publish task
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\StripAdditionalPlatformsFromNuspec.ps1 -Destination $TargetRoot
+
+# Microsoft.ReactNative.VersionCheck.targets
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\Microsoft.ReactNative.VersionCheck.targets -Destination $TargetRoot
+
+# Microsoft.ReactNative.targets
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\Microsoft.ReactNative.targets -Destination $TargetRoot
+
+# Microsoft.ReactNative.Cxx.targets
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\Microsoft.ReactNative.Cxx.targets -Destination $TargetRoot
+
+# Microsoft.ReactNative.Managed.targets
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\Microsoft.ReactNative.Managed.targets -Destination $TargetRoot
+
+# Microsoft.ReactNative.Managed.CodeGen.targets
+Copy-Item -Force -Path $ReactWindowsRoot\Scripts\Microsoft.ReactNative.Managed.CodeGen.targets -Destination $TargetRoot
+

package/Scripts/Tfs/Make-AnyCPU-RefAssemblies.ps1

@@ -0,0 +1,39 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+	[string] $BuildRoot = "$SourceRoot\vnext\target",
+	[string] $TargetRoot = "$SourceRoot\vnext\target"
+)
+
+
+# Fix ref Assemblies to be AnyCpu
+
+# The reason for doing this here is that csc maintains the architecture of the ref assembly to match the implementation. It doesn't 
+# automatically tag the ref as 'anycpu'. We use the ref assembly as the 'ref' in our nuget package. When the csc compiler
+# compiles for other specific platforms like Arm, the compiler will fail if a ref assembly is marked as x64.
+# The fix is to ensure that the 'ref' in the nuget package is marked as 'AnyCPU'.
+
+# There unfortunately is no flag to csc, and no single tool to do this. CorFlags.exe does not have support to change this...
+# This is a lot more straight-forward than trying to create an AnyCpu version of this assembly, update the solution, tests and add
+# another platform to the CI matrix, not to mention the steps needed to ensure AnyCpu ran for the x64 build to test the nuget package
+# in PR validation....
+
+# Therefore this step will simply ildasm and ilasm the reference assembly and store it as which strips the bitness and generates anycpu msil.
+# These reference assemblies are just regular assemblies but with empty bodies
+
+ForEach ($refFolder in (Get-ChildItem -Path  $BuildRoot -Recurse -Include "ref"))
+{ 
+	ForEach ($refAsm in Get-ChildItem -Path $refFolder -Recurse  -Include "*.dll" ) 
+	{
+		$outputFolder=([System.IO.Path]::GetDirectoryName($refAsm)).Replace($BuildRoot, $TargetRoot) + ".anycpu";
+		$outputAsm = [System.IO.Path]::Combine($outputFolder, [System.IO.Path]::GetFileName($refAsm));
+		$outputIl = [System.IO.Path]::ChangeExtension($outputAsm, ".il");
+
+		mkdir $outputFolder -ErrorAction SilentlyContinue
+		& "${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\ildasm.exe" $refAsm /ALL "/OUT=$outputIl"
+		Write-Host  $refAsm -> $outputIl
+		& "$env:WINDIR\Microsoft.NET\Framework64\v4.0.30319\ilasm.exe" $outputIl /DLL /QUIET
+		Write-Host  $outputIl -> $outputAsm
+	} 
+}

package/Scripts/Tfs/Start-TestServers.ps1

@@ -5,11 +5,13 @@
 # Start-TestServers.ps1
 #
 param (
-	[System.IO.DirectoryInfo] $SourcesDirectory = ($PSScriptRoot | Split-Path | Split-Path | Split-Path),
+	[System.IO.DirectoryInfo] $SourcesDirectory = ($PSScriptRoot | Split-Path | Split-Path),
 
 	[switch] $Preload,
 
-	[int] $SleepSeconds = 10
+	[int] $SleepSeconds = 10,
+
+	[switch] $UseNodeWsServer
 )
 
 Write-Host "Starting packager"
@@ -24,14 +26,16 @@ Start-Process npm	-PassThru `
 
 Write-Host 'Started packager'
 
-Write-Host 'Starting WebSocket server'
-
-Start-Process	-PassThru `
-				-FilePath (Get-Command node.exe).Definition `
-				-ArgumentList "${SourcesDirectory}\IntegrationTests\websocket_integration_test_server.js" `
-				-OutVariable wsProc
+if ($UseNodeWsServer.IsPresent) {
+	Write-Host 'Starting WebSocket server'
 
-Write-Host 'Started WebSocket server'
+	Start-Process	-PassThru `
+					-FilePath (Get-Command node.exe).Definition `
+					-ArgumentList "${SourcesDirectory}\IntegrationTests\websocket_integration_test_server.js" `
+					-OutVariable wsProc
+	
+	Write-Host 'Started WebSocket server'
+}
 
 if ($Preload) {
 	Write-Host 'Preloading bundles'
@@ -46,6 +50,10 @@ if ($Preload) {
 
 # Use the environment variables input below to pass secret variables to this script.
 Write-Host "##vso[task.setvariable variable=PackagerId;]$($packagerProc.Id)"
-Write-Host "##vso[task.setvariable variable=WebSocketServerId;]$($wsProc.Id)"
 
-return ($packagerProc, $wsProc)
+if ($UseNodeWsServer.IsPresent) {
+	Write-Host "##vso[task.setvariable variable=WebSocketServerId;]$($wsProc.Id)"
+	return ($packagerProc, $wsProc)
+} else {
+	return ($packagerProc)
+}

package/Scripts/copyRNLibraries.js

@@ -18,13 +18,13 @@ const rnTypesDir = path.dirname(
   require.resolve('@types/react-native/package.json'),
 );
 
-exports.copyTask = baseDir => {
-  const reactNative = (...files) => files.map(f => path.join(rnDir, f));
+exports.copyTask = (baseDir) => {
+  const reactNative = (...files) => files.map((f) => path.join(rnDir, f));
   const reactNativeTypes = (...files) =>
-    files.map(f => path.join(rnTypesDir, f));
-  const reactCopies = (...files) => files.map(f => path.join(rnCopiesDir, f));
-  const src = (...files) => files.map(f => path.join(baseDir, 'src', f));
-  const base = file => path.join(baseDir, file);
+    files.map((f) => path.join(rnTypesDir, f));
+  const reactCopies = (...files) => files.map((f) => path.join(rnCopiesDir, f));
+  const src = (...files) => files.map((f) => path.join(baseDir, 'src', f));
+  const base = (file) => path.join(baseDir, file);
 
   return series(
     exports.cleanTask(baseDir),
@@ -65,8 +65,8 @@ exports.copyTask = baseDir => {
   );
 };
 
-exports.cleanTask = baseDir => {
-  const base = file => path.join(baseDir, file);
+exports.cleanTask = (baseDir) => {
+  const base = (file) => path.join(baseDir, file);
 
   return cleanTask({
     paths: [

package/Scripts/just.js

@@ -7,7 +7,7 @@
 function just(cmd) {
   const path = require('path');
 
-  let startIndex = process.argv.findIndex(arg => arg.startsWith('-'));
+  let startIndex = process.argv.findIndex((arg) => arg.startsWith('-'));
   if (startIndex < 0) {
     startIndex = 2;
   }

package/Scripts/rnw-dependencies.ps1

@@ -123,7 +123,7 @@ function InstallVS {
 function CheckNode {
     try {
         $v = (Get-Command node -ErrorAction Stop).Version.Major
-        return $v -eq 12 -or $v -eq 13 -or $v -eq 14
+        return ($v -ge 12) -and (($v % 2) -eq 0);
     } catch {
         return $false;
     }
@@ -254,7 +254,7 @@ $requirements = @(
     },
     @{
         Id=[CheckId]::Node;
-        Name = 'NodeJS lts installed';
+        Name = 'NodeJS LTS';
         Tags = @('appDev');
         Valid = { CheckNode; }
         Install = { choco install -y nodejs-lts };
@@ -275,14 +275,6 @@ $requirements = @(
         Valid = { try { (Get-Command yarn -ErrorAction Stop) -ne $null } catch { $false }; }
         Install = { choco install -y yarn };
     },
-    @{
-        Id=[CheckId]::AzureFunctions;
-        Name = 'Azure Functions Core Tools';
-        Tags = @('rnwDev');
-        Valid = { try { (Get-Command func -ErrorAction Stop) -ne $null } catch { $false }; }
-        Install = { choco install -y azure-functions-core-tools-3 };
-        Optional = $true;
-    },
     @{
         Id=[CheckId]::WinAppDriver;
         Name = 'WinAppDriver';

package/Scripts/run-desktop-integration-tests.js

@@ -65,18 +65,18 @@ function launchMetroServer() {
       {cwd: __dirname},
     );
 
-    serverEntries.metroServer.stdout.on('data', chunk => {
+    serverEntries.metroServer.stdout.on('data', (chunk) => {
       console.log(chunk.toString());
       if (chunk.toString().indexOf('Metro Bundler ready') >= 0) {
         resolve();
       }
     });
-    serverEntries.metroServer.on('error', err => {
+    serverEntries.metroServer.on('error', (err) => {
       console.error('Metro process failed!' + err.toString());
       reject(err);
     });
 
-    serverEntries.metroServer.on('exit', code => {
+    serverEntries.metroServer.on('exit', (code) => {
       if (code !== 0) {
         const err = `Metro process failed with error code: ${code}`;
         console.error(err);
@@ -97,17 +97,17 @@ function launchWebsocketServer() {
       {cwd: __dirname},
     );
 
-    serverEntries.websocketServer.stdout.on('data', chunk => {
+    serverEntries.websocketServer.stdout.on('data', (chunk) => {
       console.log(chunk.toString());
       if (chunk.toString().indexOf('WebSocket integration test server') >= 0) {
         resolve();
       }
     });
-    serverEntries.websocketServer.on('error', err => {
+    serverEntries.websocketServer.on('error', (err) => {
       reject(err);
     });
 
-    serverEntries.websocketServer.on('exit', code => {
+    serverEntries.websocketServer.on('exit', (code) => {
       if (code !== 0) {
         const err = `Websocket test server process failed with error code: ${code}`;
         console.error(err);

package/Scripts/utils.js

@@ -14,7 +14,7 @@ module.exports = {
    * @param {string} filename file name to find
    * @returns Path of a directory that contains 'filename'
    */
-  getDirectoryNameOfFileAbove: function(dir, filename) {
+  getDirectoryNameOfFileAbove: function (dir, filename) {
     const {root} = path.parse(dir);
     let currentDir = dir;
     do {

package/Shared/ChakraRuntimeHolder.cpp

@@ -9,6 +9,10 @@
 
 namespace Microsoft::JSI {
 
+facebook::react::JSIEngineOverride ChakraRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::Chakra;
+}
+
 std::shared_ptr<facebook::jsi::Runtime> ChakraRuntimeHolder::getRuntime() noexcept {
   std::call_once(once_flag_, [this]() { initRuntime(); });
 

package/Shared/ChakraRuntimeHolder.h

@@ -12,9 +12,10 @@
 
 namespace Microsoft::JSI {
 
-class ChakraRuntimeHolder final : public facebook::jsi::RuntimeHolderLazyInit {
+class ChakraRuntimeHolder final : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   ChakraRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/Shared/CreateModules.h

@@ -24,9 +24,6 @@ class MessageQueueThread;
 extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateTimingModule(
     const std::shared_ptr<facebook::react::MessageQueueThread> &nativeThread) noexcept;
 
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateAsyncStorageModule(
-    const WCHAR *storageFileName) noexcept;
-
 } // namespace react
 } // namespace facebook
 

package/Shared/DevSettings.h

@@ -14,11 +14,9 @@
 #define STRING_(s) #s
 #define STRING(s) STRING_(s)
 
-namespace facebook {
-namespace jsi {
+namespace Microsoft::JSI {
 struct RuntimeHolderLazyInit;
-}
-} // namespace facebook
+} // namespace Microsoft::JSI
 
 namespace facebook {
 namespace react {
@@ -81,7 +79,7 @@ struct DevSettings {
   /// instance. This object should in general be used only from the JS engine
   /// thread, unless the specific runtime implementation explicitly guarantees
   /// reentrancy.
-  std::shared_ptr<jsi::RuntimeHolderLazyInit> jsiRuntimeHolder;
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
 
   // Until the ABI story is addressed we'll use this instead of the above for
   // the purposes of selecting a JSI Runtime to use.

package/Shared/HermesRuntimeHolder.cpp

@@ -10,9 +10,6 @@
 #include <cxxreact/MessageQueueThread.h>
 #include <cxxreact/SystraceSection.h>
 #include <hermes/hermes.h>
-#ifndef NDEBUG
-#include <hermes/hermes_dbg.h>
-#endif
 #include "HermesRuntimeHolder.h"
 #include "HermesShim.h"
 
@@ -72,6 +69,10 @@ class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::R
 
 } // namespace
 
+facebook::react::JSIEngineOverride HermesRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::Hermes;
+}
+
 std::shared_ptr<jsi::Runtime> HermesRuntimeHolder::getRuntime() noexcept {
   std::call_once(m_once_flag, [this]() { initRuntime(); });
 
@@ -95,11 +96,7 @@ void HermesRuntimeHolder::initRuntime() noexcept {
   auto hermesRuntime = makeHermesRuntimeSystraced(runtimeConfig);
   facebook::hermes::HermesRuntime &hermesRuntimeRef = *hermesRuntime;
 
-#ifndef NDEBUG
-  m_runtime = std::make_shared<hermes::RuntimeDebugFlavorProxy>(std::move(hermesRuntime));
-#else
   m_runtime = std::move(hermesRuntime);
-#endif
   m_own_thread_id = std::this_thread::get_id();
 
 #ifdef HERMES_ENABLE_DEBUGGER

package/Shared/HermesRuntimeHolder.h

@@ -12,9 +12,10 @@
 namespace facebook {
 namespace react {
 
-class HermesRuntimeHolder : public facebook::jsi::RuntimeHolderLazyInit {
+class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   HermesRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/Shared/JSI/NapiJsiV8RuntimeHolder.cpp

@@ -96,7 +96,11 @@ void NapiJsiV8RuntimeHolder::InitRuntime() noexcept {
   m_ownThreadId = std::this_thread::get_id();
 }
 
-#pragma region facebook::jsi::RuntimeHolderLazyInit
+#pragma region Microsoft::JSI::RuntimeHolderLazyInit
+
+facebook::react::JSIEngineOverride NapiJsiV8RuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::V8NodeApi;
+}
 
 shared_ptr<Runtime> NapiJsiV8RuntimeHolder::getRuntime() noexcept /*override*/
 {
@@ -112,6 +116,6 @@ shared_ptr<Runtime> NapiJsiV8RuntimeHolder::getRuntime() noexcept /*override*/
   return m_runtime;
 }
 
-#pragma endregion facebook::jsi::RuntimeHolderLazyInit
+#pragma endregion Microsoft::JSI::RuntimeHolderLazyInit
 
 } // namespace Microsoft::JSI

package/Shared/JSI/NapiJsiV8RuntimeHolder.h

@@ -10,9 +10,10 @@
 
 namespace Microsoft::JSI {
 
-class NapiJsiV8RuntimeHolder : public facebook::jsi::RuntimeHolderLazyInit {
+class NapiJsiV8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   NapiJsiV8RuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/Shared/JSI/RuntimeHolder.h

@@ -3,8 +3,9 @@
 #include <jsi/jsi.h>
 #include <memory>
 
-namespace facebook {
-namespace jsi {
+#include <DevSettings.h>
+
+namespace Microsoft::JSI {
 
 // An instance of this interface is expected to
 // a. lazily create a JSI Runtime on the first call to getRuntime
@@ -15,7 +16,7 @@ namespace jsi {
 
 struct RuntimeHolderLazyInit {
   virtual std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept = 0;
+  virtual facebook::react::JSIEngineOverride getRuntimeType() noexcept = 0;
 };
 
-} // namespace jsi
-} // namespace facebook
+} // namespace Microsoft::JSI

package/Shared/Modules/AsyncStorageModule.cpp

@@ -83,9 +83,5 @@ std::vector<facebook::xplat::module::CxxModule::Method> AsyncStorageModule::getM
   };
 }
 
-std::unique_ptr<facebook::xplat::module::CxxModule> CreateAsyncStorageModule(const WCHAR *storageFileName) noexcept {
-  return std::make_unique<AsyncStorageModule>(storageFileName);
-}
-
 } // namespace react
 } // namespace facebook