Merge remote-tracking branch 'origin/main' into feat/app-46766/maxLen…

…gth-prop-web
Expensify · Oct 2, 2024 · f81a4bd · f81a4bd
2 parents ef63f73 + 2252f70
commit f81a4bd
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 31 deletions.
diff --git a/.github/OSBotify-private-key.asc.gpg b/.github/OSBotify-private-key.asc.gpg
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -34,7 +34,7 @@ jobs:
 
            - name: Set up git for OSBotify
              run: |
-               git config --global user.signingkey 367811D53E34168C
+               git config --global user.signingkey AEE1036472A782AB
                git config --global commit.gpgsign true
                git config --global user.name OSBotify
                git config --global user.email [email protected]

diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,6 @@ lib/
 # react-native-live-markdown
 android/src/main/assets/react-native-live-markdown-parser.js
 .build_complete
+
+# GitHub GPG Keys
+.github/OSBotify-private-key.asc
diff --git a/RNLiveMarkdown.podspec b/RNLiveMarkdown.podspec
@@ -37,8 +37,10 @@ Pod::Spec.new do |s|
     ])
   end
 
-  s.subspec "common" do |ss|
-    ss.source_files         = "cpp/**/*.{cpp,h}"
-    ss.header_dir           = "RNLiveMarkdown"
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+    s.subspec "newarch" do |ss|
+      ss.source_files         = "cpp/**/*.{cpp,h}"
+      ss.header_dir           = "RNLiveMarkdown"
+    end
   end
 end
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.cpp
@@ -1,5 +1,3 @@
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
-
 #include "MarkdownShadowFamilyRegistry.h"
 
 namespace expensify {
@@ -60,5 +58,3 @@ bool MarkdownShadowFamilyRegistry::shouldForceUpdate(facebook::react::Tag tag) {
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownShadowFamilyRegistry.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include <react/renderer/core/ShadowNodeFamily.h>
 
@@ -37,5 +36,3 @@ class MarkdownShadowFamilyRegistry {
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp
@@ -1,5 +1,3 @@
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
-
 #include "MarkdownTextInputDecoratorShadowNode.h"
 
 using namespace expensify::livemarkdown;
@@ -33,5 +31,3 @@ MarkdownTextInputDecoratorShadowNode::updateFragmentState(
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include "MarkdownShadowFamilyRegistry.h"
 #include "MarkdownTextInputDecoratorState.h"
@@ -45,5 +44,3 @@ class JSI_EXPORT MarkdownTextInputDecoratorShadowNode final
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorState.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorState.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include <react/renderer/core/ShadowNodeFamily.h>
 
@@ -33,5 +32,3 @@ class JSI_EXPORT MarkdownTextInputDecoratorState final {
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/...enderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorViewComponentDescriptor.h b/...enderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorViewComponentDescriptor.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include "MarkdownTextInputDecoratorShadowNode.h"
 #include <react/debug/react_native_assert.h>
@@ -16,5 +15,3 @@ class MarkdownTextInputDecoratorViewComponentDescriptor final
 
 } // namespace react
 } // namespace facebook
-
-#endif
diff --git a/cpp/react/renderer/components/RNLiveMarkdownSpec/OwningShadowNodeFragment.h b/cpp/react/renderer/components/RNLiveMarkdownSpec/OwningShadowNodeFragment.h
@@ -1,5 +1,4 @@
 #pragma once
-#if defined(RCT_NEW_ARCH_ENABLED) || defined(ANDROID)
 
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/ShadowNode.h>
@@ -27,5 +26,3 @@ struct OwningShadowNodeFragment {
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1517,9 +1517,9 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.160)
+    - RNLiveMarkdown/newarch (= 0.1.160)
     - Yoga
-  - RNLiveMarkdown/common (0.1.160):
+  - RNLiveMarkdown/newarch (0.1.160):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1805,7 +1805,7 @@ SPEC CHECKSUMS:
   React-utils: 81a715d9c0a2a49047e77a86f3a2247408540deb
   ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f
   ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b
-  RNLiveMarkdown: d194d5fd7ade6fe7454f38c24a2b62fceb15b3c9
+  RNLiveMarkdown: 201e1457f83d07376ae08c918c8ad14e3078d5a0
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: a1d7895431387402a674fd0d1c04ec85e87909b8
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.160",
+  "version": "0.1.162",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",