react-native-windows 0.63.36 → 0.63.40

package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.h

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+// JSI
+#include <js_native_ext_api.h>
+#include <jsi/jsi.h>
+
+// Standard Library
+#include <memory>
+
+namespace Microsoft::JSI {
+
+///
+// NodeApiJsiRuntime factory function.
+// TODO: Rename as MakeNapiJsiRuntime once code is dropped from V8-JSI.
+///
+std::unique_ptr<facebook::jsi::Runtime> __cdecl MakeNodeApiJsiRuntime(napi_env env) noexcept;
+
+} // namespace Microsoft::JSI

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -17,6 +17,7 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CppWinRTIncludes.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ReactHandleHelper.h" />
@@ -65,4 +66,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)ModuleRegistration.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ReactPromise.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
+      <ExcludedFromBuild Condition="'$(USE_V8)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
 </Project>

package/PropertySheets/React.Cpp.props

@@ -33,7 +33,7 @@
     <HERMES_ARCH Condition="'$(HERMES_ARCH)' == ''">uwp</HERMES_ARCH>
 
     <USE_V8 Condition="('$(USE_V8)' == '') OR ('$(Platform)' == 'ARM')">false</USE_V8>
-    <V8_Version Condition="'$(V8_Version)' == ''">0.63.10</V8_Version>
+    <V8_Version Condition="'$(V8_Version)' == ''">0.63.17</V8_Version>
     <V8_Package Condition="'$(V8_Package)' == '' AND '$(V8AppPlatform)' == 'win32'">$(SolutionDir)packages\ReactNative.V8Jsi.Windows.$(V8_Version)</V8_Package>
     <V8_Package Condition="'$(V8_Package)' == '' AND '$(V8AppPlatform)' != 'win32'">$(SolutionDir)packages\ReactNative.V8Jsi.Windows.UWP.$(V8_Version)</V8_Package>
 
@@ -111,6 +111,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <ShowIncludes Condition="'$(ShowIncludes)' == 'true'">true</ShowIncludes>
     </ClCompile>
   </ItemDefinitionGroup>
 

package/Shared/DevSettings.h

@@ -30,9 +30,10 @@ enum class JSIEngineOverride : int32_t {
   ChakraCore = 2, // Use the JSIExecutorFactory with ChakraCoreRuntime
   Hermes = 3, // Use the JSIExecutorFactory with Hermes
   V8 = 4, // Use the JSIExecutorFactory with V8
-  V8NAPI = 5, // Use the JSIExecutorFactory with V8-NAPI
+  V8Lite = 5, // Use the JSIExecutorFactory with V8-NAPI
+  V8NodeApi = 6, // Use the JSIExecutorFactory with V8 via ABI-safe NAPI
 
-  Last = V8NAPI
+  Last = V8NodeApi
 };
 
 struct ChakraBundleMetadata {

package/Shared/OInstance.cpp

@@ -50,6 +50,7 @@
 #include "HermesRuntimeHolder.h"
 #endif
 #if defined(USE_V8)
+#include <NapiJsiV8RuntimeHolder.h>
 #include "BaseScriptStoreImpl.h"
 #include "V8JSIRuntimeHolder.h"
 #endif
@@ -151,6 +152,9 @@ std::string GetJSBundleFilePath(const std::string &jsBundleBasePath, const std::
 } // namespace
 
 using namespace facebook;
+using namespace Microsoft::JSI;
+
+using std::make_shared;
 
 namespace facebook {
 namespace react {
@@ -413,6 +417,34 @@ InstanceImpl::InstanceImpl(
           m_devSettings->jsiRuntimeHolder =
               std::make_shared<Microsoft::JSI::ChakraRuntimeHolder>(m_devSettings, m_jsThread, nullptr, nullptr);
           break;
+        case JSIEngineOverride::V8NodeApi: {
+#if defined(USE_V8)
+          std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore;
+
+          wchar_t tempPath[MAX_PATH];
+          if (GetTempPathW(static_cast<DWORD>(std::size(tempPath)), tempPath)) {
+            preparedScriptStore =
+                std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
+          }
+
+          if (!preparedScriptStore) {
+            if (m_devSettings->errorCallback)
+              m_devSettings->errorCallback("Could not initialize prepared script store");
+
+            break;
+          }
+
+          m_devSettings->jsiRuntimeHolder = make_shared<NapiJsiV8RuntimeHolder>(
+              m_devSettings, m_jsThread, nullptr /*scriptStore*/, std::move(preparedScriptStore));
+
+          break;
+#else
+          if (m_devSettings->errorCallback)
+            m_devSettings->errorCallback("JSI/V8/NAPI engine is not available in this build");
+          assert(false);
+          [[fallthrough]];
+#endif
+        }
         case JSIEngineOverride::ChakraCore:
         default: // TODO: Add other engines once supported
           m_devSettings->jsiRuntimeHolder =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.63.36",
+  "version": "0.63.40",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.8.4",
-    "@react-native-windows/cli": "0.63.12",
+    "@react-native-windows/cli": "0.63.14",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
@@ -66,7 +66,7 @@
   },
   "beachball": {
     "defaultNpmTag": "v0.63-stable",
-    "gitTags": true,
+    "gitTags": false,
     "disallowedChangeTypes": [
       "major",
       "minor",