react-native-windows 0.65.2 → 0.65.6

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

@@ -35,6 +35,7 @@
     <ClInclude Include="$(JSI_SourcePath)\jsi\jsi-inl.h" />
     <ClInclude Include="$(JSI_SourcePath)\jsi\jsi.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DesktopWindowBridge.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)TurboModuleProvider.h" />
     <ClInclude Include="$(CallInvoker_SourcePath)\ReactCommon\CallInvoker.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)XamlUtils.h" />
@@ -115,4 +116,9 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)README.md" />
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
+      <ExcludedFromBuild Condition="'$(UseV8)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
 </Project>

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

@@ -27,6 +27,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiApiContext.cpp">
       <Filter>JSI</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
+      <Filter>JSI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
@@ -146,6 +149,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)XamlUtils.h">
       <Filter>UI</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h">
+      <Filter>JSI</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="JSI">

package/Mso/future/futureWinRT.h

@@ -57,7 +57,9 @@ struct AsyncActionFutureAdapter : winrt::implements<
       m_completedAssigned = true;
 
       if (m_status == AsyncStatus::Started) {
-        m_completed = winrt::impl::make_agile_delegate(handler);
+        m_completed = winrt::impl::make_agile_delegate(
+            [keepAlive = get_strong(), handler = std::move(handler)](
+                auto const &task, winrt::Windows::Foundation::AsyncStatus status) { handler(task, status); });
         return;
       }
 

package/PropertySheets/JSEngine.props

@@ -11,9 +11,10 @@
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.65.2</V8Version>
-    <V8Package Condition="'$(V8Package)' == '' AND '$(V8AppPlatform)' == 'win32'">$(SolutionDir)packages\ReactNative.V8Jsi.Windows.$(V8Version)</V8Package>
-    <V8Package Condition="'$(V8Package)' == '' AND '$(V8AppPlatform)' != 'win32'">$(SolutionDir)packages\ReactNative.V8Jsi.Windows.UWP.$(V8Version)</V8Package>
+    <V8Version Condition="'$(V8Version)' == ''">0.65.5</V8Version>
+    <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
+    <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
+    <V8Package>$(SolutionDir)packages\$(V8PackageName).$(V8Version)</V8Package>
   </PropertyGroup>
 
 </Project>

package/Scripts/OfficeReact.Win32.nuspec

@@ -28,10 +28,12 @@
     <file src="$nugetroot$\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x64"/>
     <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64"/>
 
-    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\debug\x86"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\debug\x64"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\x86"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\x64"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\debug\x86"    exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\debug\x64"    exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\ARM64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\debug\ARM64"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\ship\x86"     exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"    target="lib\ship\x64"     exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\ARM64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"  target="lib\ship\ARM64"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
 
     <file src="$nugetroot$\inc\callinvoker\ReactCommon\CallInvoker.h" target="inc\ReactCommon"/>
     <file src="$nugetroot$\inc\runtimeexecutor\ReactCommon\RuntimeExecutor.h" target="inc\ReactCommon"/>

package/Shared/JSI/NapiJsiV8RuntimeHolder.cpp

@@ -92,7 +92,7 @@ void NapiJsiV8RuntimeHolder::InitRuntime() noexcept {
   // Associate environment to holder.
   napi_set_instance_data(env, this, nullptr /*finalize_cb*/, nullptr /*finalize_hint*/);
 
-  m_runtime = MakeNapiJsiRuntime(env);
+  m_runtime = MakeNodeApiJsiRuntime(env);
   m_ownThreadId = std::this_thread::get_id();
 }
 

package/Shared/JSI/NapiJsiV8RuntimeHolder.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <DevSettings.h>
-#include <NapiJsiRuntime.h>
+#include <JSI/NodeApiJsiRuntime.h>
 #include "RuntimeHolder.h"
 #include "ScriptStore.h"
 

package/Shared/Threading/MessageDispatchQueue.cpp

@@ -88,4 +88,83 @@ void MessageDispatchQueue::quitSynchronous() {
   }
 }
 
+//=============================================================================================
+// MessageDispatchQueue2 implementation.
+//=============================================================================================
+
+MessageDispatchQueue2::MessageDispatchQueue2(
+    Mso::React::IDispatchQueue2 &dispatchQueue,
+    Mso::Functor<void(const Mso::ErrorCode &)> &&errorHandler,
+    Mso::Promise<void> &&whenQuit) noexcept
+    : m_stopped{false},
+      m_errorHandler{std::move(errorHandler)},
+      m_whenQuit{std::move(whenQuit)},
+      m_dispatchQueue{&dispatchQueue} {}
+
+MessageDispatchQueue2::~MessageDispatchQueue2() noexcept {}
+
+void MessageDispatchQueue2::runOnQueue(std::function<void()> &&func) {
+  if (m_stopped) {
+    return;
+  }
+
+  m_dispatchQueue->Post([pThis = shared_from_this(), func = std::move(func)]() noexcept {
+    if (!pThis->m_stopped) {
+      pThis->tryFunc(func);
+    }
+  });
+}
+
+void MessageDispatchQueue2::tryFunc(const std::function<void()> &func) noexcept {
+  try {
+    func();
+  } catch (const std::exception & /*ex*/) {
+    if (auto errorHandler = m_errorHandler.Get()) {
+      errorHandler->Invoke(Mso::ExceptionErrorProvider().MakeErrorCode(std::current_exception()));
+    }
+  }
+}
+
+void MessageDispatchQueue2::runSync(const Mso::VoidFunctorRef &func) noexcept {
+  Mso::ManualResetEvent callbackFinished{};
+
+  m_dispatchQueue->InvokeElsePost(Mso::MakeDispatchTask(
+      /*callback:*/
+      [&func, &callbackFinished]() noexcept {
+        func();
+        callbackFinished.Set();
+      },
+      /*onCancel:*/ [&func, &callbackFinished]() noexcept { callbackFinished.Set(); }));
+
+  callbackFinished.Wait();
+}
+
+// runOnQueueSync and quitSynchronous are dangerous.  They should only be
+// used for initialization and cleanup.
+void MessageDispatchQueue2::runOnQueueSync(std::function<void()> &&func) {
+  if (m_stopped) {
+    return;
+  }
+
+  runSync([this, &func]() noexcept {
+    if (!m_stopped) {
+      tryFunc(func);
+    }
+  });
+}
+
+// Once quitSynchronous() returns, no further work should run on the queue.
+void MessageDispatchQueue2::quitSynchronous() {
+  m_stopped = true;
+  runSync([]() noexcept {});
+
+  if (m_whenQuit) {
+    m_dispatchQueue->Post([sharedThis = shared_from_this()]() noexcept {
+      if (auto thisPtr = sharedThis.get()) {
+        thisPtr->m_whenQuit.SetValue();
+      }
+    });
+  }
+}
+
 } // namespace Mso::React

package/Shared/Threading/MessageDispatchQueue.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <IReactDispatcher.h>
 #include <cxxreact/MessageQueueThread.h>
 #include <functional/FunctorRef.h>
 #include <future/Future.h>
@@ -43,4 +44,34 @@ struct MessageDispatchQueue : facebook::react::MessageQueueThread, std::enable_s
   const Mso::Promise<void> m_whenQuit;
 };
 
+struct MessageDispatchQueue2 : facebook::react::MessageQueueThread,
+                               std::enable_shared_from_this<MessageDispatchQueue2> {
+  MessageDispatchQueue2(
+      Mso::React::IDispatchQueue2 &dispatchQueue,
+      Mso::Functor<void(const Mso::ErrorCode &)> &&errorHandler,
+      Mso::Promise<void> &&whenQuit = nullptr) noexcept;
+
+  ~MessageDispatchQueue2() noexcept override;
+
+ public: // FastMessageQueueThread implementation
+  void runOnQueue(std::function<void()> &&func) override;
+
+  // runOnQueueSync and quitSynchronous are dangerous.  They should only be
+  // used for initialization and cleanup.
+  void runOnQueueSync(std::function<void()> &&func) override;
+
+  // Once quitSynchronous() returns, no further work should run on the queue.
+  void quitSynchronous() override;
+
+ private:
+  void runSync(const Mso::VoidFunctorRef &func) noexcept;
+  void tryFunc(const std::function<void()> &func) noexcept;
+
+ private:
+  std::atomic<bool> m_stopped;
+  Mso::CntPtr<Mso::React::IDispatchQueue2> m_dispatchQueue;
+  Mso::Functor<void(const Mso::ErrorCode &)> m_errorHandler;
+  const Mso::Promise<void> m_whenQuit;
+};
+
 } // namespace Mso::React

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.65.2",
+  "version": "0.65.6",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "@react-native-community/cli": "^6.0.0",
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
-    "@react-native-windows/cli": "0.65.0",
+    "@react-native-windows/cli": "0.65.2",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
     "@react-native/polyfills": "1.0.0",
@@ -55,7 +55,7 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.65.0",
+    "@react-native-windows/codegen": "0.65.1",
     "@rnw-scripts/eslint-config": "1.1.6",
     "@types/node": "^14.14.22",
     "@types/react": "16.9.11",
@@ -78,7 +78,7 @@
     "react-native": "^0.65.0"
   },
   "beachball": {
-    "defaultNpmTag": "latest",
+    "defaultNpmTag": "v0.65-stable",
     "gitTags": true,
     "disallowedChangeTypes": [
       "major",