react-native-windows 0.67.10 → 0.67.11

package/CHANGELOG.json

@@ -1,6 +1,66 @@
 {
   "name": "react-native-windows",
   "entries": [
+    {
+      "date": "Mon, 20 Jun 2022 15:08:04 GMT",
+      "tag": "react-native-windows_v0.67.11",
+      "version": "0.67.11",
+      "comments": {
+        "patch": [
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "247fa688a24a58c3b22411babbcd3b6396744895",
+            "comment": "Fix use of [[maybe_unused]] attribute"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "2b74c16a6d631ff7ba65ae28a81de5b26906bd40",
+            "comment": "Fix ExecuteJsi on instance shutdown"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 30 May 2022 15:09:46 GMT",
+      "tag": "react-native-windows_v0.67.10",
+      "version": "0.67.10",
+      "comments": {
+        "patch": [
+          {
+            "author": "acoates@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Expose LoadingState on ReactContext"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Support PreparedScriptStore for V8 Node-API."
+          },
+          {
+            "author": "julio@rochsquadron.net",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Implement Blob module (#9352)"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Fix RuntimeOptions for RNW Desktop"
+          },
+          {
+            "author": "jthysell@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "[0.67] Change CG registration for folly and fmt from `other` to `git`"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 30 May 2022 15:09:33 GMT",
       "tag": "react-native-windows_v0.67.10",

package/CHANGELOG.md

@@ -1,21 +1,42 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 30 May 2022 15:09:33 GMT and should not be manually modified.
+This log was last generated on Mon, 20 Jun 2022 15:08:04 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.67.10
+## 0.67.11
 
-Mon, 30 May 2022 15:09:33 GMT
+Mon, 20 Jun 2022 15:08:04 GMT
 
 ### Patches
 
-- Expose LoadingState on ReactContext (acoates@microsoft.com)
-- Support PreparedScriptStore for V8 Node-API. (vmorozov@microsoft.com)
-- Implement Blob module (#9352) (julio@rochsquadron.net)
-- Fix RuntimeOptions for RNW Desktop (vmorozov@microsoft.com)
-- [0.67] Change CG registration for folly and fmt from `other` to `git` (jthysell@microsoft.com)
+- Fix use of [[maybe_unused]] attribute (vmorozov@microsoft.com)
+- Fix ExecuteJsi on instance shutdown (vmorozov@microsoft.com)
 
+## 0.67.10
+
+Mon, 30 May 2022 15:09:46 GMT
+
+### Patches
+
+- Expose LoadingState on ReactContext (acoates@microsoft.com)
+- Support PreparedScriptStore for V8 Node-API. (vmorozov@microsoft.com)
+- Implement Blob module (#9352) (julio@rochsquadron.net)
+- Fix RuntimeOptions for RNW Desktop (vmorozov@microsoft.com)
+- [0.67] Change CG registration for folly and fmt from `other` to `git` (jthysell@microsoft.com)
+
+## 0.67.10
+
+Mon, 30 May 2022 15:09:33 GMT
+
+### Patches
+
+- Expose LoadingState on ReactContext (acoates@microsoft.com)
+- Support PreparedScriptStore for V8 Node-API. (vmorozov@microsoft.com)
+- Implement Blob module (#9352) (julio@rochsquadron.net)
+- Fix RuntimeOptions for RNW Desktop (vmorozov@microsoft.com)
+- [0.67] Change CG registration for folly and fmt from `other` to `git` (jthysell@microsoft.com)
+
 ## 0.67.9
 
 Mon, 02 May 2022 15:10:57 GMT

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.cpp

@@ -10,16 +10,19 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 namespace winrt::Microsoft::ReactNative {
 
-// Get JSI Runtime from the current JS dispatcher thread.
-// If it is not found, then create it and store it in the context.Properties().
-// Make sure that the JSI runtime holder is removed when the instance is unloaded.
-facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept {
+// Try to get JSI Runtime for the current JS dispatcher thread.
+// If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
+// The function returns nullptr if the current context does not have JSI runtime.
+// It makes sure that the JSI runtime holder is removed when the instance is unloaded.
+facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept {
   ReactDispatcher jsDispatcher = context.JSDispatcher();
   VerifyElseCrashSz(jsDispatcher.HasThreadAccess(), "Must be in JS thread");
 
   // The JSI runtime is not available if we do Web debugging when JS is running in web browser.
   JsiRuntime abiJsiRuntime = context.Handle().JSRuntime().as<JsiRuntime>();
-  VerifyElseCrashSz(abiJsiRuntime, "JSI runtime is not available");
+  if (!abiJsiRuntime) {
+    return nullptr;
+  }
 
   // See if the JSI runtime was previously created.
   JsiAbiRuntime *runtime = JsiAbiRuntime::GetFromJsiRuntime(abiJsiRuntime);
@@ -51,6 +54,15 @@ facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) n
         });
   }
 
+  return runtime;
+}
+
+// Calls TryGetOrCreateContextRuntime to get JSI runtime.
+// It crashes when TryGetOrCreateContextRuntime returns null.
+// Note: deprecated in favor of TryGetOrCreateContextRuntime.
+[[deprecated]] facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept {
+  facebook::jsi::Runtime *runtime = TryGetOrCreateContextRuntime(context);
+  VerifyElseCrashSz(runtime, "JSI runtime is not available");
   return *runtime;
 }
 

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

@@ -7,26 +7,55 @@
 
 #include "../ReactContext.h"
 #include "JsiAbiApi.h"
+#include "ReactPromise.h"
 
 namespace winrt::Microsoft::ReactNative {
 
-// Get JSI Runtime from the current JS dispatcher thread.
-// If it is not found, then create it and store it in the context.Properties().
-// Make sure that the JSI runtime holder is removed when the instance is unloaded.
-facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept;
+// Try to get JSI Runtime for the current JS dispatcher thread.
+// If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
+// The function returns nullptr if the current context does not have JSI runtime.
+// It makes sure that the JSI runtime holder is removed when the instance is unloaded.
+facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept;
+
+// Calls TryGetOrCreateContextRuntime to get JSI runtime.
+// It crashes when TryGetOrCreateContextRuntime returns null.
+// Note: deprecated in favor of TryGetOrCreateContextRuntime.
+[[deprecated]] facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept;
 
 // Call provided lambda with the facebook::jsi::Runtime& parameter.
 // For example: ExecuteJsi(context, [](facebook::jsi::Runtime& runtime){...})
 // The code is executed synchronously if it is already in JSDispatcher, or asynchronously otherwise.
 template <class TCodeWithRuntime>
-void ExecuteJsi(ReactContext const &context, TCodeWithRuntime const &code) {
+void ExecuteJsi(ReactContext const &context, TCodeWithRuntime const &code, ReactPromise<void> *callStatus = nullptr) {
   ReactDispatcher jsDispatcher = context.JSDispatcher();
+  auto callCode = [](ReactContext const &context, TCodeWithRuntime const &code, ReactPromise<void> *callStatus) {
+    facebook::jsi::Runtime *runtime = TryGetOrCreateContextRuntime(context);
+    if (runtime) {
+      code(*runtime);
+    }
+
+    // Report status of the call
+    if (callStatus) {
+      if (runtime) {
+        callStatus->Resolve();
+      } else {
+        callStatus->Reject("No JSI runtime");
+      }
+    }
+  };
+
   if (jsDispatcher.HasThreadAccess()) {
     // Execute immediately if we are in JS thread.
-    code(GetOrCreateContextRuntime(context));
+    callCode(context, code, callStatus);
   } else {
     // Otherwise, schedule work in JS thread.
-    jsDispatcher.Post([context, code]() noexcept { code(GetOrCreateContextRuntime(context)); });
+    jsDispatcher.Post([callCode,
+                       context,
+                       code,
+                       callStatus = callStatus ? std::make_unique<ReactPromise<void>>(*callStatus)
+                                               : std::unique_ptr<ReactPromise<void>>(nullptr)]() noexcept {
+      callCode(context, code, callStatus.get());
+    });
   }
 }
 

package/Microsoft.ReactNative.Cxx/JSValueWriter.h

@@ -287,7 +287,7 @@ inline JSValueArgWriter MakeJSValueWriter(T &&argWriter) noexcept {
 
 template <class... TArgs>
 inline JSValueArgWriter MakeJSValueWriter(TArgs &&... args) noexcept {
-  return [&args...](IJSValueWriter const &[[maybe_unused]] writer) noexcept { (WriteValue(writer, args), ...); };
+  return [&args...]([[maybe_unused]] IJSValueWriter const &writer) noexcept { (WriteValue(writer, args), ...); };
 }
 
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative.Cxx/ReactPromise.cpp

@@ -6,7 +6,6 @@
 
 #include "pch.h"
 #include "ReactPromise.h"
-#include "JSValueWriter.h"
 
 namespace winrt::Microsoft::ReactNative {
 
@@ -105,6 +104,27 @@ bool ReactPromiseBase::TrySetState(State newState) const noexcept {
   return false;
 }
 
+/*static*/ MethodResultCallback ReactPromiseBase::GetRejectResultCallback(
+    std::function<void(ReactError const &)> const &reject) noexcept {
+  return [reject](IJSValueWriter const &outputWriter) noexcept {
+    winrt::com_ptr<JSValueTreeWriter> writer = outputWriter.as<JSValueTreeWriter>();
+    JSValue jsValue = writer->TakeValue();
+    ReactError err{};
+    err.Code = jsValue.AsArray()[0].AsObject()[ErrorMapKeyCode].AsString();
+    err.Message = jsValue.AsArray()[0].AsObject()[ErrorMapKeyMessage].AsString();
+    err.UserInfo = jsValue.AsArray()[0].AsObject()[ErrorMapKeyUserInfo].AsObject().Copy();
+    reject(err);
+  };
+}
+
+ReactPromise<void>::ReactPromise(
+    std::function<void()> const &resolve,
+    std::function<void(ReactError const &)> const &reject) noexcept
+    : ReactPromiseBase(
+          winrt::make<JSValueTreeWriter>(),
+          [resolve](IJSValueWriter const & /*outputWriter*/) noexcept { resolve(); },
+          GetRejectResultCallback(reject)) {}
+
 // Successfully resolve the ReactPromise<void>.
 void ReactPromise<void>::Resolve() const noexcept {
   if (TrySetState(State::Resolved) && m_resolve) {

package/Microsoft.ReactNative.Cxx/ReactPromise.h

@@ -5,6 +5,11 @@
 // vnext/Microsoft.ReactNative.Cxx/README.md
 
 #pragma once
+#include <functional>
+#include "JSValueReader.h"
+#include "JSValueTreeReader.h"
+#include "JSValueTreeWriter.h"
+#include "JSValueWriter.h"
 #include "ReactError.h"
 #include "winrt/Microsoft.ReactNative.h"
 
@@ -35,6 +40,7 @@ struct ReactPromiseBase {
 
  protected:
   bool TrySetState(State newState) const noexcept;
+  static MethodResultCallback GetRejectResultCallback(std::function<void(ReactError const &)> const &reject) noexcept;
 
  protected:
   const std::shared_ptr<std::atomic<State>> m_state;
@@ -47,6 +53,10 @@ template <class T>
 struct ReactPromise : ReactPromiseBase {
   using ReactPromiseBase::ReactPromiseBase;
 
+  ReactPromise(
+      std::function<void(T const &)> const &resolve,
+      std::function<void(ReactError const &)> const &reject) noexcept;
+
   // Successfully resolve the IReactPromise with an optional value.
   void Resolve(T const &value) const noexcept;
 };
@@ -55,10 +65,27 @@ template <>
 struct ReactPromise<void> : ReactPromiseBase {
   using ReactPromiseBase::ReactPromiseBase;
 
+  ReactPromise(std::function<void()> const &resolve, std::function<void(ReactError const &)> const &reject) noexcept;
+
   // Successfully resolve the IReactPromise with an optional value.
   void Resolve() const noexcept;
 };
 
+template <class T>
+ReactPromise<T>::ReactPromise(
+    std::function<void(T const &)> const &resolve,
+    std::function<void(ReactError const &)> const &reject) noexcept
+    : ReactPromiseBase(
+          winrt::make<JSValueTreeWriter>(),
+          [resolve](IJSValueWriter const &outputWriter) noexcept {
+            winrt::com_ptr<JSValueTreeWriter> writer = outputWriter.as<JSValueTreeWriter>();
+            auto reader = winrt::make<JSValueTreeReader>(writer->TakeValue());
+            T result{};
+            ReadArgs(reader, result);
+            resolve(result);
+          },
+          GetRejectResultCallback(reject)) {}
+
 // Successfully resolve the ReactPromise with an optional value.
 template <class T>
 void ReactPromise<T>::Resolve(T const &value) const noexcept {

package/Microsoft.ReactNative.Cxx/TurboModuleProvider.h

@@ -23,7 +23,7 @@ void AddTurboModuleProvider(IReactPackageBuilder const &packageBuilder, std::wst
         IJsiHostObject abiTurboModule{nullptr};
         // We expect the initializer to be called immediately for TurboModules
         moduleBuilder.AddInitializer([&abiTurboModule](IReactContext const &context) mutable {
-          GetOrCreateContextRuntime(ReactContext{context}); // Ensure the JSI runtime is created.
+          TryGetOrCreateContextRuntime(ReactContext{context}); // Ensure the JSI runtime is created.
           auto callInvoker = MakeAbiCallInvoker(context.JSDispatcher());
           auto turboModule = std::make_shared<TTurboModule>(callInvoker);
           abiTurboModule = winrt::make<JsiHostObjectWrapper>(std::move(turboModule));

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.67.10</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.67.11</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>67</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>10</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>11</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.67.10",
+  "version": "0.67.11",
   "license": "MIT",
   "repository": {
     "type": "git",