react-native 0.0.0-16bb2ae4f → 0.0.0-18697adec

package/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java

@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.modules.deviceinfo;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactTestHelper;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
+import java.util.Arrays;
+import java.util.List;
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+@PrepareForTest({Arguments.class, DisplayMetricsHolder.class})
+@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"})
+public class DeviceInfoModuleTest extends TestCase {
+
+  @Rule public PowerMockRule rule = new PowerMockRule();
+
+  private DeviceInfoModule mDeviceInfoModule;
+  private DeviceEventManagerModule.RCTDeviceEventEmitter mRCTDeviceEventEmitterMock;
+
+  private WritableMap fakePortraitDisplayMetrics;
+  private WritableMap fakeLandscapeDisplayMetrics;
+
+  @Before
+  public void setUp() {
+    initTestData();
+
+    mockStatic(DisplayMetricsHolder.class);
+
+    mRCTDeviceEventEmitterMock = mock(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
+
+    final ReactApplicationContext context =
+        spy(new ReactApplicationContext(RuntimeEnvironment.application));
+    CatalystInstance catalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
+    context.initializeWithInstance(catalystInstanceMock);
+    when(context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class))
+        .thenReturn(mRCTDeviceEventEmitterMock);
+
+    mDeviceInfoModule = new DeviceInfoModule(context);
+  }
+
+  @After
+  public void teardown() {
+    DisplayMetricsHolder.setWindowDisplayMetrics(null);
+    DisplayMetricsHolder.setScreenDisplayMetrics(null);
+  }
+
+  @Test
+  public void test_itDoesNotEmitAnEvent_whenDisplayMetricsNotChanged() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyNoMoreInteractions(mRCTDeviceEventEmitterMock);
+  }
+
+  @Test
+  public void test_itEmitsOneEvent_whenDisplayMetricsChangedOnce() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics);
+  }
+
+  @Test
+  public void test_itEmitsJustOneEvent_whenUpdateRequestedMultipleTimes() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+    mDeviceInfoModule.getTypedExportedConstants();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics);
+  }
+
+  @Test
+  public void test_itEmitsMultipleEvents_whenDisplayMetricsChangedBetweenUpdates() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(
+        mRCTDeviceEventEmitterMock,
+        fakeLandscapeDisplayMetrics,
+        fakePortraitDisplayMetrics,
+        fakeLandscapeDisplayMetrics);
+  }
+
+  private static void givenDisplayMetricsHolderContains(final WritableMap fakeDisplayMetrics) {
+    when(DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)).thenReturn(fakeDisplayMetrics);
+  }
+
+  private static void verifyUpdateDimensionsEventsEmitted(
+      DeviceEventManagerModule.RCTDeviceEventEmitter emitter, WritableMap... expectedEvents) {
+    List<WritableMap> expectedEventList = Arrays.asList(expectedEvents);
+    ArgumentCaptor<WritableMap> captor = ArgumentCaptor.forClass(WritableMap.class);
+    verify(emitter, times(expectedEventList.size()))
+        .emit(eq("didUpdateDimensions"), captor.capture());
+
+    List<WritableMap> actualEvents = captor.getAllValues();
+    assertThat(actualEvents).isEqualTo(expectedEventList);
+  }
+
+  private void initTestData() {
+    mockStatic(Arguments.class);
+    when(Arguments.createMap())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                return new JavaOnlyMap();
+              }
+            });
+
+    fakePortraitDisplayMetrics = Arguments.createMap();
+    fakePortraitDisplayMetrics.putInt("width", 100);
+    fakePortraitDisplayMetrics.putInt("height", 200);
+
+    fakeLandscapeDisplayMetrics = Arguments.createMap();
+    fakeLandscapeDisplayMetrics.putInt("width", 200);
+    fakeLandscapeDisplayMetrics.putInt("height", 100);
+  }
+}

package/ReactCommon/React-Fabric.podspec

@@ -17,9 +17,10 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 folly_dep_name = 'RCT-Folly/Fabric'
 boost_compiler_flags = '-Wno-documentation'
+react_native_path = ".."
 
 Pod::Spec.new do |s|
   s.name                   = "React-Fabric"
@@ -341,4 +342,12 @@ Pod::Spec.new do |s|
     ss.header_dir           = "react/utils"
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
+
+  use_react_native_codegen!(s, {
+    :react_native_path => react_native_path,
+    :js_srcs_dir => "#{react_native_path}/Libraries",
+    :library_name => "rncore",
+    :library_type => "components",
+    :output_dir => "#{react_native_path}/ReactCommon",
+  })
 end

package/ReactCommon/ReactCommon.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -45,6 +45,7 @@ Pod::Spec.new do |s|
     ss.dependency "React-cxxreact", version
     ss.dependency "React-jsi", version
     ss.dependency "RCT-Folly", folly_version
+    s.dependency "React-logger", version
     ss.dependency "DoubleConversion"
     ss.dependency "glog"
 

package/ReactCommon/callinvoker/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "rn_xplat_cxx_library", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "rn_xplat_cxx_library", "subdir_glob")
 
 rn_xplat_cxx_library(
     name = "callinvoker",
@@ -17,7 +17,7 @@ rn_xplat_cxx_library(
         "-Wall",
     ],
     labels = ["supermodule:xplat/default/public.react_native.infra"],
-    platforms = (ANDROID, APPLE),
+    platforms = (ANDROID, APPLE, CXX),
     preferred_linkage = "static",
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/callinvoker/React-callinvoker.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/cxxreact/Android.mk

@@ -20,7 +20,7 @@ LOCAL_CFLAGS := \
 LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
 
 LOCAL_STATIC_LIBRARIES := boost jsi callinvoker reactperflogger runtimeexecutor
-LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog
+LOCAL_SHARED_LIBRARIES := jsinspector libfolly_json glog logger
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -34,3 +34,4 @@ $(call import-module,jsi)
 $(call import-module,jsinspector)
 $(call import-module,hermes/inspector)
 $(call import-module,hermes/executor)
+$(call import-module,logger)

package/ReactCommon/cxxreact/BUCK

@@ -152,6 +152,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("microprofiler:microprofiler"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
+        react_native_xplat_target("logger:logger"),
         "//third-party/glog:glog",
         "//xplat/folly:optional",
     ],

package/ReactCommon/cxxreact/CxxNativeModule.cpp

@@ -16,6 +16,8 @@
 #include "MessageQueueThread.h"
 #include "SystraceSection.h"
 
+#include <logger/react_native_log.h>
+
 using facebook::xplat::module::CxxModule;
 namespace facebook {
 namespace react {
@@ -54,6 +56,26 @@ CxxModule::Callback convertCallback(
 
 } // namespace
 
+bool CxxNativeModule::shouldWarnOnUse_ = false;
+
+void CxxNativeModule::setShouldWarnOnUse(bool value) {
+  shouldWarnOnUse_ = value;
+}
+
+void CxxNativeModule::emitWarnIfWarnOnUsage(
+    const std::string &method_name,
+    const std::string &module_name) {
+  if (shouldWarnOnUse_) {
+    std::string message = folly::to<std::string>(
+        "Calling ",
+        method_name,
+        " on Cxx NativeModule (name = \"",
+        module_name,
+        "\").");
+    react_native_log_warn(message.c_str());
+  }
+}
+
 std::string CxxNativeModule::getName() {
   return name_;
 }
@@ -87,6 +109,8 @@ folly::dynamic CxxNativeModule::getConstants() {
     return nullptr;
   }
 
+  emitWarnIfWarnOnUsage("getConstants()", getName());
+
   folly::dynamic constants = folly::dynamic::object();
   for (auto &pair : module_->getConstants()) {
     constants.insert(std::move(pair.first), std::move(pair.second));
@@ -121,6 +145,8 @@ void CxxNativeModule::invoke(
         "Method ", method.name, " is synchronous but invoked asynchronously"));
   }
 
+  emitWarnIfWarnOnUsage(method.name, getName());
+
   if (params.size() < method.callbacks) {
     throw std::invalid_argument(folly::to<std::string>(
         "Expected ",
@@ -204,6 +230,8 @@ MethodCallResult CxxNativeModule::callSerializableNativeHook(
         "Method ", method.name, " is asynchronous but invoked synchronously"));
   }
 
+  emitWarnIfWarnOnUsage(method.name, getName());
+
   return method.syncFunc(std::move(args));
 }
 

package/ReactCommon/cxxreact/CxxNativeModule.h

@@ -20,6 +20,8 @@ namespace react {
 class Instance;
 class MessageQueueThread;
 
+typedef void (*WarnOnUsageLogger)(std::string message);
+
 std::function<void(folly::dynamic)> makeCallback(
     std::weak_ptr<Instance> instance,
     const folly::dynamic &callbackId);
@@ -46,6 +48,8 @@ class RN_EXPORT CxxNativeModule : public NativeModule {
       unsigned int hookId,
       folly::dynamic &&args) override;
 
+  static void setShouldWarnOnUse(bool value);
+
  private:
   void lazyInit();
 
@@ -55,6 +59,11 @@ class RN_EXPORT CxxNativeModule : public NativeModule {
   std::shared_ptr<MessageQueueThread> messageQueueThread_;
   std::unique_ptr<xplat::module::CxxModule> module_;
   std::vector<xplat::module::CxxModule::Method> methods_;
+  void emitWarnIfWarnOnUsage(
+      const std::string &method_name,
+      const std::string &module_name);
+
+  static bool shouldWarnOnUse_;
 };
 
 } // namespace react

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -18,7 +18,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -45,4 +45,5 @@ Pod::Spec.new do |s|
   s.dependency "React-runtimeexecutor", version
   s.dependency "React-perflogger", version
   s.dependency "React-jsi", version
+  s.dependency "React-logger", version
 end

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 0;
   int32_t Patch = 0;
-  std::string_view Prerelease = "16bb2ae4f";
+  std::string_view Prerelease = "18697adec";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/React-hermes.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/hermes/executor/Android.mk

@@ -16,8 +16,8 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact
-LOCAL_SHARED_LIBRARIES := libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact
+LOCAL_SHARED_LIBRARIES := libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_STATIC_LIBRARIES := libjsi libjsireact libhermes-inspector
-LOCAL_SHARED_LIBRARIES := libhermes
+LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
+LOCAL_SHARED_LIBRARIES := libhermes libjsi
 
 include $(BUILD_SHARED_LIBRARY)

package/ReactCommon/hermes/inspector/Android.mk

@@ -21,7 +21,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT)
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsi
-LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes
+LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes libjsi libglog
 
 include $(BUILD_SHARED_LIBRARY)

package/ReactCommon/hermes/inspector/tools/msggen/package.json

@@ -11,6 +11,10 @@
     "watch": "babel src --out-dir bin --source-maps --watch",
     "test": "jest"
   },
+  "dependencies": {
+    "devtools-protocol": "0.0.730699",
+    "yargs": "^14.2.0"
+  },
   "devDependencies": {
     "@babel/cli": "^7.2.0",
     "@babel/core": "^7.2.0",
@@ -26,13 +30,12 @@
     "sshpk": "1.16.1",
     "webpack": "^4.41.0"
   },
+  "resolutions": {
+    "set-value": "^4.1.0"
+  },
   "jest": {
     "transform": {
       ".*": "<rootDir>/node_modules/babel-jest"
     }
-  },
-  "dependencies": {
-    "devtools-protocol": "0.0.730699",
-    "yargs": "^14.2.0"
   }
 }

package/ReactCommon/hermes/inspector/tools/msggen/yarn.lock

@@ -3324,7 +3324,7 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -3336,6 +3336,11 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-primitive@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-3.0.1.tgz#98c4db1abff185485a657fc2905052b940524d05"
+  integrity sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -5123,15 +5128,13 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+set-value@^2.0.0, set-value@^2.0.1, set-value@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-4.1.0.tgz#aa433662d87081b75ad88a4743bd450f044e7d09"
+  integrity sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+    is-plain-object "^2.0.4"
+    is-primitive "^3.0.1"
 
 setimmediate@^1.0.4:
   version "1.0.5"
@@ -5303,7 +5306,7 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-split-string@^3.0.1, split-string@^3.0.2:
+split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==

package/ReactCommon/jsi/Android.mk

@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 LOCAL_SHARED_LIBRARIES := libfolly_json glog
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
 
 
 include $(CLEAR_VARS)

package/ReactCommon/jsi/BUCK

@@ -1,5 +1,3 @@
-# BUILD FILE SYNTAX: SKYLARK
-
 load("//tools/build_defs/oss:rn_defs.bzl", "APPLE", "IOS", "MACOSX", "react_native_xplat_dep", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(

package/ReactCommon/jsi/React-jsi.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/jsiexecutor/Android.mk

@@ -16,7 +16,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 
-LOCAL_STATIC_LIBRARIES := libjsi reactnative reactperflogger
-LOCAL_SHARED_LIBRARIES := libfolly_json glog
+LOCAL_STATIC_LIBRARIES := reactnative reactperflogger
+LOCAL_SHARED_LIBRARIES := libfolly_json glog libjsi
 
 include $(BUILD_STATIC_LIBRARY)

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|

package/ReactCommon/logger/Android.mk

@@ -0,0 +1,23 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := logger
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS += -fexceptions
+
+LOCAL_SHARED_LIBRARIES := glog
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,glog)

package/ReactCommon/logger/BUCK

@@ -0,0 +1,43 @@
+load("@fbsource//tools/build_defs:glob_defs.bzl", "subdir_glob")
+load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library")
+
+EXPORTED_HEADERS = [
+    "react_native_log.h",
+]
+
+rn_xplat_cxx_library(
+    name = "logger",
+    srcs = glob(
+        ["*.cpp"],
+    ),
+    headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        exclude = EXPORTED_HEADERS,
+        prefix = "logger",
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", header)
+            for header in EXPORTED_HEADERS
+        ],
+        prefix = "logger",
+    ),
+    compiler_flags = [
+        "-Wall",
+        "-fexceptions",
+        "-std=c++17",
+    ],
+    fbandroid_preferred_linkage = "shared",
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        "//third-party/glog:glog",
+    ],
+)

package/ReactCommon/logger/React-logger.podspec

@@ -0,0 +1,40 @@
+# coding: utf-8
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+folly_version = '2021.06.28.00-v2'
+boost_compiler_flags = '-Wno-documentation'
+
+Pod::Spec.new do |s|
+  s.name                   = "React-logger"
+  s.version                = version
+  s.summary                = "-"  # TODO
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Facebook, Inc. and its affiliates"
+  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
+  s.source                 = source
+  s.source_files           = "*.{cpp,h}"
+  s.exclude_files          = "SampleCxxModule.*"
+  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "" }
+  s.header_dir             = "logger"
+
+  s.dependency "glog"
+end