react-native-windows 0.66.0 → 0.66.4

package/Shared/OInstance.cpp

@@ -45,11 +45,9 @@
 #include <safeint.h>
 #include "PackagerConnection.h"
 
-#if defined(INCLUDE_HERMES)
 #include <hermes/BytecodeVersion.h>
-
 #include "HermesRuntimeHolder.h"
-#endif
+
 #if defined(USE_V8)
 #include <JSI/NapiJsiV8RuntimeHolder.h>
 
@@ -307,7 +305,8 @@ InstanceImpl::InstanceImpl(
   facebook::react::tracing::initializeETW();
 #endif
 
-  if (m_devSettings->useDirectDebugger && !m_devSettings->useWebDebugger) {
+  if (m_devSettings->jsiEngineOverride == JSIEngineOverride::Hermes && m_devSettings->useDirectDebugger &&
+      !m_devSettings->useWebDebugger) {
     m_devManager->StartInspector(m_devSettings->sourceBundleHost, m_devSettings->sourceBundlePort);
   }
 
@@ -359,14 +358,9 @@ InstanceImpl::InstanceImpl(
       assert(m_devSettings->jsiEngineOverride != JSIEngineOverride::Default);
       switch (m_devSettings->jsiEngineOverride) {
         case JSIEngineOverride::Hermes:
-#if defined(INCLUDE_HERMES)
           m_devSettings->jsiRuntimeHolder = std::make_shared<HermesRuntimeHolder>(m_devSettings, m_jsThread);
           m_devSettings->inlineSourceMap = false;
           break;
-#else
-          assert(false); // Hermes is not available in this build, fallthrough
-          [[fallthrough]];
-#endif
         case JSIEngineOverride::V8: {
 #if defined(USE_V8)
           std::unique_ptr<facebook::jsi::ScriptStore> scriptStore = nullptr;
@@ -385,12 +379,6 @@ InstanceImpl::InstanceImpl(
           [[fallthrough]];
 #endif
         }
-        case JSIEngineOverride::Chakra:
-          // Applies only to ChakraCore-linked binaries.
-          Microsoft::React::SetRuntimeOptionBool("JSI.ForceSystemChakra", true);
-          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;
@@ -418,6 +406,7 @@ InstanceImpl::InstanceImpl(
           [[fallthrough]];
 #endif
         }
+        case JSIEngineOverride::Chakra:
         case JSIEngineOverride::ChakraCore:
         default: // TODO: Add other engines once supported
           m_devSettings->jsiRuntimeHolder =
@@ -506,7 +495,7 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
       }
 
       int64_t currentTimeInMilliSeconds =
-          std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono ::system_clock::now().time_since_epoch())
+          std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch())
               .count();
       m_devManager->UpdateBundleStatus(true, currentTimeInMilliSeconds);
 
@@ -577,11 +566,7 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
       // Otherwise all bundles (User and Platform) are loaded through
       // platformBundles.
       if (PathFileExistsA(fullBundleFilePath.c_str())) {
-#if defined(_CHAKRACORE_H_)
         auto bundleString = FileMappingBigString::fromPath(fullBundleFilePath);
-#else
-        auto bundleString = JSBigFileString::fromPath(fullBundleFilePath);
-#endif
         m_innerInstance->loadScriptFromString(std::move(bundleString), std::move(fullBundleFilePath), synchronously);
       }
 
@@ -592,10 +577,6 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
       m_innerInstance->loadScriptFromString(std::move(bundleString), jsBundleRelativePath, synchronously);
 #endif
     }
-#if defined(_CHAKRACORE_H_)
-  } catch (const facebook::react::ChakraJSException &e) {
-    m_devSettings->errorCallback(std::string{e.what()} + "\r\n" + e.getStack());
-#endif
   } catch (const std::exception &e) {
     m_devSettings->errorCallback(e.what());
   } catch (const winrt::hresult_error &hrerr) {
@@ -608,7 +589,9 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
 }
 
 InstanceImpl::~InstanceImpl() {
-  m_devManager->StopInspector();
+  if (m_devSettings->jsiEngineOverride == JSIEngineOverride::Hermes) {
+    m_devManager->StopInspector();
+  }
   m_nativeQueue->quitSynchronous();
 }
 
@@ -624,10 +607,10 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
       },
       nativeQueue));
 
-// TODO: This is not included for UWP because we have a different module which
-// is added later. However, this one is designed
-//  so that we can base a UWP version on it. We need to do that but is not high
-//  priority.
+  // TODO: This is not included for UWP because we have a different module which
+  // is added later. However, this one is designed
+  //  so that we can base a UWP version on it. We need to do that but is not high
+  //  priority.
 #if (defined(_MSC_VER) && !defined(WINRT))
   modules.push_back(std::make_unique<CxxNativeModule>(
       m_innerInstance,

package/Shared/Shared.vcxitems

@@ -26,15 +26,10 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)DevSupportManager.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutor.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutorFactory.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp">
-      <ExcludedFromBuild Condition="'$(IncludeHermes)' != 'true'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp">
-      <ExcludedFromBuild Condition="'$(IncludeHermes)' != 'true'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.cpp">
-      <ExcludedFromBuild Condition="'$(IncludeHermes)' != 'true'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesShim.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)InstanceManager.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSBigAbiString.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\ChakraApi.cpp" />
@@ -79,9 +74,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)AsyncStorage\FollyDynamicConverter.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)AsyncStorage\KeyValueStorage.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesShim.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ByteArrayBuffer.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraApi.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraCoreRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntimeArgs.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntimeFactory.h" />

package/Shared/Shared.vcxitems.filters

@@ -130,6 +130,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)HermesShim.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -363,9 +366,6 @@
       <Filter>Header Files\JSI</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\include\Shared\cdebug.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraCoreRuntime.h">
-      <Filter>Header Files\JSI</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -378,6 +378,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesShim.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.66.0",
+  "version": "0.66.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,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.66.0",
+    "@react-native-windows/cli": "0.66.1",
     "@react-native-windows/virtualized-list": "0.66.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
@@ -81,7 +81,7 @@
   },
   "peerDependencies": {
     "react": "17.0.2",
-    "react-native": "0.66.0"
+    "react-native": "^0.66.0"
   },
   "beachball": {
     "defaultNpmTag": "latest",

package/template/metro.config.js

@@ -4,9 +4,14 @@
  *
  * @format
  */
+const fs = require('fs');
 const path = require('path');
 const exclusionList = require('metro-config/src/defaults/exclusionList');
 
+const rnwPath = fs.realpathSync(
+  path.resolve(require.resolve('react-native-windows/package.json'), '..'),
+);
+
 module.exports = {
   resolver: {
     blockList: exclusionList([
@@ -14,7 +19,9 @@ module.exports = {
       new RegExp(
         `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`,
       ),
-      // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip
+      // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip or other files produced by msbuild
+      new RegExp(`${rnwPath}/build/.*`),
+      new RegExp(`${rnwPath}/target/.*`),
       /.*\.ProjectImports\.zip/,
     ]),
   },

package/template/metro.devMode.config.js

@@ -34,7 +34,9 @@ module.exports = {
       new RegExp(
         `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`,
       ),
-      // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip
+      // This prevents "react-native run-windows" from hitting: EBUSY: resource busy or locked, open msbuild.ProjectImports.zip or other files produced by msbuild
+      new RegExp(`${rnwPath}/build/.*`),
+      new RegExp(`${rnwPath}/target/.*`),
       /.*\.ProjectImports\.zip/,
     ]),
   },

package/Chakra/ChakraCoreDebugger.h

@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-
-#include <exception>
-#include <stdexcept>
-
-#include <ChakraDebugProtocolHandler.h>
-#include <ChakraDebugService.h>
-
-class DebugProtocolHandler {
- private:
-  JsDebugProtocolHandler m_protocolHandler{nullptr};
-
- public:
-  DebugProtocolHandler(JsRuntimeHandle runtime) {
-    JsDebugProtocolHandler protocolHandler;
-
-    JsErrorCode result = JsDebugProtocolHandlerCreate(runtime, &protocolHandler);
-
-    if (result != JsNoError) {
-      throw new std::runtime_error("Unable to create debug protocol handler.");
-    }
-
-    m_protocolHandler = protocolHandler;
-  }
-
-  ~DebugProtocolHandler() {
-    Destroy();
-  }
-
-  JsErrorCode Connect(bool breakOnNextLine, JsDebugProtocolHandlerSendResponseCallback callback, void *callbackState) {
-    JsErrorCode result = JsDebugProtocolHandlerConnect(m_protocolHandler, breakOnNextLine, callback, callbackState);
-
-    return result;
-  }
-
-  JsErrorCode Destroy() {
-    JsErrorCode result = JsNoError;
-
-    if (m_protocolHandler != nullptr) {
-      result = JsDebugProtocolHandlerDestroy(m_protocolHandler);
-
-      if (result == JsNoError) {
-        m_protocolHandler = nullptr;
-      }
-    }
-
-    return result;
-  }
-
-  JsErrorCode Disconnect() {
-    JsErrorCode result = JsDebugProtocolHandlerDisconnect(m_protocolHandler);
-
-    return result;
-  }
-
-  JsDebugProtocolHandler GetHandle() {
-    return m_protocolHandler;
-  }
-
-  JsErrorCode ProcessCommandQueue() {
-    JsErrorCode result = JsDebugProtocolHandlerProcessCommandQueue(m_protocolHandler);
-
-    return result;
-  }
-
-  JsErrorCode SetCommandQueueCallback(JsDebugProtocolHandlerCommandQueueCallback callback, void *callbackState) {
-    JsErrorCode result = JsDebugProtocolHandlerSetCommandQueueCallback(m_protocolHandler, callback, callbackState);
-
-    return result;
-  }
-
-  JsErrorCode WaitForDebugger() {
-    JsErrorCode result = JsDebugProtocolHandlerWaitForDebugger(m_protocolHandler);
-
-    return result;
-  }
-
-  JsErrorCode GetConsoleObject(JsValueRef *consoleObject) {
-    JsErrorCode result = JsDebugProtocolHandlerCreateConsoleObject(m_protocolHandler, consoleObject);
-
-    return result;
-  }
-};
-
-class DebugService {
- private:
-  JsDebugService m_service{nullptr};
-
- public:
-  DebugService(JsRuntimeHandle runtime) {
-    JsDebugService service;
-
-    JsErrorCode result = JsDebugServiceCreate(&service);
-
-    if (result != JsNoError) {
-      throw new std::exception("Unable to create debug service.");
-    }
-
-    m_service = service;
-  }
-
-  ~DebugService() {
-    Destroy();
-  }
-
-  JsErrorCode Close() {
-    JsErrorCode result = JsDebugServiceClose(m_service);
-
-    return result;
-  }
-
-  JsErrorCode Destroy() {
-    JsErrorCode result = JsNoError;
-
-    if (m_service != nullptr) {
-      result = JsDebugServiceDestroy(m_service);
-
-      if (result == JsNoError) {
-        m_service = nullptr;
-      }
-    }
-
-    return result;
-  }
-
-  JsErrorCode Listen(uint16_t port) {
-    JsErrorCode result = JsDebugServiceListen(m_service, port);
-
-    return result;
-  }
-
-  JsErrorCode
-  RegisterHandler(std::string const &runtimeName, DebugProtocolHandler &protocolHandler, bool breakOnNextLine) {
-    JsErrorCode result =
-        JsDebugServiceRegisterHandler(m_service, runtimeName.c_str(), protocolHandler.GetHandle(), breakOnNextLine);
-
-    return result;
-  }
-
-  JsErrorCode UnregisterHandler(std::string const &runtimeName) {
-    JsErrorCode result = JsDebugServiceUnregisterHandler(m_service, runtimeName.c_str());
-
-    return result;
-  }
-};

package/Scripts/Microsoft.ChakraCore.ARM64.nuspec

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Sample usage:
-
-nuget pack Microsoft.ChakraCore.ARM64.nuspec `
-  -Properties "id=ReactWindows.ChakraCore.ARM64;targetRoot=D:\chakra;repoUrl=https://github.com/microsoft/ChakraCore;repoBranch=master;repoCommit=$(git rev-parse HEAD)" `
-  -Version 1.11.20.0
- -->
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <!-- i.e.: Microsoft.ChakraCore.vc140.ARM64 -->
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <owners>Chakra Team</owners>
-    <licenseUrl>https://github.com/Microsoft/ChakraCore/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>https://github.com/Microsoft/ChakraCore</projectUrl>
-    <repository type="git" url="$repoUrl$" branch="$repoBranch$" commit="$repoCommit$" />
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <developmentDependency>true</developmentDependency>
-    <description>ChakraCore is the core part of the Chakra Javascript engine that powers Microsoft Edge.</description>
-    <releaseNotes>https://github.com/Microsoft/ChakraCore/wiki/Roadmap#release-notes</releaseNotes>
-    <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-    <language>en-US</language>
-    <tags>Chakra,ChakraCore,javascript,js,ecmascript,compiler,platform,oss,opensource,native,nativepackage,C++,vc140</tags>
-    <dependencies>
-      <group targetFramework="native" />
-    </dependencies>
-  </metadata>
-  <files>
-    <!--Build-->
-    <file src="Microsoft.ChakraCore.ARM64.targets" target="build\native\$id$.targets"/>
-
-     <!--Lib-->
-    <file src="$targetroot$\arm64_release\ChakraCore.dll" target="lib\native\v140\arm64\release\ChakraCore.dll" />
-    <file src="$targetroot$\arm64_release\ChakraCore.lib" target="lib\native\v140\arm64\release\ChakraCore.lib" />
-    <file src="$targetroot$\arm64_release\ChakraCore.pdb" target="lib\native\v140\arm64\release\ChakraCore.pdb" />
-    <file src="$targetroot$\arm64_release\ch.exe"         target="lib\native\v140\arm64\release\ch.exe" />
-    <file src="$targetroot$\arm64_release\ch.pdb"         target="lib\native\v140\arm64\release\ch.pdb" />
-
-    <!--Copying Release to Debug for now-->
-    <file src="$targetroot$\arm64_release\ChakraCore.dll" target="lib\native\v140\arm64\debug\ChakraCore.dll" />
-    <file src="$targetroot$\arm64_release\ChakraCore.lib" target="lib\native\v140\arm64\debug\ChakraCore.lib" />
-    <file src="$targetroot$\arm64_release\ChakraCore.pdb" target="lib\native\v140\arm64\debug\ChakraCore.pdb" />
-    <file src="$targetroot$\arm64_release\ch.exe"         target="lib\native\v140\arm64\debug\ch.exe" />
-    <file src="$targetroot$\arm64_release\ch.pdb"         target="lib\native\v140\arm64\debug\ch.pdb" />
-
-  </files>
-</package>

package/Scripts/Microsoft.ChakraCore.ARM64.targets

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)..\..\lib\native\v140\$(Platform)\$(Configuration)\ChakraCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <!-- <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile> -->
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\native\v140\$(Platform)\$(Configuration)\ChakraCore.dll" />
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\native\v140\$(Platform)\$(Configuration)\ChakraCore.pdb" />
-  </ItemGroup>
-</Project>

package/Shared/JSI/ChakraCoreRuntime.h

@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "ChakraRuntime.h"
-
-#include "ChakraCore.h"
-#include "ChakraCoreDebugger.h"
-
-namespace Microsoft::JSI {
-
-class ChakraCoreRuntime : public ChakraRuntime {
- public:
-  ChakraCoreRuntime(ChakraRuntimeArgs &&args) noexcept;
-
-  ~ChakraCoreRuntime() noexcept;
-
-#pragma region ChakraRuntime
-
-  void setupNativePromiseContinuation() noexcept override;
-
-  void startDebuggingIfNeeded() override;
-
-  void stopDebuggingIfNeeded() override;
-
-  std::unique_ptr<const facebook::jsi::Buffer> generatePreparedScript(
-      const std::string &sourceURL,
-      const facebook::jsi::Buffer &sourceBuffer) noexcept override;
-
-  facebook::jsi::Value evaluateJavaScriptSimple(const facebook::jsi::Buffer &buffer, const std::string &sourceURL)
-      override;
-
-  bool evaluateSerializedScript(
-      const facebook::jsi::Buffer &scriptBuffer,
-      const facebook::jsi::Buffer &serializedScriptBuffer,
-      const std::string &sourceURL,
-      JsValueRef *result) override;
-
-#pragma endregion
-
- private:
-  JsErrorCode enableDebugging(
-      JsRuntimeHandle runtime,
-      std::string const &runtimeName,
-      bool breakOnNextLine,
-      uint16_t port,
-      std::unique_ptr<DebugProtocolHandler> &debugProtocolHandler,
-      std::unique_ptr<DebugService> &debugService);
-
-  void ProcessDebuggerCommandQueue();
-
-  static void CALLBACK ProcessDebuggerCommandQueueCallback(void *callbackState);
-
-  std::unique_ptr<DebugProtocolHandler> m_debugProtocolHandler;
-  std::unique_ptr<DebugService> m_debugService;
-};
-
-} // namespace Microsoft::JSI