react-native-windows 0.67.0-preview.6 → 0.67.2

package/CHANGELOG.json

@@ -1,6 +1,204 @@
 {
   "name": "react-native-windows",
   "entries": [
+    {
+      "date": "Mon, 21 Feb 2022 16:17:54 GMT",
+      "tag": "react-native-windows_v0.67.2",
+      "version": "0.67.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "51ab377259fd27cfec658ea8e2c694f9d432e90a",
+            "comment": "Use temporary folder to store V8 JS bytecode"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/cli to v0.67.1",
+            "commit": "51ab377259fd27cfec658ea8e2c694f9d432e90a"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 07 Feb 2022 16:12:57 GMT",
+      "tag": "react-native-windows_v0.67.1",
+      "version": "0.67.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "anandrag@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Hermes inspector is not starting when Hermes engine is used (#9426)"
+          },
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Replace __APPLE__ with __clang__ where applicable (#9461)"
+          },
+          {
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "UI Manager module is not being destroyed on the UI thread"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 07 Feb 2022 16:12:39 GMT",
+      "tag": "react-native-windows_v0.67.1",
+      "version": "0.67.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "anandrag@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "81a6b931d7df9db4d5667c4961e22707d5238194",
+            "comment": "Hermes inspector is not starting when Hermes engine is used (#9426)"
+          },
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "8c8248af3d324b55adce0d4e41bfc2957a3f4446",
+            "comment": "Replace __APPLE__ with __clang__ where applicable (#9461)"
+          },
+          {
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "d57cded6b8bef14f8a0b2d24ab978eaf8f290354",
+            "comment": "UI Manager module is not being destroyed on the UI thread"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 24 Jan 2022 16:13:22 GMT",
+      "tag": "react-native-windows_v0.67.0",
+      "version": "0.67.0",
+      "comments": {
+        "patch": [
+          {
+            "author": "jthysell@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "[0.67] Remove ADO NuGet feed from config for new projects"
+          },
+          {
+            "author": "ngerlem@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Promote 0.67 to latest"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/cli to v0.67.0",
+            "commit": "f3ec055a5554558b61b538fcb405719a00249bef"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.67.0",
+            "commit": "f3ec055a5554558b61b538fcb405719a00249bef"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/codegen to v0.67.0",
+            "commit": "f3ec055a5554558b61b538fcb405719a00249bef"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 24 Jan 2022 16:12:32 GMT",
+      "tag": "react-native-windows_v0.67.0",
+      "version": "0.67.0",
+      "comments": {
+        "patch": [
+          {
+            "author": "jthysell@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "a1a4439e47c2a98356d7b9b1af765d3907567e16",
+            "comment": "[0.67] Remove ADO NuGet feed from config for new projects"
+          },
+          {
+            "author": "ngerlem@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "56818ebc599aa084aa9ffc949691f1be71da169a",
+            "comment": "Promote 0.67 to latest"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/cli to v0.67.0",
+            "commit": "56818ebc599aa084aa9ffc949691f1be71da169a"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.67.0",
+            "commit": "56818ebc599aa084aa9ffc949691f1be71da169a"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/codegen to v0.67.0",
+            "commit": "56818ebc599aa084aa9ffc949691f1be71da169a"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 17 Jan 2022 16:12:54 GMT",
+      "tag": "react-native-windows_v0.67.0-preview.7",
+      "version": "0.67.0-preview.7",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "saadnajmi2@gmail.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Fork HoverState.js to allow hover events on Pressable"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 17 Jan 2022 16:12:13 GMT",
+      "tag": "react-native-windows_v0.67.0-preview.7",
+      "version": "0.67.0-preview.7",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "saadnajmi2@gmail.com",
+            "package": "react-native-windows",
+            "commit": "b58a8738eecd8a3d6a2b918fc35d9a7b93b4437a",
+            "comment": "Fork HoverState.js to allow hover events on Pressable"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 03 Jan 2022 16:12:09 GMT",
+      "tag": "react-native-windows_v0.67.0-preview.6",
+      "version": "0.67.0-preview.6",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "julio.rocha@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "[0.67] Avoid capturing raw this pointer in WebSocket module"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 03 Jan 2022 16:11:53 GMT",
       "tag": "react-native-windows_v0.67.0-preview.6",

package/CHANGELOG.md

@@ -1,17 +1,94 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 03 Jan 2022 16:11:53 GMT and should not be manually modified.
+This log was last generated on Mon, 21 Feb 2022 16:17:54 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.67.0-preview.6
+## 0.67.2
 
-Mon, 03 Jan 2022 16:11:53 GMT
+Mon, 21 Feb 2022 16:17:54 GMT
 
-### Changes
+### Patches
 
-- [0.67] Avoid capturing raw this pointer in WebSocket module (julio.rocha@microsoft.com)
+- Use temporary folder to store V8 JS bytecode (30809111+acoates-ms@users.noreply.github.com)
+- Bump @react-native-windows/cli to v0.67.1
 
+## 0.67.1
+
+Mon, 07 Feb 2022 16:12:57 GMT
+
+### Patches
+
+- Hermes inspector is not starting when Hermes engine is used (#9426) (anandrag@microsoft.com)
+- Replace __APPLE__ with __clang__ where applicable (#9461) (julio.rocha@microsoft.com)
+- UI Manager module is not being destroyed on the UI thread (30809111+acoates-ms@users.noreply.github.com)
+
+## 0.67.1
+
+Mon, 07 Feb 2022 16:12:39 GMT
+
+### Patches
+
+- Hermes inspector is not starting when Hermes engine is used (#9426) (anandrag@microsoft.com)
+- Replace __APPLE__ with __clang__ where applicable (#9461) (julio.rocha@microsoft.com)
+- UI Manager module is not being destroyed on the UI thread (30809111+acoates-ms@users.noreply.github.com)
+
+## 0.67.0
+
+Mon, 24 Jan 2022 16:13:22 GMT
+
+### Patches
+
+- [0.67] Remove ADO NuGet feed from config for new projects (jthysell@microsoft.com)
+- Promote 0.67 to latest (ngerlem@microsoft.com)
+- Bump @react-native-windows/cli to v0.67.0
+- Bump @react-native-windows/virtualized-list to v0.67.0
+- Bump @react-native-windows/codegen to v0.67.0
+
+## 0.67.0
+
+Mon, 24 Jan 2022 16:12:32 GMT
+
+### Patches
+
+- [0.67] Remove ADO NuGet feed from config for new projects (jthysell@microsoft.com)
+- Promote 0.67 to latest (ngerlem@microsoft.com)
+- Bump @react-native-windows/cli to v0.67.0
+- Bump @react-native-windows/virtualized-list to v0.67.0
+- Bump @react-native-windows/codegen to v0.67.0
+
+## 0.67.0-preview.7
+
+Mon, 17 Jan 2022 16:12:54 GMT
+
+### Changes
+
+- Fork HoverState.js to allow hover events on Pressable (saadnajmi2@gmail.com)
+
+## 0.67.0-preview.7
+
+Mon, 17 Jan 2022 16:12:13 GMT
+
+### Changes
+
+- Fork HoverState.js to allow hover events on Pressable (saadnajmi2@gmail.com)
+
+## 0.67.0-preview.6
+
+Mon, 03 Jan 2022 16:12:09 GMT
+
+### Changes
+
+- [0.67] Avoid capturing raw this pointer in WebSocket module (julio.rocha@microsoft.com)
+
+## 0.67.0-preview.6
+
+Mon, 03 Jan 2022 16:11:53 GMT
+
+### Changes
+
+- [0.67] Avoid capturing raw this pointer in WebSocket module (julio.rocha@microsoft.com)
+
 ## 0.67.0-preview.5
 
 Mon, 06 Dec 2021 16:10:50 GMT

package/Libraries/Components/Keyboard/Keyboard.js

@@ -141,9 +141,9 @@ class Keyboard {
   }
 
   /**
-   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
+   * @deprecated Use `remove` on the EventSubscription from `addListener`.
    */
-  removeEventListener<K: $Keys<KeyboardEventDefinitions>>(
+  removeListener<K: $Keys<KeyboardEventDefinitions>>(
     eventType: K,
     listener: (...$ElementType<KeyboardEventDefinitions, K>) => mixed,
   ): void {

package/Libraries/Components/Pressable/Pressable.windows.js

@@ -25,6 +25,7 @@ import usePressability from '../../Pressability/usePressability';
 import {normalizeRect, type RectOrSize} from '../../StyleSheet/Rect';
 import type {
   LayoutEvent,
+  MouseEvent,
   PressEvent,
   // [Windows
   BlurEvent,
@@ -72,6 +73,16 @@ type Props = $ReadOnly<{|
    */
   children: React.Node | ((state: StateCallbackType) => React.Node),
 
+  /**
+   * Duration to wait after hover in before calling `onHoverIn`.
+   */
+  delayHoverIn?: ?number,
+
+  /**
+   * Duration to wait after hover out before calling `onHoverOut`.
+   */
+  delayHoverOut?: ?number,
+
   /**
    * Duration (in milliseconds) from `onPressIn` before `onLongPress` is called.
    */
@@ -98,6 +109,16 @@ type Props = $ReadOnly<{|
    */
   onLayout?: ?(event: LayoutEvent) => mixed,
 
+  /**
+   * Called when the hover is activated to provide visual feedback.
+   */
+  onHoverIn?: ?(event: MouseEvent) => mixed,
+
+  /**
+   * Called when the hover is deactivated to undo visual feedback.
+   */
+  onHoverOut?: ?(event: MouseEvent) => mixed,
+
   /**
    * Called when a long-tap gesture is detected.
    */
@@ -201,9 +222,13 @@ function Pressable(props: Props, forwardedRef): React.Node {
     android_ripple,
     cancelable,
     children,
+    delayHoverIn,
+    delayHoverOut,
     delayLongPress,
     disabled,
     focusable,
+    onHoverIn,
+    onHoverOut,
     onLongPress,
     onPress,
     onPressIn,
@@ -267,8 +292,12 @@ function Pressable(props: Props, forwardedRef): React.Node {
       hitSlop,
       pressRectOffset: pressRetentionOffset,
       android_disableSound,
+      delayHoverIn,
+      delayHoverOut,
       delayLongPress,
       delayPressIn: unstable_pressDelay,
+      onHoverIn,
+      onHoverOut,
       onLongPress,
       onPress,
       onPressIn(event: PressEvent): void {
@@ -301,9 +330,13 @@ function Pressable(props: Props, forwardedRef): React.Node {
       android_disableSound,
       android_rippleConfig,
       cancelable,
+      delayHoverIn,
+      delayHoverOut,
       delayLongPress,
       disabled,
       hitSlop,
+      onHoverIn,
+      onHoverOut,
       onLongPress,
       onPress,
       onPressIn,

package/Libraries/Core/ReactNativeVersion.js

@@ -1,5 +1,5 @@
 /**
- * @generated by scripts/bump-oss-version.js
+ * @generated by scripts/set-rn-version.js
  *
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 67,
-  patch: 0,
-  prerelease: 'rc.1',
+  patch: 1,
+  prerelease: null,
 };

package/Libraries/Pressability/HoverState.js

@@ -49,6 +49,10 @@ if (Platform.OS === 'web') {
     document.addEventListener('touchmove', disableHover, true);
     document.addEventListener('mousemove', enableHover, true);
   }
+  // [Windows
+} else if (Platform.OS === 'windows') {
+  isEnabled = true;
+  // Windows]
 }
 
 export function isHoverEnabled(): boolean {

package/Microsoft.ReactNative/JsiApi.cpp

@@ -395,7 +395,7 @@ facebook::jsi::JSError const &jsError) {                             \
 }
 
 /*static*/ ReactNative::JsiRuntime JsiRuntime::GetOrCreate(
-    std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
+    std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
     std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept {
   {
     std::scoped_lock lock{s_mutex};
@@ -409,7 +409,7 @@ facebook::jsi::JSError const &jsError) {                             \
 }
 
 /*static*/ ReactNative::JsiRuntime JsiRuntime::Create(
-    std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
+    std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
     std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept {
   // There are some functions that we cannot do using JSI such as
   // defining a property or using Symbol as a key.
@@ -445,7 +445,7 @@ ReactNative::JsiRuntime JsiRuntime::MakeChakraRuntime() {
 }
 
 JsiRuntime::JsiRuntime(
-    std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> &&runtimeHolder,
+    std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> &&runtimeHolder,
     std::shared_ptr<facebook::jsi::Runtime> &&runtime) noexcept
     : m_runtimeHolder{std::move(runtimeHolder)},
       m_runtime{std::move(runtime)},

package/Microsoft.ReactNative/JsiApi.h

@@ -58,16 +58,16 @@ struct RuntimeAccessor;
 
 struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
   JsiRuntime(
-      std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> &&runtimeHolder,
+      std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> &&runtimeHolder,
       std::shared_ptr<facebook::jsi::Runtime> &&runtime) noexcept;
   ~JsiRuntime() noexcept;
 
   static ReactNative::JsiRuntime FromRuntime(facebook::jsi::Runtime &runtime) noexcept;
   static ReactNative::JsiRuntime GetOrCreate(
-      std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
+      std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
       std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept;
   static ReactNative::JsiRuntime Create(
-      std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
+      std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> const &jsiRuntimeHolder,
       std::shared_ptr<facebook::jsi::Runtime> const &jsiRuntime) noexcept;
 
  public: // JsiRuntime
@@ -168,7 +168,7 @@ struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
   void SetError(facebook::jsi::JSINativeException const &nativeException) noexcept;
 
  private:
-  std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> m_runtimeHolder;
+  std::shared_ptr<::Microsoft::JSI::RuntimeHolderLazyInit> m_runtimeHolder;
   std::shared_ptr<facebook::jsi::Runtime> m_runtime;
   RuntimeAccessor *m_runtimeAccessor{};
   std::mutex m_mutex;

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp

@@ -530,7 +530,7 @@ UIManager::UIManager() : m_module(std::make_shared<UIManagerModule>()) {}
 UIManager::~UIManager() {
   // To make sure that we destroy UI components in UI thread.
   if (!m_context.UIDispatcher().HasThreadAccess()) {
-    m_context.UIDispatcher().Post([module = std::move(m_module)]() {});
+    m_context.UIDispatcher().Post([module = std::move(m_module)]() mutable { module = nullptr; });
   }
 }
 

package/Microsoft.ReactNative/ReactHost/ReactContext.h

@@ -5,9 +5,9 @@
 
 #include "React.h"
 
-namespace facebook::jsi {
+namespace Microsoft::JSI {
 struct RuntimeHolderLazyInit;
-} // namespace facebook::jsi
+} // namespace Microsoft::JSI
 
 namespace Mso::React {
 

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -8,6 +8,7 @@
 #include <Base/CoreNativeModules.h>
 #include <Threading/MessageDispatchQueue.h>
 #include <Threading/MessageQueueThreadFactory.h>
+#include <appModel.h>
 #include <comUtil/qiCast.h>
 
 #ifndef CORE_ABI
@@ -446,10 +447,19 @@ void ReactInstanceWin::Initialize() noexcept {
               break;
             case JSIEngine::V8:
 #if defined(USE_V8)
-#ifndef CORE_ABI
-              preparedScriptStore =
-                  std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationLocalFolder());
-#endif // CORE_ABI
+            {
+              uint32_t length{0};
+              if (GetCurrentPackageFullName(&length, nullptr) != APPMODEL_ERROR_NO_PACKAGE) {
+                preparedScriptStore =
+                    std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
+              } else {
+                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));
+                }
+              }
+            }
               devSettings->jsiRuntimeHolder = std::make_shared<facebook::react::V8JSIRuntimeHolder>(
                   devSettings, m_jsMessageThread.Load(), std::move(scriptStore), std::move(preparedScriptStore));
               break;
@@ -899,7 +909,7 @@ void ReactInstanceWin::DispatchEvent(int64_t viewTag, std::string &&eventName, f
 }
 
 winrt::Microsoft::ReactNative::JsiRuntime ReactInstanceWin::JsiRuntime() noexcept {
-  std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> jsiRuntimeHolder;
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
   {
     std::scoped_lock lock{m_mutex};
     if (m_jsiRuntime) {
@@ -1005,8 +1015,8 @@ Mso::CntPtr<IReactInstanceInternal> MakeReactInstance(
 }
 
 #if defined(USE_V8)
-std::string ReactInstanceWin::getApplicationLocalFolder() {
-  auto local = winrt::Windows::Storage::ApplicationData::Current().LocalFolder().Path();
+std::string ReactInstanceWin::getApplicationTempFolder() {
+  auto local = winrt::Windows::Storage::ApplicationData::Current().TemporaryFolder().Path();
 
   return Microsoft::Common::Unicode::Utf16ToUtf8(local.c_str(), local.size()) + "\\";
 }

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -131,7 +131,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   };
 
 #if defined(USE_V8)
-  static std::string getApplicationLocalFolder();
+  static std::string getApplicationTempFolder();
 #endif
 
  private: // immutable fields
@@ -184,7 +184,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   Mso::CntPtr<Mso::React::IDispatchQueue2> m_uiQueue;
   std::deque<JSCallEntry> m_jsCallQueue;
 
-  std::shared_ptr<facebook::jsi::RuntimeHolderLazyInit> m_jsiRuntimeHolder;
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> m_jsiRuntimeHolder;
   winrt::Microsoft::ReactNative::JsiRuntime m_jsiRuntime{nullptr};
 };
 

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -301,7 +301,7 @@ constexpr void ValidateCoroutineArg() noexcept {
     static_assert(
         !std::is_reference_v<TArg> && !std::is_pointer_v<TArg>,
         "Coroutine parameter must be passed by value for safe access"
-#ifndef __APPLE__
+#ifndef __clang__
         ": " __FUNCSIG__
 #endif
     );

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.67.0-preview.6</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.67.2</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>67</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>2</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/Shared/ChakraRuntimeHolder.cpp

@@ -9,6 +9,10 @@
 
 namespace Microsoft::JSI {
 
+facebook::react::JSIEngineOverride ChakraRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::Chakra;
+}
+
 std::shared_ptr<facebook::jsi::Runtime> ChakraRuntimeHolder::getRuntime() noexcept {
   std::call_once(once_flag_, [this]() { initRuntime(); });
 

package/Shared/ChakraRuntimeHolder.h

@@ -12,9 +12,10 @@
 
 namespace Microsoft::JSI {
 
-class ChakraRuntimeHolder final : public facebook::jsi::RuntimeHolderLazyInit {
+class ChakraRuntimeHolder final : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   ChakraRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/Shared/DevSettings.h

@@ -14,11 +14,9 @@
 #define STRING_(s) #s
 #define STRING(s) STRING_(s)
 
-namespace facebook {
-namespace jsi {
+namespace Microsoft::JSI {
 struct RuntimeHolderLazyInit;
-}
-} // namespace facebook
+} // namespace Microsoft::JSI
 
 namespace facebook {
 namespace react {
@@ -81,7 +79,7 @@ struct DevSettings {
   /// instance. This object should in general be used only from the JS engine
   /// thread, unless the specific runtime implementation explicitly guarantees
   /// reentrancy.
-  std::shared_ptr<jsi::RuntimeHolderLazyInit> jsiRuntimeHolder;
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> jsiRuntimeHolder;
 
   // Until the ABI story is addressed we'll use this instead of the above for
   // the purposes of selecting a JSI Runtime to use.

package/Shared/HermesRuntimeHolder.cpp

@@ -72,6 +72,10 @@ class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::R
 
 } // namespace
 
+facebook::react::JSIEngineOverride HermesRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::Hermes;
+}
+
 std::shared_ptr<jsi::Runtime> HermesRuntimeHolder::getRuntime() noexcept {
   std::call_once(m_once_flag, [this]() { initRuntime(); });
 

package/Shared/HermesRuntimeHolder.h

@@ -12,9 +12,10 @@
 namespace facebook {
 namespace react {
 
-class HermesRuntimeHolder : public facebook::jsi::RuntimeHolderLazyInit {
+class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   HermesRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/Shared/JSI/NapiJsiV8RuntimeHolder.cpp

@@ -96,7 +96,11 @@ void NapiJsiV8RuntimeHolder::InitRuntime() noexcept {
   m_ownThreadId = std::this_thread::get_id();
 }
 
-#pragma region facebook::jsi::RuntimeHolderLazyInit
+#pragma region Microsoft::JSI::RuntimeHolderLazyInit
+
+facebook::react::JSIEngineOverride NapiJsiV8RuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::V8NodeApi;
+}
 
 shared_ptr<Runtime> NapiJsiV8RuntimeHolder::getRuntime() noexcept /*override*/
 {
@@ -112,6 +116,6 @@ shared_ptr<Runtime> NapiJsiV8RuntimeHolder::getRuntime() noexcept /*override*/
   return m_runtime;
 }
 
-#pragma endregion facebook::jsi::RuntimeHolderLazyInit
+#pragma endregion Microsoft::JSI::RuntimeHolderLazyInit
 
 } // namespace Microsoft::JSI

package/Shared/JSI/NapiJsiV8RuntimeHolder.h

@@ -10,9 +10,10 @@
 
 namespace Microsoft::JSI {
 
-class NapiJsiV8RuntimeHolder : public facebook::jsi::RuntimeHolderLazyInit {
+class NapiJsiV8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   NapiJsiV8RuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/Shared/JSI/RuntimeHolder.h

@@ -3,8 +3,9 @@
 #include <jsi/jsi.h>
 #include <memory>
 
-namespace facebook {
-namespace jsi {
+#include <DevSettings.h>
+
+namespace Microsoft::JSI {
 
 // An instance of this interface is expected to
 // a. lazily create a JSI Runtime on the first call to getRuntime
@@ -15,7 +16,7 @@ namespace jsi {
 
 struct RuntimeHolderLazyInit {
   virtual std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept = 0;
+  virtual facebook::react::JSIEngineOverride getRuntimeType() noexcept = 0;
 };
 
-} // namespace jsi
-} // namespace facebook
+} // namespace Microsoft::JSI

package/Shared/OInstance.cpp

@@ -193,7 +193,7 @@ class OJSIExecutorFactory : public JSExecutorFactory {
   }
 
   OJSIExecutorFactory(
-      std::shared_ptr<jsi::RuntimeHolderLazyInit> runtimeHolder,
+      std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> runtimeHolder,
       NativeLoggingHook loggingHook,
       std::shared_ptr<TurboModuleRegistry> turboModuleRegistry,
       bool isProfilingEnabled,
@@ -205,7 +205,7 @@ class OJSIExecutorFactory : public JSExecutorFactory {
         isProfilingEnabled_{isProfilingEnabled} {}
 
  private:
-  std::shared_ptr<jsi::RuntimeHolderLazyInit> runtimeHolder_;
+  std::shared_ptr<Microsoft::JSI::RuntimeHolderLazyInit> runtimeHolder_;
   std::shared_ptr<TurboModuleRegistry> turboModuleRegistry_;
   std::shared_ptr<CallInvoker> jsCallInvoker_;
   NativeLoggingHook loggingHook_;
@@ -278,6 +278,20 @@ void InstanceImpl::SetInError() noexcept {
   m_isInError = true;
 }
 
+namespace {
+bool shouldStartHermesInspector(DevSettings &devSettings) {
+  bool isHermes =
+      ((devSettings.jsiEngineOverride == JSIEngineOverride::Hermes) ||
+       (devSettings.jsiEngineOverride == JSIEngineOverride::Default && devSettings.jsiRuntimeHolder &&
+        devSettings.jsiRuntimeHolder->getRuntimeType() == facebook::react::JSIEngineOverride::Hermes));
+
+  if (isHermes && devSettings.useDirectDebugger && !devSettings.useWebDebugger)
+    return true;
+  else
+    return false;
+}
+} // namespace
+
 InstanceImpl::InstanceImpl(
     std::shared_ptr<Instance> &&instance,
     std::string &&jsBundleBasePath,
@@ -305,8 +319,7 @@ InstanceImpl::InstanceImpl(
   facebook::react::tracing::initializeETW();
 #endif
 
-  if (m_devSettings->jsiEngineOverride == JSIEngineOverride::Hermes && m_devSettings->useDirectDebugger &&
-      !m_devSettings->useWebDebugger) {
+  if (shouldStartHermesInspector(*m_devSettings)) {
     m_devManager->StartInspector(m_devSettings->sourceBundleHost, m_devSettings->sourceBundlePort);
   }
 

package/Shared/V8JSIRuntimeHolder.cpp

@@ -31,6 +31,10 @@ class TaskRunnerAdapter : public v8runtime::JSITaskRunner {
   std::shared_ptr<facebook::react::MessageQueueThread> jsQueue_;
 };
 
+facebook::react::JSIEngineOverride V8JSIRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::V8;
+}
+
 std::shared_ptr<facebook::jsi::Runtime> V8JSIRuntimeHolder::getRuntime() noexcept {
   std::call_once(once_flag_, [this]() { initRuntime(); });
 

package/Shared/V8JSIRuntimeHolder.h

@@ -13,9 +13,10 @@
 namespace facebook {
 namespace react {
 
-class V8JSIRuntimeHolder : public facebook::jsi::RuntimeHolderLazyInit {
+class V8JSIRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
  public:
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
 
   V8JSIRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,

package/jest/preprocessor.js

@@ -13,42 +13,10 @@
 'use strict';
 
 const babelRegisterOnly = require('metro-babel-register');
-const nullthrows = require('nullthrows');
 const createCacheKeyFunction = require('@jest/create-cache-key-function')
   .default;
-const t = require('@babel/types');
-const {statements} = require('@babel/template').default;
 
-const importDefault = '__importDefault__';
-const importAll = '__importAll__';
-
-// prelude
-const importPrelude = statements(`
-  function ${importDefault}(moduleId) {
-    const exports = require(moduleId);
-
-    if (exports && exports.__esModule) {
-      return exports.default;
-    }
-
-    return exports;
-  };
-
-  function ${importAll}(moduleId) {
-    const exports = require(moduleId);
-
-    if (exports && exports.__esModule) {
-      return exports;
-    }
-
-    return Object.assign({}, exports, {default: exports});
-  };
-`);
-
-const {
-  transformSync: babelTransformSync,
-  transformFromAstSync: babelTransformFromAstSync,
-} = require('@babel/core');
+const {transformSync: babelTransformSync} = require('@babel/core');
 const generate = require('@babel/generator').default;
 
 const nodeFiles = new RegExp(
@@ -73,13 +41,13 @@ module.exports = {
       }).code;
     }
 
-    let {ast} = transformer.transform({
+    const {ast} = transformer.transform({
       filename: file,
       options: {
         ast: true, // needed for open source (?) https://github.com/facebook/react-native/commit/f8d6b97140cffe8d18b2558f94570c8d1b410d5c#r28647044
         dev: true,
         enableBabelRuntime: false,
-        experimentalImportSupport: true,
+        experimentalImportSupport: false,
         globalPrefix: '',
         hot: false,
         inlineRequires: true,
@@ -111,6 +79,10 @@ module.exports = {
         [require('@babel/plugin-transform-regenerator')],
         [require('@babel/plugin-transform-sticky-regex')],
         [require('@babel/plugin-transform-unicode-regex')],
+        [
+          require('@babel/plugin-transform-modules-commonjs'),
+          {strict: false, allowTopLevelThis: true},
+        ],
         [require('@babel/plugin-transform-classes')],
         [require('@babel/plugin-transform-arrow-functions')],
         [require('@babel/plugin-transform-spread')],
@@ -127,46 +99,6 @@ module.exports = {
       ],
     });
 
-    // We're not using @babel/plugin-transform-modules-commonjs so
-    // we need to add 'use strict' manually
-    const directives = ast.program.directives;
-
-    if (
-      ast.program.sourceType === 'module' &&
-      (directives == null ||
-        directives.findIndex(d => d.value.value === 'use strict') === -1)
-    ) {
-      ast.program.directives = [
-        ...(directives || []),
-        t.directive(t.directiveLiteral('use strict')),
-      ];
-    }
-
-    // Postprocess the transformed module to handle ESM and inline requires.
-    // We need to do this in a separate pass to avoid issues tracking references.
-    const babelTransformResult = babelTransformFromAstSync(ast, src, {
-      ast: true,
-      retainLines: true,
-      plugins: [
-        [
-          require('metro-transform-plugins').importExportPlugin,
-          {importDefault, importAll},
-        ],
-        [
-          require('babel-preset-fbjs/plugins/inline-requires.js'),
-          {inlineableCalls: [importDefault, importAll]},
-        ],
-      ],
-      sourceType: 'module',
-    });
-
-    ast = nullthrows(babelTransformResult.ast);
-
-    // Inject import helpers *after* running the inline-requires transform,
-    // because otherwise it will assume they are user code and bail out of
-    // inlining calls to them.
-    ast.program.body.unshift(...importPrelude());
-
     return generate(
       ast,
       // $FlowFixMe[prop-missing] Error found when improving flow typing for libs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.67.0-preview.6",
+  "version": "0.67.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "@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.67.0-preview.2",
-    "@react-native-windows/virtualized-list": "0.67.0-preview.1",
+    "@react-native-windows/cli": "0.67.1",
+    "@react-native-windows/virtualized-list": "0.67.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -57,7 +57,7 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.67.0-preview.1",
+    "@react-native-windows/codegen": "0.67.0",
     "@rnw-scripts/eslint-config": "1.1.8",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.2",
     "@rnx-kit/jest-preset": "^0.1.0",
@@ -72,7 +72,7 @@
     "metro-config": "^0.66.0",
     "prettier": "1.19.1",
     "react": "17.0.2",
-    "react-native": "0.67.0-rc.1",
+    "react-native": "0.67.1",
     "react-native-platform-override": "^1.5.1",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
@@ -80,15 +80,15 @@
   },
   "peerDependencies": {
     "react": "17.0.2",
-    "react-native": "0.67.0-rc.1"
+    "react-native": "^0.67.0"
   },
   "beachball": {
-    "defaultNpmTag": "preview",
+    "defaultNpmTag": "latest",
     "gitTags": true,
     "disallowedChangeTypes": [
       "major",
       "minor",
-      "patch"
+      "prerelease"
     ]
   },
   "files": [

package/template/shared-app/proj/NuGet.Config

@@ -8,7 +8,9 @@
     {{#nuGetTestFeed}}
     <add key="NuGetTestFeed" value="{{ nuGetTestFeed }}" />
     {{/nuGetTestFeed}}
+    {{#nuGetADOFeed}}
     <add key="react-native" value="https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json" />
+    {{/nuGetADOFeed}}
     <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>