react-native-windows 0.69.0-preview.2 → 0.69.0-preview.5

package/Directory.Build.props

@@ -15,8 +15,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

@@ -289,11 +289,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/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 69,
   patch: 0,
-  prerelease: 'rc.0',
+  prerelease: 'rc.3',
 };

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/Libraries/Utilities/codegenNativeComponent.js

@@ -34,15 +34,14 @@ function codegenNativeComponent<Props>(
   componentName: string,
   options?: Options,
 ): NativeComponentType<Props> {
-  const errorMessage =
-    "Native Component '" +
-    componentName +
-    "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
   if (global.RN$Bridgeless === true) {
+    const errorMessage =
+      "Native Component '" +
+      componentName +
+      "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
     console.error(errorMessage);
-  } else {
-    console.warn(errorMessage);
   }
+
   let componentNameInUse =
     options && options.paperComponentName != null
       ? options.paperComponentName

package/Libraries/Utilities/useColorScheme.js

@@ -8,24 +8,18 @@
  * @flow strict-local
  */
 
-import {useMemo} from 'react';
-import {useSubscription} from 'use-subscription';
+'use strict';
+
+import {useSyncExternalStore} from 'use-sync-external-store/shim';
 import Appearance from './Appearance';
 import type {ColorSchemeName} from './NativeAppearance';
 
 export default function useColorScheme(): ?ColorSchemeName {
-  const subscription = useMemo(
-    () => ({
-      getCurrentValue: () => Appearance.getColorScheme(),
-      subscribe: callback => {
-        const appearanceSubscription = Appearance.addChangeListener(callback);
-        return () => {
-          appearanceSubscription.remove();
-        };
-      },
-    }),
-    [],
+  return useSyncExternalStore(
+    callback => {
+      const appearanceSubscription = Appearance.addChangeListener(callback);
+      return () => appearanceSubscription.remove();
+    },
+    () => Appearance.getColorScheme(),
   );
-
-  return useSubscription(subscription);
 }

package/Microsoft.ReactNative/Base/CoreNativeModules.cpp

@@ -46,7 +46,9 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
   std::vector<facebook::react::NativeModuleDescription> modules;
 
   modules.emplace_back(
-      "Networking", []() { return Microsoft::React::CreateHttpModule(); }, jsMessageQueue);
+      "Networking",
+      [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); },
+      jsMessageQueue);
 
   modules.emplace_back(
       "Timing",

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/JsiApi.cpp

@@ -143,6 +143,7 @@ struct RuntimeAccessor : facebook::jsi::Runtime {
   using facebook::jsi::Runtime::createObject;
   using facebook::jsi::Runtime::createPropNameIDFromAscii;
   using facebook::jsi::Runtime::createPropNameIDFromString;
+  using facebook::jsi::Runtime::createPropNameIDFromSymbol;
   using facebook::jsi::Runtime::createPropNameIDFromUtf8;
   using facebook::jsi::Runtime::createStringFromUtf8;
   using facebook::jsi::Runtime::createValueFromJsonUtf8;
@@ -572,6 +573,14 @@ JsiPropertyIdRef JsiRuntime::CreatePropertyIdFromString(JsiStringRef str) try {
   throw;
 }
 
+JsiPropertyIdRef JsiRuntime::CreatePropertyIdFromSymbol(JsiSymbolRef sym) try {
+  auto symPtr = RuntimeAccessor::AsPointerValue(sym);
+  return PointerAccessor::MakeJsiPropertyNameIdData(
+      m_runtimeAccessor->createPropNameIDFromSymbol(RuntimeAccessor::AsSymbol(&symPtr)));
+} catch (JSI_SET_ERROR) {
+  throw;
+}
+
 hstring JsiRuntime::PropertyIdToString(JsiPropertyIdRef propertyId) try {
   auto ptr = RuntimeAccessor::AsPointerValue(propertyId);
   std::string utf8 = m_runtimeAccessor->utf8(RuntimeAccessor::AsPropNameID(&ptr));

package/Microsoft.ReactNative/JsiApi.h

@@ -90,6 +90,7 @@ struct JsiRuntime : JsiRuntimeT<JsiRuntime> {
   JsiPropertyIdRef CreatePropertyIdFromAscii(array_view<uint8_t const> ascii);
   JsiPropertyIdRef CreatePropertyIdFromUtf8(array_view<uint8_t const> utf8);
   JsiPropertyIdRef CreatePropertyIdFromString(JsiStringRef str);
+  JsiPropertyIdRef CreatePropertyIdFromSymbol(JsiSymbolRef sym);
   hstring PropertyIdToString(JsiPropertyIdRef propertyId);
   void PropertyIdToUtf8(JsiPropertyIdRef propertyId, JsiByteArrayUser const &useUtf8String);
   bool PropertyIdEquals(JsiPropertyIdRef left, JsiPropertyIdRef right);

package/Microsoft.ReactNative/JsiApi.idl

@@ -246,6 +246,7 @@ namespace Microsoft.ReactNative
     JsiPropertyIdRef CreatePropertyIdFromAscii(UInt8[] ascii);
     JsiPropertyIdRef CreatePropertyIdFromUtf8(UInt8[] utf8);
     JsiPropertyIdRef CreatePropertyIdFromString(JsiStringRef str);
+    JsiPropertyIdRef CreatePropertyIdFromSymbol(JsiSymbolRef sym);
     String PropertyIdToString(JsiPropertyIdRef propertyId);
     void PropertyIdToUtf8(JsiPropertyIdRef propertyId, JsiByteArrayUser useUtf8String);
     Boolean PropertyIdEquals(JsiPropertyIdRef left, JsiPropertyIdRef right);

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

@@ -306,11 +306,9 @@ PropNameID JsiAbiRuntime::createPropNameIDFromString(const String &str) try {
   throw;
 }
 
-PropNameID JsiAbiRuntime::createPropNameIDFromSymbol(const Symbol &sym) {
-  // TODO: Support for symbols through the native API in JSC is very limited.
-  // While we could construct a PropNameID here, we would not be able to get a
-  // symbol property through the C++ API.
-  UNREFERENCED_PARAMETER(sym);
+PropNameID JsiAbiRuntime::createPropNameIDFromSymbol(const Symbol &sym) try {
+  return MakePropNameID(m_runtime.CreatePropertyIdFromSymbol(AsJsiSymbolRef(sym)));
+} catch (hresult_error const &) {
   RethrowJsiError();
   throw;
 }

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

@@ -99,7 +99,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
   facebook::jsi::PropNameID createPropNameIDFromAscii(const char *str, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromUtf8(const uint8_t *utf8, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromString(const facebook::jsi::String &str) override;
-  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym);
+  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym) override;
   std::string utf8(const facebook::jsi::PropNameID &propertyNameId) override;
   bool compare(const facebook::jsi::PropNameID &left, const facebook::jsi::PropNameID &right) override;
 

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

@@ -137,7 +137,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   facebook::jsi::PropNameID createPropNameIDFromAscii(const char *str, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromUtf8(const uint8_t *utf8, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromString(const facebook::jsi::String &str) override;
-  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym);
+  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym) override;
   std::string utf8(const facebook::jsi::PropNameID &id) override;
   bool compare(const facebook::jsi::PropNameID &lhs, const facebook::jsi::PropNameID &rhs) override;
 
@@ -441,6 +441,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;
@@ -463,6 +464,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   napi_ext_ref GetPropertyIdFromName(std::string_view value) const;
   napi_ext_ref GetPropertyIdFromName(const uint8_t *data, size_t length) const;
   napi_ext_ref GetPropertyIdFromName(napi_value str) const;
+  napi_ext_ref GetPropertyIdFromSymbol(napi_value sym) const;
   std::string PropertyIdToStdString(napi_value propertyId);
   napi_value CreateSymbol(std::string_view symbolDescription) const;
   std::string SymbolToStdString(napi_value symbolValue);
@@ -621,9 +623,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);
 }
 
@@ -713,11 +713,10 @@ PropNameID NapiJsiRuntime::createPropNameIDFromString(const String &str) {
 }
 
 PropNameID NapiJsiRuntime::createPropNameIDFromSymbol(const Symbol &sym) {
-  // TODO: Support for symbols through the native API in JSC is very limited.
-  // While we could construct a PropNameID here, we would not be able to get a
-  // symbol property through the C++ API.
-  UNREFERENCED_PARAMETER(sym);
-  throw;
+  EnvScope envScope{m_env};
+  napi_ext_ref propSym = GetPropertyIdFromSymbol(GetNapiValue(sym));
+
+  return MakePointer<PropNameID>(propSym);
 }
 
 string NapiJsiRuntime::utf8(const PropNameID &id) {
@@ -1415,6 +1414,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;
@@ -1600,6 +1614,14 @@ napi_ext_ref NapiJsiRuntime::GetPropertyIdFromName(napi_value str) const {
   return ref;
 }
 
+// Gets or creates a unique string value from napi_value string.
+napi_ext_ref NapiJsiRuntime::GetPropertyIdFromSymbol(napi_value sym) const {
+  napi_ext_ref ref{};
+  CHECK_NAPI(napi_ext_create_reference(m_env, sym, &ref));
+
+  return ref;
+}
+
 // Converts property id value to std::string.
 string NapiJsiRuntime::PropertyIdToStdString(napi_value propertyId) {
   if (TypeOf(propertyId) == napi_symbol) {

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

@@ -20,6 +20,54 @@ namespace Microsoft::JSI {
 ///
 std::unique_ptr<facebook::jsi::Runtime> __cdecl MakeNodeApiJsiRuntime(napi_env env) noexcept;
 
+template <typename T>
+struct NativeObjectWrapper;
+
+template <typename T>
+struct NativeObjectWrapper<std::unique_ptr<T>> {
+  static napi_ext_native_data Wrap(std::unique_ptr<T> &&obj) noexcept {
+    napi_ext_native_data nativeData{};
+    nativeData.data = obj.release();
+    nativeData.finalize_cb = [](napi_env /*env*/, void *data, void * /*finalizeHint*/) {
+      std::unique_ptr<T> obj{reinterpret_cast<T *>(data)};
+    };
+    return nativeData;
+  }
+
+  static T *Unwrap(napi_ext_native_data &nativeData) noexcept {
+    return reinterpret_cast<T *>(nativeData.data);
+  }
+};
+
+template <typename T>
+struct NativeObjectWrapper<std::shared_ptr<T>> {
+  static napi_ext_native_data Wrap(std::shared_ptr<T> &&obj) noexcept {
+    static_assert(
+        sizeof(SharedPtrHolder) == sizeof(std::shared_ptr<T>), "std::shared_ptr expected to have size of two pointers");
+    SharedPtrHolder ptrHolder;
+    new (std::addressof(ptrHolder)) std::shared_ptr(std::move(obj));
+    napi_ext_native_data nativeData{};
+    nativeData.data = ptrHolder.ptr1;
+    nativeData.finalize_hint = ptrHolder.ptr2;
+    nativeData.finalize_cb = [](napi_env /*env*/, void *data, void *finalizeHint) {
+      SharedPtrHolder ptrHolder{data, finalizeHint};
+      std::shared_ptr<T> obj(std::move(*reinterpret_cast<std::shared_ptr<T> *>(std::addressof(ptrHolder))));
+    };
+    return nativeData;
+  }
+
+  static std::shared_ptr<T> Unwrap(napi_ext_native_data &nativeData) noexcept {
+    SharedPtrHolder ptrHolder{nativeData.data, nativeData.finalize_hint};
+    return *reinterpret_cast<std::shared_ptr<T> *>(std::addressof(ptrHolder));
+  }
+
+ private:
+  struct SharedPtrHolder {
+    void *ptr1;
+    void *ptr2;
+  };
+};
+
 } // namespace Microsoft::JSI
 
 #endif // MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME

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

@@ -13,7 +13,7 @@
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\nativemodule\core</TurboModule_SourcePath>
     <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\TurboModule.h')">$(MSBuildThisFileDirectory)</Bridging_SourcePath>
+    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\CallbackWrapper.h')">$(MSBuildThisFileDirectory)ReactCommon</Bridging_SourcePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -108,7 +108,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="$(TurboModule_SourcePath)\..\..\bridging\LongLivedObject.cpp">
+    <ClCompile Include="$(Bridging_SourcePath)\LongLivedObject.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>

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

@@ -166,4 +166,4 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)README.md" />
   </ItemGroup>
-</Project>
+</Project>

package/Microsoft.ReactNative.Managed/packages.lock.json

@@ -24,6 +24,11 @@
           "Microsoft.SourceLink.Common": "1.0.0"
         }
       },
+      "boost": {
+        "type": "Transitive",
+        "resolved": "1.76.0",
+        "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "1.0.0",
@@ -60,14 +65,34 @@
         "resolved": "1.0.0",
         "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
       },
+      "Microsoft.UI.Xaml": {
+        "type": "Transitive",
+        "resolved": "2.7.0",
+        "contentHash": "dB4im13tfmMgL/V3Ei+3kD2rUF+/lTxAmR4gjJ45l577eljHfdo/KUrxpq/3I1Vp6e5GCDG1evDaEGuDxypLMg=="
+      },
+      "Microsoft.Windows.CppWinRT": {
+        "type": "Transitive",
+        "resolved": "2.0.211028.7",
+        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
+      },
+      "Microsoft.Windows.SDK.BuildTools": {
+        "type": "Transitive",
+        "resolved": "10.0.22000.194",
+        "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg=="
+      },
       "NETStandard.Library": {
         "type": "Transitive",
         "resolved": "2.0.3",
-        "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
+        "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "ReactNative.Hermes.Windows": {
+        "type": "Transitive",
+        "resolved": "0.11.0-ms.6",
+        "contentHash": "WAVLsSZBV4p/3hNC3W67su7xu3f/ZMSKxu0ON7g2GaKRbkJmH0Qyif1IlzcJwtvR48kuOdfgPu7Bgtz3AY+gqg=="
+      },
       "runtime.win10-arm.Microsoft.Net.Native.Compiler": {
         "type": "Transitive",
         "resolved": "2.2.7-rel-27913-00",
@@ -135,8 +160,38 @@
         "resolved": "2.2.9",
         "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ=="
       },
-      "microsoft.reactnative": {
+      "common": {
         "type": "Project"
+      },
+      "fmt": {
+        "type": "Project"
+      },
+      "folly": {
+        "type": "Project",
+        "dependencies": {
+          "boost": "1.76.0",
+          "fmt": "1.0.0"
+        }
+      },
+      "microsoft.reactnative": {
+        "type": "Project",
+        "dependencies": {
+          "Common": "1.0.0",
+          "Folly": "1.0.0",
+          "Microsoft.UI.Xaml": "2.7.0",
+          "Microsoft.Windows.CppWinRT": "2.0.211028.7",
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22000.194",
+          "ReactCommon": "1.0.0",
+          "ReactNative.Hermes.Windows": "0.11.0-ms.6",
+          "boost": "1.76.0"
+        }
+      },
+      "reactcommon": {
+        "type": "Project",
+        "dependencies": {
+          "Folly": "1.0.0",
+          "boost": "1.76.0"
+        }
       }
     },
     "UAP,Version=v10.0.16299/win10-arm": {

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.69.0-preview.2</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.69.0-preview.5</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/PropertySheets/JSEngine.props

@@ -8,7 +8,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">false</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.11.0-ms.2</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.11.0-ms.6</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgReactNative_Hermes_Windows)')">$(PkgReactNative_Hermes_Windows)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\ReactNative.Hermes.Windows\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
@@ -18,7 +18,7 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.65.11</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.69.4</V8Version>
     <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
     <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
     <V8Package>$(NuGetPackageRoot)\$(V8PackageName).$(V8Version)</V8Package>

package/Scripts/Tfs/Layout-MSRN-Headers.ps1

@@ -5,19 +5,20 @@ param(
 	[string] $SourceRoot = ($PSScriptRoot | Split-Path | Split-Path | Split-Path),
 	[string] $TargetRoot = "$SourceRoot\vnext\target",
 	[System.IO.DirectoryInfo] $ReactWindowsRoot = "$SourceRoot\vnext",
-	[System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",	
+	[System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native",
+	[System.IO.DirectoryInfo] $ReactCommonOverrideRoot = "$ReactWindowsRoot\ReactCommon\TEMP_UntilReactCommonUpdate",
 	[string[]] $Extensions = ('h', 'hpp')
 )
 
 Write-Host "Source root: [$SourceRoot]"
 Write-Host "Destination root: [$TargetRoot]"
 Write-Host "React Native root: [$ReactNativeRoot]"
+Write-Host "ReactCommon Override root: [$ReactCommonOverrideRoot]"
 
 md -Force $TargetRoot
 
 $patterns = $Extensions| ForEach-Object {"*.$_"}
 
-
 # include headers
 Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc
 
@@ -27,6 +28,9 @@ Copy-Item -Force -Recurse -Path $ReactWindowsRoot\Microsoft.ReactNative.Cxx -Des
 # Copy native module spec files
 Copy-Item -Force -Recurse -Path $ReactWindowsRoot\codegen -Destination $TargetRoot\inc
 
+# Overwrite temporary ReactCommon files (since this script can runs on a different machine than where ReactCommon was built)
+Copy-Item -Force -Recurse -Path $ReactCommonOverrideRoot\* -Destination $ReactNativeRoot\ReactCommon\
+
 # Microsoft.ReactNative.CXX project JSI files
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\decorator.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\instrumentation.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
@@ -36,11 +40,11 @@ Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi-inl.h -Destinati
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\threadsafe.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
 
 # Microsoft.ReactNative.CXX project TurboModule files
-New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon
+New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon -Force
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\callinvoker\ReactCommon\CallInvoker.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
-Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\CallbackWrapper.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
-Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\LongLivedObject.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
+Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\bridging\LongLivedObject.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\

package/Shared/CreateModules.h

@@ -3,9 +3,14 @@
 
 #pragma once
 
+// React Native
 #include <cxxreact/CxxModule.h>
 #include <smartPtr/cntPtr.h>
 
+// Windows API
+#include <winrt/Windows.Foundation.h>
+
+// Standard Library
 #include <memory>
 
 // Forward declarations. Desktop projects can not access <React.h>
@@ -30,9 +35,19 @@ extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateTimingModule(
 namespace Microsoft::React {
 
 extern const char *GetHttpModuleName() noexcept;
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateHttpModule() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateHttpModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
 
 extern const char *GetWebSocketModuleName() noexcept;
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateWebSocketModule() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateWebSocketModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
+
+extern const char *GetBlobModuleName() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateBlobModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
+
+extern const char *GetFileReaderModuleName() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateFileReaderModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
 
 } // namespace Microsoft::React