react-native-windows 0.72.0-preview.6 → 0.72.0-preview.8

package/Directory.Build.props

@@ -21,6 +21,30 @@
     <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
     <FmtVersion>8.0.0</FmtVersion>
     <FmtCommitHash>9e8b86fd2d9806672cc73133d21780dd182bfd24</FmtCommitHash>
+    <!-- Commit hash for https://github.com/microsoft/node-api-jsi code. -->
+    <NodeApiJsiCommitHash>53b897b03c1c7e57c3372acc6234447a44e150d6</NodeApiJsiCommitHash>
+  </PropertyGroup>
+
+  <!--
+    IMPORTANT: Traversals left in a directory will break some tools like midl, but we also cannot call
+    [MSBuild]::NormalizeDirectory on relative paths since cwd is not always correct. This logic should prefer to operate
+    on full paths and avoid extra normalization.
+  -->
+  <PropertyGroup>
+    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)</ReactNativeWindowsDir>
+
+    <ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativeDir>
+
+    <YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)ReactCommon\yoga</YogaDir>
+
+    <FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
+    <FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>
+
+    <FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
+    <FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
+
+    <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)</NodeApiJsiDir>
+    <NodeApiJsiDir>$([MSBuild]::NormalizeDirectory($(NodeApiJsiDir)))</NodeApiJsiDir>
   </PropertyGroup>
 
   <PropertyGroup Label="Configuration">
@@ -46,28 +70,10 @@
     <OutputPath Condition="'$(MSBuildProjectExtension)' == '.csproj'">$(OutDir)</OutputPath>
   </PropertyGroup>
 
-  <!--
-    IMPORTANT: Traversals left in a directory will break some tools like midl, but we also cannot call
-    [MSBuild]::NormalizeDirectory on relative paths since cwd is not always correct. This logic should prefer to operate
-    on full paths and avoid extra normalization.
-  -->
-  <PropertyGroup>
-    <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)</ReactNativeWindowsDir>
-
-    <ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativeDir>
-
-    <YogaDir Condition="'$(YogaDir)' == ''">$(ReactNativeDir)ReactCommon\yoga</YogaDir>
-
-    <FollyDir Condition="'$(FollyDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.folly\folly-$(FollyVersion)</FollyDir>
-    <FollyDir>$([MSBuild]::NormalizeDirectory($(FollyDir)))</FollyDir>
-
-    <FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
-    <FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
-  </PropertyGroup>
-
   <PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
-    <!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
-    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
+    <!-- See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target -->
+    <!-- RestoreUseStaticGraphEvaluation broke in VS 17.6, see https://github.com/microsoft/react-native-windows/issues/11670 -->
+    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.6')) AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
 </Project>

package/Microsoft.ReactNative/IReactContext.cpp

@@ -65,6 +65,10 @@ hstring ReactSettingsSnapshot::BundleAppId() const noexcept {
   return winrt::to_hstring(m_settings->BundleAppId());
 }
 
+bool ReactSettingsSnapshot::RequestDevBundle() const noexcept {
+  return m_settings->RequestDevBundle();
+}
+
 Mso::React::IReactSettingsSnapshot const &ReactSettingsSnapshot::GetInner() const noexcept {
   return *m_settings;
 }

package/Microsoft.ReactNative/IReactContext.h

@@ -24,6 +24,7 @@ struct ReactSettingsSnapshot : winrt::implements<ReactSettingsSnapshot, IReactSe
   bool RequestInlineSourceMap() const noexcept;
   hstring JavaScriptBundleFile() const noexcept;
   hstring BundleAppId() const noexcept;
+  bool RequestDevBundle() const noexcept;
 
  public:
   // Internal accessor for within the Microsoft.ReactNative dll to allow calling into internal methods

package/Microsoft.ReactNative/IReactContext.idl

@@ -125,6 +125,12 @@ namespace Microsoft.ReactNative
       "at the time when the React instance was created.\n"
       "The name of the app passed to the packager server via the 'app' query parameter.")
     String BundleAppId { get; };
+
+    DOC_STRING(
+      "A read-only snapshot of the @ReactInstanceSettings.RequestDevBundle property value "
+      "at the time when the React instance was created.\n"
+      "When querying the bundle server for a bundle, should it request the dev bundle or release bundle.")
+    Boolean RequestDevBundle { get; };
   }
 
   [webhosthidden]

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -18,6 +18,7 @@
     <CppWinRTNamespaceMergeDepth>
     </CppWinRTNamespaceMergeDepth>
     <CppWinRTLibs>true</CppWinRTLibs>
+    <BuildMSRNCxxModule>false</BuildMSRNCxxModule>
     <BuildMSRNCxxReactCommon>false</BuildMSRNCxxReactCommon>
     <DesktopCompatible Condition="'$(UseWinUI3)'=='true'">true</DesktopCompatible>
   </PropertyGroup>
@@ -220,9 +221,6 @@
       <DependentUpon>IReactNotificationService.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="JsiApi.h">
-      <DependentUpon>JsiApi.idl</DependentUpon>
-    </ClInclude>
     <ClInclude Include="JsiReader.h">
       <DependentUpon>IJSValueReader.idl</DependentUpon>
     </ClInclude>
@@ -639,7 +637,7 @@
   <ItemGroup>
     <PackageReference Include="boost" Version="1.76.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
-    <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
+    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
     <PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters

@@ -7,44 +7,12 @@
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="ABICxxModule.cpp" />
     <ClCompile Include="ABIViewManager.cpp" />
-    <ClCompile Include="IReactDispatcher.cpp" />
-    <ClCompile Include="IReactNotificationService.cpp" />
-    <ClCompile Include="NativeModulesProvider.cpp" />
-    <ClCompile Include="TurboModulesProvider.cpp" />
     <ClCompile Include="XamlLoadState.cpp" />
     <ClCompile Include="XamlView.cpp" />
     <ClCompile Include="Pch\pch.cpp">
       <Filter>Pch</Filter>
     </ClCompile>
-    <ClCompile Include="ReactHost\AsyncActionQueue.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\JSBundle.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\JSBundle_Win32.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\MsoUtils.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\MsoReactContext.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\ReactErrorProvider.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\ReactHost.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\ReactInstanceWin.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
-    <ClCompile Include="ReactHost\CrashManager.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
     <ClCompile Include="ReactSupport.cpp" />
-    <ClCompile Include="RedBox.cpp" />
     <ClCompile Include="TestHook.cpp" />
     <ClCompile Include="ViewManagersProvider.cpp" />
     <ClCompile Include="Base\CoreNativeModules.cpp">
@@ -143,9 +111,6 @@
     <ClCompile Include="Modules\DeviceInfoModule.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
-    <ClCompile Include="Modules\DevSettingsModule.cpp">
-      <Filter>Modules</Filter>
-    </ClCompile>
     <ClCompile Include="Modules\I18nManagerModule.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
@@ -287,9 +252,6 @@
     <ClCompile Include="Utils\XamlIslandUtils.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="JsiApi.cpp" />
-    <ClCompile Include="RedBoxErrorInfo.cpp" />
-    <ClCompile Include="RedBoxErrorFrameInfo.cpp" />
     <ClCompile Include="Modules\CreateModules.cpp">
       <Filter>Modules</Filter>
     </ClCompile>
@@ -302,9 +264,6 @@
     <ClCompile Include="Utils\BatchingEventEmitter.cpp">
       <Filter>Utils</Filter>
     </ClCompile>
-    <ClCompile Include="ReactHost\JSCallInvokerScheduler.cpp">
-      <Filter>ReactHost</Filter>
-    </ClCompile>
     <ClCompile Include="Views\Text\TextHighlighterVisitor.cpp">
       <Filter>Views\Text</Filter>
     </ClCompile>
@@ -333,6 +292,7 @@
     <ClCompile Include="Views\FrameworkElementTransferProperties.cpp" />
     <ClCompile Include="Views\ReactViewInstance.cpp" />
     <ClCompile Include="CoreApp.cpp" />
+    <ClCompile Include="Utils\KeyboardUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ABICxxModule.h" />
@@ -735,25 +695,12 @@
     <ClInclude Include="ReactPointerEventArgs.h" />
     <ClInclude Include="Views\FrameworkElementTransferProperties.h" />
     <ClInclude Include="Views\ReactViewInstance.h" />
+    <ClInclude Include="Utils\KeyboardUtils.h" />
   </ItemGroup>
   <ItemGroup>
-    <Midl Include="IJSValueReader.idl" />
-    <Midl Include="IJSValueWriter.idl" />
-    <Midl Include="IReactContext.idl" />
-    <Midl Include="IReactDispatcher.idl" />
-    <Midl Include="IReactModuleBuilder.idl" />
-    <Midl Include="IReactNonAbiValue.idl" />
-    <Midl Include="IReactNotificationService.idl" />
-    <Midl Include="IReactPackageBuilder.idl" />
-    <Midl Include="IReactPackageProvider.idl" />
-    <Midl Include="IReactPropertyBag.idl" />
     <Midl Include="IViewManager.idl" />
     <Midl Include="ReactApplication.idl" />
-    <Midl Include="ReactInstanceSettings.idl" />
-    <Midl Include="ReactNativeHost.idl" />
     <Midl Include="ReactRootView.idl" />
-    <Midl Include="RedBoxHandler.idl" />
-    <Midl Include="QuirkSettings.idl" />
     <Midl Include="XamlHelper.idl" />
     <Midl Include="LayoutService.idl" />
     <Midl Include="XamlUIService.idl" />
@@ -770,11 +717,9 @@
       <Filter>Views\cppwinrt</Filter>
     </Midl>
     <Midl Include="IViewManagerCore.idl" />
-    <Midl Include="JsiApi.idl" />
     <Midl Include="DocString.idl" />
     <Midl Include="DesktopWindowMessage.idl" />
     <Midl Include="ReactPointerEventArgs.idl" />
-    <Midl Include="ReactCoreInjection.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="microsoft.reactnative.def" />

package/Microsoft.ReactNative/ReactHost/MsoReactContext.cpp

@@ -100,6 +100,13 @@ std::string ReactSettingsSnapshot::BundleAppId() const noexcept {
   return {};
 }
 
+bool ReactSettingsSnapshot::RequestDevBundle() const noexcept {
+  if (auto instance = m_reactInstance.GetStrongPtr()) {
+    return instance->RequestDevBundle();
+  }
+  return {};
+}
+
 JSIEngine ReactSettingsSnapshot::JsiEngine() const noexcept {
   if (auto instance = m_reactInstance.GetStrongPtr()) {
     return instance->JsiEngine();

package/Microsoft.ReactNative/ReactHost/MsoReactContext.h

@@ -30,6 +30,7 @@ class ReactSettingsSnapshot final : public Mso::UnknownObject<IReactSettingsSnap
   bool RequestInlineSourceMap() const noexcept override;
   std::string JavaScriptBundleFile() const noexcept override;
   std::string BundleAppId() const noexcept override;
+  bool RequestDevBundle() const noexcept override;
   bool UseDeveloperSupport() const noexcept override;
   JSIEngine JsiEngine() const noexcept override;
 

package/Microsoft.ReactNative/ReactHost/React.h

@@ -105,6 +105,7 @@ struct IReactSettingsSnapshot : IUnknown {
   virtual bool RequestInlineSourceMap() const noexcept = 0;
   virtual std::string JavaScriptBundleFile() const noexcept = 0;
   virtual std::string BundleAppId() const noexcept = 0;
+  virtual bool RequestDevBundle() const noexcept = 0;
   virtual bool UseDeveloperSupport() const noexcept = 0;
   virtual JSIEngine JsiEngine() const noexcept = 0;
 };
@@ -152,6 +153,7 @@ struct ReactDevOptions {
   std::string SourceBundleName; // Bundle name without any extension (e.g. "index.win32"). Default: "index.{PLATFORM}"
   std::string SourceBundleExtension; // Bundle name extension. Default: ".bundle".
   std::string BundleAppId; // Bundle app id. Default: "".
+  bool DevBundle{true}; // When requesting bundle from bundle server, query for dev bundle or release bundle
 
   //! Module name used for loading the debug bundle.
   //! e.g. The modules name registered in the jsbundle via AppRegistry.registerComponent('ModuleName', () =>

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -73,12 +73,12 @@
 #include <Utils/UwpScriptStore.h>
 #endif
 
+#include "BaseScriptStoreImpl.h"
 #include "HermesRuntimeHolder.h"
 
 #if defined(USE_V8)
 #include <winrt/Windows.Storage.h>
-#include "BaseScriptStoreImpl.h"
-#include "V8JSIRuntimeHolder.h"
+#include "JSI/V8RuntimeHolder.h"
 #endif // USE_V8
 
 #include "RedBox.h"
@@ -255,7 +255,7 @@ ReactInstanceWin::ReactInstanceWin(
                                                                onDestroyed = m_options.OnInstanceDestroyed,
                                                                reactContext = m_reactContext]() noexcept {
         whenLoaded.TryCancel(); // It only has an effect if whenLoaded was not set before
-        facebook::react::HermesRuntimeHolder::storeTo(ReactPropertyBag(reactContext->Properties()), nullptr);
+        Microsoft::ReactNative::HermesRuntimeHolder::storeTo(ReactPropertyBag(reactContext->Properties()), nullptr);
         if (onDestroyed) {
           onDestroyed.Get()->Invoke(reactContext);
         }
@@ -451,6 +451,7 @@ void ReactInstanceWin::Initialize() noexcept {
           devSettings->debuggerAttachCallback = GetDebuggerAttachCallback();
           devSettings->enableDefaultCrashHandler = m_options.EnableDefaultCrashHandler();
           devSettings->bundleAppId = BundleAppId();
+          devSettings->devBundle = RequestDevBundle();
           devSettings->showDevMenuCallback = [weakThis]() noexcept {
             if (auto strongThis = weakThis.GetStrongPtr()) {
               strongThis->m_uiQueue->Post(
@@ -486,9 +487,21 @@ void ReactInstanceWin::Initialize() noexcept {
 
           switch (m_options.JsiEngine()) {
             case JSIEngine::Hermes: {
-              auto hermesRuntimeHolder =
-                  std::make_shared<facebook::react::HermesRuntimeHolder>(devSettings, m_jsMessageThread.Load());
-              facebook::react::HermesRuntimeHolder::storeTo(
+              // TODO: Should we use UwpPreparedScriptStore?
+              if (Microsoft::ReactNative::HasPackageIdentity()) {
+                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));
+                }
+              }
+
+              auto hermesRuntimeHolder = std::make_shared<Microsoft::ReactNative::HermesRuntimeHolder>(
+                  devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore));
+              Microsoft::ReactNative::HermesRuntimeHolder::storeTo(
                   ReactPropertyBag(m_reactContext->Properties()), hermesRuntimeHolder);
               devSettings->jsiRuntimeHolder = hermesRuntimeHolder;
               break;
@@ -512,14 +525,10 @@ void ReactInstanceWin::Initialize() noexcept {
               enableMultiThreadSupport = Microsoft::ReactNative::IsFabricEnabled(m_reactContext->Properties());
 #endif // USE_FABRIC
 
-              devSettings->jsiRuntimeHolder = std::make_shared<facebook::react::V8JSIRuntimeHolder>(
-                  devSettings,
-                  m_jsMessageThread.Load(),
-                  std::move(scriptStore),
-                  std::move(preparedScriptStore),
-                  enableMultiThreadSupport);
-
-            } break;
+              devSettings->jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::V8RuntimeHolder>(
+                  devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore), enableMultiThreadSupport);
+              break;
+            }
 #endif // USE_V8
             case JSIEngine::Chakra:
 #ifndef CORE_ABI
@@ -1103,13 +1112,10 @@ Mso::CntPtr<IReactInstanceInternal> MakeReactInstance(
       reactHost, std::move(options), std::move(whenCreated), std::move(whenLoaded), std::move(updateUI));
 }
 
-#if defined(USE_V8)
 std::string ReactInstanceWin::getApplicationTempFolder() {
   auto local = winrt::Windows::Storage::ApplicationData::Current().TemporaryFolder().Path();
-
   return Microsoft::Common::Unicode::Utf16ToUtf8(local.c_str(), local.size()) + "\\";
 }
-#endif
 
 bool ReactInstanceWin::UseWebDebugger() const noexcept {
   return m_useWebDebugger;
@@ -1166,6 +1172,10 @@ std::string ReactInstanceWin::BundleAppId() const noexcept {
   return m_options.DeveloperSettings.BundleAppId;
 }
 
+bool ReactInstanceWin::RequestDevBundle() const noexcept {
+  return m_options.DeveloperSettings.DevBundle;
+}
+
 bool ReactInstanceWin::UseDeveloperSupport() const noexcept {
   return m_options.UseDeveloperSupport();
 }

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -80,6 +80,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   bool RequestInlineSourceMap() const noexcept;
   std::string JavaScriptBundleFile() const noexcept;
   std::string BundleAppId() const noexcept;
+  bool RequestDevBundle() const noexcept;
   bool UseDeveloperSupport() const noexcept;
   JSIEngine JsiEngine() const noexcept;
 
@@ -135,9 +136,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
     folly::dynamic Args;
   };
 
-#if defined(USE_V8)
   static std::string getApplicationTempFolder();
-#endif
 
  private: // immutable fields
   const Mso::WeakPtr<IReactHost> m_weakReactHost;

package/Microsoft.ReactNative/ReactInstanceSettings.h

@@ -66,6 +66,10 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   hstring BundleAppId() noexcept;
   void BundleAppId(hstring const &value) noexcept;
 
+  //! When querying the bundle server for a bundle, should it request the dev bundle or release bundle
+  bool RequestDevBundle() noexcept;
+  void RequestDevBundle(bool value) noexcept;
+
   //! Should the instance run in a remote environment such as within a browser
   //! By default, this is using a browser navigated to  http://localhost:8081/debugger-ui served
   //! by Metro/Haul. Debugging will start as soon as the React Native instance is loaded.
@@ -174,6 +178,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
       single_threaded_vector<IReactPackageProvider>()};
   hstring m_javaScriptBundleFile{};
   hstring m_bundleAppId{};
+  bool m_devBundle{true};
   bool m_enableJITCompilation{true};
   bool m_enableByteCodeCaching{false};
   hstring m_byteCodeFileUri{};
@@ -239,6 +244,14 @@ inline void ReactInstanceSettings::BundleAppId(hstring const &value) noexcept {
   m_bundleAppId = value;
 }
 
+inline bool ReactInstanceSettings::RequestDevBundle() noexcept {
+  return m_devBundle;
+}
+
+inline void ReactInstanceSettings::RequestDevBundle(bool value) noexcept {
+  m_devBundle = value;
+}
+
 inline bool ReactInstanceSettings::EnableJITCompilation() noexcept {
   return m_enableJITCompilation;
 }

package/Microsoft.ReactNative/ReactInstanceSettings.idl

@@ -111,6 +111,10 @@ namespace Microsoft.ReactNative
       "If no value is set, the parameter will not be passed.")
     String BundleAppId { get; set; };
 
+    DOC_STRING(
+      "When querying the bundle server for a bundle, should it request the dev bundle or release bundle.")
+    Boolean RequestDevBundle { get; set; };
+
     DOC_STRING(
       "Controls whether the instance JavaScript runs in a remote environment such as within a browser.\n"
       "By default, this is using a browser navigated to http://localhost:8081/debugger-ui served by Metro/Haul.\n"

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -151,6 +151,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   reactOptions.DeveloperSettings.SourceBundlePort = m_instanceSettings.SourceBundlePort();
   reactOptions.DeveloperSettings.RequestInlineSourceMap = m_instanceSettings.RequestInlineSourceMap();
   reactOptions.DeveloperSettings.BundleAppId = to_string(m_instanceSettings.BundleAppId());
+  reactOptions.DeveloperSettings.DevBundle = m_instanceSettings.RequestDevBundle();
 
   reactOptions.ByteCodeFileUri = to_string(m_instanceSettings.ByteCodeFileUri());
   reactOptions.EnableByteCodeCaching = m_instanceSettings.EnableByteCodeCaching();

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

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "ApiLoaders/NodeApi.h"
+
+namespace Microsoft::NodeApiJsi {
+
+LibHandle LibLoader::loadLib(const char * /*libName*/) {
+  return reinterpret_cast<LibHandle>(0);
+}
+
+FuncPtr LibLoader::getFuncPtr(LibHandle /*libHandle*/, const char * /*funcName*/) {
+  return reinterpret_cast<FuncPtr>(0);
+}
+
+} // namespace Microsoft::NodeApiJsi

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

@@ -15,6 +15,14 @@
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</TurboModule_SourcePath>
     <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\bridging</Bridging_SourcePath>
     <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\CallbackWrapper.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
+
+    <NodeApiJsiCommitHash>53b897b03c1c7e57c3372acc6234447a44e150d6</NodeApiJsiCommitHash>
+    <NodeApiJsiLocal Condition="Exists('$(MSBuildThisFileDirectory)NodeApiJsiRuntime.cpp')">true</NodeApiJsiLocal>
+    <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND '$(NodeApiJsiLocal)' == 'true'">$(MSBuildThisFileDirectory)</NodeApiJsiDir>
+    <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)\</NodeApiJsiDir>
+    <NodeApiJsiSrcDir Condition="'$(NodeApiJsiSrcDir)' == '' AND '$(NodeApiJsiLocal)' != 'true'">$(NodeApiJsiDir)src\</NodeApiJsiSrcDir>
+    <NodeApiJsiSrcDir Condition="'$(NodeApiJsiSrcDir)' == ''">$(MSBuildThisFileDirectory)</NodeApiJsiSrcDir>
+    <NodeApiDir Condition="'$(NodeApiDir)' == ''">$(NodeApiJsiDir)node-api\</NodeApiDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -24,6 +32,8 @@
         $(CallInvoker_SourcePath);
         $(TurboModule_SourcePath);
         $(Bridging_SourcePath);
+        $(NodeApiDir);
+        $(NodeApiJsiSrcDir);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
@@ -41,7 +51,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)CoreApp.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DesktopWindowBridge.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\LongLivedJsiValue.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)TurboModuleProvider.h" />
     <ClInclude Include="$(CallInvoker_SourcePath)\ReactCommon\CallInvoker.h" />
     <ClInclude Include="$(CallInvoker_SourcePath)\ReactCommon\SchedulerPriority.h" />
@@ -92,6 +101,14 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)UI.Xaml.Media.Media3D.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)UI.Xaml.Navigation.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)UI.Xaml.Shapes.h" />
+    <ClInclude Include="$(NodeApiDir)js_native_api.h" />
+    <ClInclude Include="$(NodeApiDir)js_native_api_types.h" />
+    <ClInclude Include="$(NodeApiDir)js_runtime_api.h" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\NodeApi.h" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\NodeApi.inc" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\JSRuntimeApi.h" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\JSRuntimeApi.inc" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)NodeApiJsiRuntime.h" />
   </ItemGroup>
   <ItemGroup Condition="'$(BuildMSRNCxx)' != 'false'">
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiAbiApi.cpp" />
@@ -104,16 +121,18 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)ReactPromise.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)TurboModuleProvider.cpp" />
   </ItemGroup>
-  <ItemGroup Condition="'$(BuildMSRNCxx)' != 'false' and '$(BuildMSRNCxxReactCommon)' != 'false'">
-    <!--
-      Make sure all FB code uses the same flags to improve build parallelism.
-      This is because msbuild has to invoke different cl.exe invocations for each
-      set of flags and msbuild inside a project is single threaded.
-    -->
+  <ItemGroup Condition="'$(BuildMSRNCxxJsi)' != 'false'">
     <ClCompile Include="$(JSI_SourcePath)\jsi\jsi.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
+  </ItemGroup>
+  <ItemGroup Condition="'$(BuildMSRNCxxReactCommon)' != 'false'">
+    <!--
+      Make sure all Meta code uses the same flags to improve build parallelism.
+      This is because msbuild has to invoke different cl.exe invocations for each
+      set of flags and msbuild inside a project is single threaded.
+    -->
     <ClCompile Include="$(Bridging_SourcePath)\LongLivedObject.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
@@ -127,13 +146,23 @@
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)README.md" />
+  <ItemGroup Condition="'$(BuildMSRNCxxNodeApiJsi)' != 'false'">
+    <ClCompile Include="$(NodeApiJsiSrcDir)ApiLoaders\NodeApi.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(NodeApiJsiSrcDir)ApiLoaders\JSRuntimeApi.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(NodeApiJsiSrcDir)NodeApiJsiRuntime.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
-  <ItemGroup Condition="'$(BuildMSRNCxx)' != 'false' and '$(RNExternalReferences)' != 'true'">
-    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
+  <ItemGroup Condition="'$(BuildMSRNCxxNodeApiJsiLoader)' != 'false'">
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiLoader.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(UseV8)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)README.md" />
+  </ItemGroup>
 </Project>

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

@@ -27,10 +27,13 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JsiApiContext.cpp">
       <Filter>JSI</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
-      <Filter>JSI</Filter>
-    </ClCompile>
     <ClCompile Include="$(Bridging_SourcePath)\LongLivedObject.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiLoader.cpp">
+      <Filter>NodeApiJsi</Filter>
+    </ClCompile>
+    <ClCompile Include="$(NodeApiJsiSrcDir)ApiLoaders\NodeApi.cpp" />
+    <ClCompile Include="$(NodeApiJsiSrcDir)ApiLoaders\JSRuntimeApi.cpp" />
+    <ClCompile Include="$(NodeApiJsiSrcDir)NodeApiJsiRuntime.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
@@ -156,14 +159,19 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)XamlUtils.h">
       <Filter>UI</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h">
-      <Filter>JSI</Filter>
-    </ClInclude>
     <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CoreApp.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\LongLivedJsiValue.h">
       <Filter>TurboModule</Filter>
     </ClInclude>
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\NodeApi.h" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\NodeApi.inc" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\JSRuntimeApi.h" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)ApiLoaders\JSRuntimeApi.inc" />
+    <ClInclude Include="$(NodeApiJsiSrcDir)NodeApiJsiRuntime.h" />
+    <ClInclude Include="$(NodeApiDir)js_native_api.h" />
+    <ClInclude Include="$(NodeApiDir)js_native_api_types.h" />
+    <ClInclude Include="$(NodeApiDir)js_runtime_api.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="JSI">
@@ -175,6 +183,9 @@
     <Filter Include="TurboModule">
       <UniqueIdentifier>{b5c0294c-d72f-44fa-8509-369f7d3e4a56}</UniqueIdentifier>
     </Filter>
+    <Filter Include="NodeApiJsi">
+      <UniqueIdentifier>{a34cd50a-190c-4cbb-8fe1-6ff1e16fe389}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)README.md" />

package/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs

@@ -32,6 +32,8 @@ namespace Microsoft.ReactNative.Managed
 
     public bool UseWebDebugger => IsValid ? Handle.UseWebDebugger : false;
 
+    public bool RequestDevBundle => IsValid ? Handle.RequestDevBundle : true;
+
     public IReactSettingsSnapshot Handle { get; }
 
     public bool IsValid => Handle != null;