react-native-windows 0.67.8 → 0.67.11

package/CHANGELOG.json

@@ -1,6 +1,174 @@
 {
   "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",
+      "version": "0.67.10",
+      "comments": {
+        "patch": [
+          {
+            "author": "acoates@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "1d8934a3235695ce7ef5796976a2e5c0413d3ef8",
+            "comment": "Expose LoadingState on ReactContext"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "6d6015d5f24540e355160a5be62af1cc1a3903b0",
+            "comment": "Support PreparedScriptStore for V8 Node-API."
+          },
+          {
+            "author": "julio@rochsquadron.net",
+            "package": "react-native-windows",
+            "commit": "932c3b9e6732b83d60b608d3d44fed7f4cc6a6de",
+            "comment": "Implement Blob module (#9352)"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "13824a0805d2e9bd2eef44852029b193daf56664",
+            "comment": "Fix RuntimeOptions for RNW Desktop"
+          },
+          {
+            "author": "jthysell@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "93498b92be5a6900b06b35b20c4e81ba18a10647",
+            "comment": "[0.67] Change CG registration for folly and fmt from `other` to `git`"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 02 May 2022 15:10:57 GMT",
+      "tag": "react-native-windows_v0.67.9",
+      "version": "0.67.9",
+      "comments": {
+        "patch": [
+          {
+            "author": "53799235+ZihanChen-MSFT@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Fix clang-check errors in NativeModules.h"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Fix JSI for Node-API and update V8 to 0.65.11"
+          },
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Handle abrupt WebSocket connection interruption (#9829)"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 02 May 2022 15:10:43 GMT",
+      "tag": "react-native-windows_v0.67.9",
+      "version": "0.67.9",
+      "comments": {
+        "patch": [
+          {
+            "author": "53799235+ZihanChen-MSFT@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "9458dad1646fa2a8a5afea7383133eeca144fb88",
+            "comment": "Fix clang-check errors in NativeModules.h"
+          },
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "38c0547235927e51c08bd17b08b2f6be878fd0a5",
+            "comment": "Fix JSI for Node-API and update V8 to 0.65.11"
+          },
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "e3ef52d578991181c00a6487c902ce4c31cc702a",
+            "comment": "Handle abrupt WebSocket connection interruption (#9829)"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 25 Apr 2022 15:11:36 GMT",
+      "tag": "react-native-windows_v0.67.8",
+      "version": "0.67.8",
+      "comments": {
+        "patch": [
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Fix Sequential DispatchQueue deadlock on shutdown"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 25 Apr 2022 15:11:22 GMT",
       "tag": "react-native-windows_v0.67.8",

package/CHANGELOG.md

@@ -1,17 +1,78 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 25 Apr 2022 15:11:22 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.8
+## 0.67.11
 
-Mon, 25 Apr 2022 15:11:22 GMT
+Mon, 20 Jun 2022 15:08:04 GMT
 
 ### Patches
 
-- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@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
+
+### Patches
+
+- Fix clang-check errors in NativeModules.h (53799235+ZihanChen-MSFT@users.noreply.github.com)
+- Fix JSI for Node-API and update V8 to 0.65.11 (vmorozov@microsoft.com)
+- Handle abrupt WebSocket connection interruption (#9829) (julio.rocha@microsoft.com)
+
+## 0.67.9
+
+Mon, 02 May 2022 15:10:43 GMT
+
+### Patches
+
+- Fix clang-check errors in NativeModules.h (53799235+ZihanChen-MSFT@users.noreply.github.com)
+- Fix JSI for Node-API and update V8 to 0.65.11 (vmorozov@microsoft.com)
+- Handle abrupt WebSocket connection interruption (#9829) (julio.rocha@microsoft.com)
+
+## 0.67.8
+
+Mon, 25 Apr 2022 15:11:36 GMT
+
+### Patches
+
+- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@microsoft.com)
+
+## 0.67.8
+
+Mon, 25 Apr 2022 15:11:22 GMT
+
+### Patches
+
+- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@microsoft.com)
+
 ## 0.67.7
 
 Mon, 04 Apr 2022 15:13:28 GMT

package/Chakra/ChakraHelpers.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 
-#include <RuntimeOptions.h>
 #include "ChakraHelpers.h"
 #include "ChakraUtils.h"
 #include "ChakraValue.h"

package/Directory.Build.props

@@ -18,8 +18,12 @@
       The PR (windows-vs-pr.yml) and CI (publish.yml() turn it back on.
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
+    <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit too. -->
     <FollyVersion>2021.06.28.00</FollyVersion>
+    <FollyCommitHash>f434460f8a98e85f3ddb75390ddd1cc330c8f658</FollyCommitHash>
+    <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit too. -->
     <FmtVersion>7.1.3</FmtVersion>
+    <FmtCommitHash>7bdf0628b1276379886c7f6dda2cef2b3b374f0b</FmtCommitHash>
   </PropertyGroup>
 
   <PropertyGroup Label="Configuration">

package/Folly/Folly.vcxproj

@@ -299,11 +299,10 @@
     "Registrations": [
         {
             "Component": {
-                "Type": "other",
-                "Other": {
-                  "Name": "folly",
-                  "Version": "$(FollyVersion)",
-                  "DownloadUrl": "https://github.com/facebook/folly/archive/v$(FollyVersion).zip"
+                "Type": "git",
+                "Git": {
+                  "RepositoryUrl": "https://github.com/facebook/folly",
+                  "CommitHash": "$(FollyCommitHash)"
                 }
             },
             "DevelopmentDependency": false

package/Libraries/Network/RCTNetworkingWinShared.js

@@ -61,6 +61,11 @@ type RCTNetworkingEventDefinitions = $ReadOnly<{
   ],
 }>;
 
+let _requestId = 1;
+function generateRequestId(): number {
+  return _requestId++;
+}
+
 const RCTNetworking = {
   addListener<K: $Keys<RCTNetworkingEventDefinitions>>(
     eventType: K,
@@ -82,11 +87,13 @@ const RCTNetworking = {
     callback: (requestId: number) => void,
     withCredentials: boolean,
   ) {
+    const requestId = generateRequestId();
     const body = convertRequestBody(data);
     RCTNetworkingNative.sendRequest(
       {
         method,
         url,
+        requestId,
         data: {...body, trackingName},
         headers,
         responseType,

package/Microsoft.ReactNative/Base/CoreNativeModules.cpp

@@ -13,7 +13,6 @@
 #include <Modules/ClipboardModule.h>
 #include <Modules/LinkingManagerModule.h>
 #include <Modules/NativeUIManager.h>
-#include <Modules/NetworkingModule.h>
 #include <Modules/PaperUIManagerModule.h>
 #include <Threading/MessageQueueThreadFactory.h>
 
@@ -50,8 +49,8 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
   std::vector<facebook::react::NativeModuleDescription> modules;
 
   modules.emplace_back(
-      Microsoft::React::NetworkingModule::Name,
-      []() { return std::make_unique<Microsoft::React::NetworkingModule>(); },
+      "Networking",
+      [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); },
       jsMessageQueue);
 
   modules.emplace_back(

package/Microsoft.ReactNative/IReactContext.cpp

@@ -96,6 +96,23 @@ Windows::Foundation::IInspectable ReactContext::JSRuntime() noexcept {
   return m_context->JsiRuntime();
 }
 
+LoadingState ReactContext::LoadingState() noexcept {
+  switch (m_context->State()) {
+    case Mso::React::ReactInstanceState::Loading:
+    case Mso::React::ReactInstanceState::WaitingForDebugger:
+      return LoadingState::Loading;
+    case Mso::React::ReactInstanceState::Loaded:
+      return LoadingState::Loaded;
+    case Mso::React::ReactInstanceState::HasError:
+      return LoadingState::HasError;
+    case Mso::React::ReactInstanceState::Unloaded:
+      return LoadingState::Unloaded;
+    default:
+      assert(false);
+      return LoadingState::HasError;
+  };
+}
+
 #ifndef CORE_ABI
 // Deprecated: Use XamlUIService directly.
 void ReactContext::DispatchEvent(

package/Microsoft.ReactNative/IReactContext.h

@@ -42,6 +42,8 @@ struct ReactContext : winrt::implements<ReactContext, IReactContext> {
   IReactDispatcher UIDispatcher() noexcept;
   IReactDispatcher JSDispatcher() noexcept;
   IInspectable JSRuntime() noexcept;
+  LoadingState LoadingState() noexcept;
+
 #ifndef CORE_ABI
   void DispatchEvent(
       xaml::FrameworkElement const &view,

package/Microsoft.ReactNative/IReactContext.idl

@@ -13,6 +13,29 @@ import "IReactPropertyBag.idl";
 
 namespace Microsoft.ReactNative
 {
+
+  DOC_STRING(
+    "Used to represent the state of the React Native JavaScript instance")
+  enum LoadingState
+  {
+    DOC_STRING(
+      "The instance is loading the JavaScript bundle and initial instance setup. Calls to run JavaScript functions will be queued to run once the instance is fully loaded."
+    )
+    Loading = 0,
+    DOC_STRING(
+      "The instance is in a ready state.  Calls to run JavaScript functions will be run as soon as they are posted to the JavaScript instance."
+    )
+    Loaded = 1,
+    DOC_STRING(
+      "The instance has hit an error.  Calls to run JavaScript functions will not be run."
+    )
+    HasError = 2,
+    DOC_STRING(
+      "The instance has successfully unloaded.  Calls to run JavaScript functions will not be run."
+    )
+    Unloaded = 3
+  };
+
   [webhosthidden]
   DOC_STRING("An immutable snapshot of the @ReactInstanceSettings used to create the current React instance.")
   interface IReactSettingsSnapshot
@@ -167,5 +190,9 @@ namespace Microsoft.ReactNative
       "The `paramsArgWriter` is a @JSValueArgWriter delegate that receives @IJSValueWriter to serialize "
       "the event parameters.")
     void EmitJSEvent(String eventEmitterName, String eventName, JSValueArgWriter paramsArgWriter);
+
+    DOC_STRING(
+      "Gets the state of the ReactNative instance.")
+    LoadingState LoadingState { get; };
   }
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/Modules/CreateModules.cpp

@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 
 #include <CreateModules.h>
+#include <Networking/WinRTWebSocketResource.h>
 #include <QuirkSettings.h>
 #include <React.h>
 #include <ReactPropertyBag.h>
-#include <WinRTWebSocketResource.h>
 
 // React Native
 #include <cxxreact/CxxModule.h>
@@ -17,11 +17,11 @@ using winrt::Microsoft::ReactNative::ReactPropertyBag;
 using winrt::Microsoft::ReactNative::ReactPropertyId;
 using winrt::Microsoft::ReactNative::implementation::QuirkSettings;
 
-namespace Microsoft::React {
+namespace Microsoft::React::Networking {
 
 std::shared_ptr<IWebSocketResource> IWebSocketResource::Make() {
   std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> certExceptions;
   return std::make_shared<WinRTWebSocketResource>(std::move(certExceptions));
 }
 
-} // namespace Microsoft::React
+} // namespace Microsoft::React::Networking

package/Microsoft.ReactNative/packages.config

@@ -8,5 +8,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native" />
   <package id="Microsoft.WinUI" version="3.0.0-preview4.210210.4" targetFramework="native" />
   <package id="ReactNative.Hermes.Windows" version="0.10.0-ms.1" targetFramework="native" />
-  <!-- package id="ReactNative.V8Jsi.Windows.UWP" version="0.65.5" targetFramework="native" / -->
+  <!-- package id="ReactNative.V8Jsi.Windows.UWP" version="0.65.15" targetFramework="native" / -->
 </packages>

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/JSI/NodeApiJsiRuntime.cpp

@@ -190,7 +190,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   facebook::jsi::Function createFunctionFromHostFunction(
       const facebook::jsi::PropNameID &name,
       unsigned int paramCount,
-      facebook::jsi::HostFunctionType type) override;
+      facebook::jsi::HostFunctionType func) override;
   facebook::jsi::Value call(
       const facebook::jsi::Function &func,
       const facebook::jsi::Value &jsThis,
@@ -440,6 +440,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
 
  private: // Shared NAPI call helpers
   napi_value RunScript(napi_value script, const char *sourceUrl);
+  napi_value RunScriptBuffer(const std::shared_ptr<const facebook::jsi::Buffer> &buffer, const char *sourceUrl);
   std::vector<uint8_t> SerializeScript(napi_value script, const char *sourceUrl);
   napi_value RunSerializedScript(span<const uint8_t> serialized, napi_value source, const char *sourceUrl);
   napi_ext_ref CreateReference(napi_value value) const;
@@ -475,7 +476,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   void SetProperty(napi_value object, napi_value propertyId, napi_value value, napi_property_attributes attrs) const;
   napi_value CreateArray(size_t length) const;
   void SetElement(napi_value array, uint32_t index, napi_value value) const;
-  static napi_value JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept;
+  static napi_value __cdecl JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept;
   napi_value CreateExternalFunction(napi_value name, int32_t paramCount, napi_callback callback, void *callbackData);
   napi_value CreateExternalObject(void *data, napi_finalize finalizeCallback) const;
   template <typename T>
@@ -620,9 +621,7 @@ NapiJsiRuntime::NapiJsiRuntime(napi_env env) noexcept : m_env{env} {
 
 Value NapiJsiRuntime::evaluateJavaScript(const shared_ptr<const Buffer> &buffer, const string &sourceUrl) {
   EnvScope envScope{m_env};
-  napi_value script = CreateStringUtf8(buffer->data(), buffer->size());
-  napi_value result = RunScript(script, sourceUrl.c_str());
-
+  napi_value result = RunScriptBuffer(buffer, sourceUrl.c_str());
   return ToJsiValue(result);
 }
 
@@ -1406,6 +1405,21 @@ napi_value NapiJsiRuntime::RunScript(napi_value script, const char *sourceUrl) {
   return result;
 }
 
+napi_value NapiJsiRuntime::RunScriptBuffer(
+    const std::shared_ptr<const facebook::jsi::Buffer> &buffer,
+    const char *sourceUrl) {
+  napi_ext_buffer napiBuffer{};
+  napiBuffer.buffer_object = NativeObjectWrapper<std::shared_ptr<const facebook::jsi::Buffer>>::Wrap(
+      std::shared_ptr<const facebook::jsi::Buffer>{buffer});
+  napiBuffer.data = buffer->data();
+  napiBuffer.byte_size = buffer->size();
+
+  napi_value result{};
+  CHECK_NAPI(napi_ext_run_script_buffer(m_env, &napiBuffer, sourceUrl, &result));
+
+  return result;
+}
+
 // Serializes script with the sourceUrl origin.
 vector<uint8_t> NapiJsiRuntime::SerializeScript(napi_value script, const char *sourceUrl) {
   vector<uint8_t> result;
@@ -1702,7 +1716,7 @@ void NapiJsiRuntime::SetElement(napi_value array, uint32_t index, napi_value val
 }
 
 // The NAPI external function callback used for the JSI host function implementation.
-/*static*/ napi_value NapiJsiRuntime::JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept {
+/*static*/ napi_value __cdecl NapiJsiRuntime::JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept {
   HostFunctionWrapper *hostFuncWrapper{};
   size_t argc{};
   CHECK_NAPI_ELSE_CRASH(
@@ -1750,15 +1764,11 @@ napi_value NapiJsiRuntime::CreateExternalObject(void *data, napi_finalize finali
 // Wraps up std::unique_ptr as an external object.
 template <typename T>
 napi_value NapiJsiRuntime::CreateExternalObject(unique_ptr<T> &&data) const {
-  napi_value object =
-      CreateExternalObject(data.get(), [](napi_env /*env*/, void *dataToDestroy, void * /*finalizerHint*/) {
-        // We wrap dataToDestroy in a unique_ptr to avoid calling delete explicitly.
-        if (std::is_array<T>::value) {
-          delete[] static_cast<T *>(dataToDestroy);
-        } else {
-          delete static_cast<T *>(dataToDestroy);
-        }
-      });
+  napi_finalize finalize = [](napi_env /*env*/, void *dataToDestroy, void * /*finalizerHint*/) {
+    // We wrap dataToDestroy in a unique_ptr to avoid calling delete explicitly.
+    unique_ptr<T> dataDeleter{static_cast<T *>(dataToDestroy)};
+  };
+  napi_value object = CreateExternalObject(data.get(), finalize);
 
   // We only call data.release() after the CreateExternalObject succeeds.
   // Otherwise, when CreateExternalObject fails and an exception is thrown,
@@ -1807,7 +1817,7 @@ napi_value NapiJsiRuntime::GetHostObjectProxyHandler() {
 // Sets Proxy trap method as a pointer to NapiJsiRuntime instance method.
 template <napi_value (NapiJsiRuntime::*trapMethod)(span<napi_value>), size_t argCount>
 void NapiJsiRuntime::SetProxyTrap(napi_value handler, napi_value propertyName) {
-  auto proxyTrap = [](napi_env env, napi_callback_info info) noexcept {
+  napi_callback proxyTrap = [](napi_env env, napi_callback_info info) noexcept {
     NapiJsiRuntime *runtime{};
     napi_value args[argCount]{};
     size_t actualArgCount{argCount};