Skip to content

Commit

Permalink
Revert to yarn1 and create patches for RC5
Browse files Browse the repository at this point in the history
  • Loading branch information
ospfranco committed Mar 28, 2024
1 parent 3917ffc commit 78ddfcf
Show file tree
Hide file tree
Showing 15 changed files with 13,057 additions and 23,057 deletions.
Binary file removed .yarn/install-state.gz
Binary file not shown.

This file was deleted.

Binary file not shown.
1 change: 0 additions & 1 deletion .yarnrc.yml

This file was deleted.

Binary file removed example/.yarn/install-state.gz
Binary file not shown.

This file was deleted.

Binary file not shown.
1 change: 0 additions & 1 deletion example/.yarnrc.yml

This file was deleted.

25 changes: 3 additions & 22 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,9 @@ PODS:
- hermes-engine/Pre-built (= 0.74.0-rc.5)
- hermes-engine/Pre-built (0.74.0-rc.5)
- op-sqlite (3.0.7):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React
- React-callinvoker
- React-Codegen
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RCT-Folly (2024.01.01.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -1377,7 +1358,7 @@ SPEC CHECKSUMS:
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
hermes-engine: 28f3a005a29e856b1b5cd0e20b3fa7bbf862cdf3
op-sqlite: 13deb04229ba00779b44c83109a6b4b921b371ff
op-sqlite: af2411e57364db634729dbd4d4b24d0a9d973ab7
RCT-Folly: 045d6ecaa59d826c5736dfba0b2f4083ff8d79df
RCTDeprecation: ef45994c9e22748cfeb6553422514437d0ea15f3
RCTRequired: ab444d2da42365430b9e8e95bd2a0fb18620fdc6
Expand Down Expand Up @@ -1408,9 +1389,9 @@ SPEC CHECKSUMS:
React-perflogger: 12c33674b7ad945eee0a2bdb982383a1bb81c75e
React-RCTActionSheet: 6511eba84bb395512cc6631c556a040822c0e88c
React-RCTAnimation: 8c3f2c976fa43b1e740c70a5cebdf5f01839291d
React-RCTAppDelegate: 1be086ed87137821387571a8a4e69076850886a4
React-RCTAppDelegate: 47727e0ed93c67e646bf2918d4a037c852a29af8
React-RCTBlob: cf1232be5c795b44287d3523d2427199fd72fe45
React-RCTFabric: ba5941f69bc603e9d3c9a252d9435f864fe5dac6
React-RCTFabric: a4f8fcd8d3219e76baf6926cfea84e3b9343f9f9
React-RCTImage: 04273a4c9e65662a9cd6e7f054f5feec950d120f
React-RCTLinking: 1fc7437bab8e337b6b3285df9683369e4c5481e3
React-RCTNetwork: 63d93e9223becd8e8c20d45c9a0b3a32eb2681b6
Expand Down
10 changes: 5 additions & 5 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"start": "react-native start",
"pods": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",
"build:android": "cd android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
"build:ios": "cd ios && xcodebuild -workspace OPSQLiteExample.xcworkspace -scheme debug -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
"build:ios": "cd ios && xcodebuild -workspace OPSQLiteExample.xcworkspace -scheme debug -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO",
"postinstall": "patch-package"
},
"dependencies": {
"@craftzdog/react-native-buffer": "^6.0.5",
Expand All @@ -18,8 +19,10 @@
"events": "^3.3.0",
"mocha": "^10.1.0",
"nativewind": "^2.0.11",
"patch-package": "^8.0.0",
"postinstall-postinstall": "^2.1.0",
"react": "18.2.0",
"react-native": "patch:react-native@npm%3A0.74.0-rc.5#~/.yarn/patches/react-native-npm-0.74.0-rc.5-293efa8cca.patch",
"react-native": "0.74.0-rc.5",
"react-native-restart": "^0.0.27",
"reflect-metadata": "^0.1.13",
"stream-browserify": "^3.0.0",
Expand Down Expand Up @@ -54,8 +57,5 @@
},
"engines": {
"node": ">=18"
},
"resolutions": {
"@react-native-community/cli-platform-android@npm:13.6.0": "patch:@react-native-community/cli-platform-android@npm%3A13.6.0#~/.yarn/patches/@react-native-community-cli-platform-android-npm-13.6.0-036e406a84.patch"
}
}
106 changes: 106 additions & 0 deletions example/patches/react-native+0.74.0-rc.5.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
diff --git a/node_modules/react-native/React/Base/RCTBridge+Inspector.h b/node_modules/react-native/React/Base/RCTBridge+Inspector.h
new file mode 100644
index 0000000..54d8db3
--- /dev/null
+++ b/node_modules/react-native/React/Base/RCTBridge+Inspector.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTBridge.h>
+
+#ifdef __cplusplus
+#import <jsinspector-modern/ReactCdp.h>
+#endif
+
+@interface RCTBridge (Inspector)
+
+/**
+ * The HostTarget for this bridge, if one has been created. Exposed for RCTCxxBridge only.
+ */
+@property (nonatomic, assign, readonly)
+#ifdef __cplusplus
+ facebook::react::jsinspector_modern::HostTarget *
+#else
+ // The inspector infrastructure cannot be used in C or Swift code.
+ void *
+#endif
+ inspectorTarget;
+
+@property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
+
+@end
\ No newline at end of file
diff --git a/node_modules/react-native/React/Base/RCTBridge+Private.h b/node_modules/react-native/React/Base/RCTBridge+Private.h
index d9b2be4..4d3caa0 100644
--- a/node_modules/react-native/React/Base/RCTBridge+Private.h
+++ b/node_modules/react-native/React/Base/RCTBridge+Private.h
@@ -6,9 +6,6 @@
*/

#import <React/RCTBridge.h>
-#ifdef __cplusplus
-#import <jsinspector-modern/ReactCdp.h>
-#endif

@class RCTModuleRegistry;
@class RCTModuleData;
@@ -73,17 +70,6 @@ RCT_EXTERN void RCTRegisterModule(Class);
*/
@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;

-/**
- * The page target for this bridge, if one has been created. Exposed for RCTCxxBridge only.
- */
-@property (nonatomic, assign, readonly)
-#ifdef __cplusplus
- facebook::react::jsinspector_modern::PageTarget *
-#else
- // The inspector infrastructure cannot be used in C code.
- void *
-#endif
- inspectorTarget;
@end

@interface RCTBridge (RCTCxxBridge)
@@ -155,12 +141,6 @@ RCT_EXTERN void RCTRegisterModule(Class);

@end

-@interface RCTBridge (Inspector)
-
-@property (nonatomic, readonly, getter=isInspectable) BOOL inspectable;
-
-@end
-
@interface RCTCxxBridge : RCTBridge

// TODO(cjhopman): this seems unsafe unless we require that it is only called on the main js queue.
diff --git a/node_modules/react-native/React/Base/RCTBridge.mm b/node_modules/react-native/React/Base/RCTBridge.mm
index 65d827e..9c18905 100644
--- a/node_modules/react-native/React/Base/RCTBridge.mm
+++ b/node_modules/react-native/React/Base/RCTBridge.mm
@@ -6,6 +6,7 @@
*/

#import "RCTBridge.h"
+#import "RCTBridge+Inspector.h"
#import "RCTBridge+Private.h"

#import <objc/runtime.h>
diff --git a/node_modules/react-native/React/CoreModules/RCTDevSettings.mm b/node_modules/react-native/React/CoreModules/RCTDevSettings.mm
index b5e81c9..1093050 100644
--- a/node_modules/react-native/React/CoreModules/RCTDevSettings.mm
+++ b/node_modules/react-native/React/CoreModules/RCTDevSettings.mm
@@ -10,6 +10,7 @@
#import <objc/runtime.h>

#import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTBridge+Inspector.h>
#import <React/RCTBridge+Private.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTConstants.h>
Loading

0 comments on commit 78ddfcf

Please sign in to comment.