Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ build/
.gradle
local.properties
*.iml
/DevelopmentApp/android/app/.settings
/DevelopmentApp/android/app/.project
/DevelopmentApp/android/app/.classpath
/DevelopmentApp/android/.settings
/DevelopmentApp/android/.project
android/app/.settings
android/app/.project
android/app/.classpath
android/.settings
android/.project
/android/.settings
/android/.project
/android/.classpath
Expand Down Expand Up @@ -81,7 +81,7 @@ package-lock.json
*.apk

# CocoaPods
DevelopmentApp/ios/Pods/
ios/Pods/

# IDE
.vscode
Expand Down
2 changes: 2 additions & 0 deletions ios/.xcode.env.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export NODE_BINARY=/Users/lucas/.nvm/versions/node/v22.13.0/bin/node

Comment on lines +1 to +2

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

It appears this local environment file, ios/.xcode.env.local, has been accidentally committed. This file contains a user-specific absolute path (/Users/lucas/...) for NODE_BINARY.

Such user-specific configuration files should not be part of the repository because:

  • They won't work for other developers or CI environments.
  • They can expose local system details.

Could you please remove this file from the pull request and add ios/.xcode.env.local to the main .gitignore file to prevent it from being committed in the future? The existing ios/.xcode.env file provides a template/default mechanism for setting NODE_BINARY.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mdlucas ele tá certo hahaha

3 changes: 1 addition & 2 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ prepare_react_native_project!
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Expand All @@ -34,7 +33,7 @@ target 'Fluid' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
:flipper_configuration => flipper_config,
:flipper_configuration => FlipperConfiguration.disabled,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
Expand Down
196 changes: 51 additions & 145 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PODS:
- boost (1.83.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- FBLazyVector (0.73.5)
- FBReactNativeSpec (0.73.5):
Expand All @@ -10,62 +9,6 @@ PODS:
- React-Core (= 0.73.5)
- React-jsi (= 0.73.5)
- ReactCommon/turbomodule/core (= 0.73.5)
- Flipper (0.201.0):
- Flipper-Folly (~> 2.6)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.2.0.1)
- Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.10):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.5.0.5)
- Flipper-PeerTalk (0.0.4)
- FlipperKit (0.201.0):
- FlipperKit/Core (= 0.201.0)
- FlipperKit/Core (0.201.0):
- Flipper (~> 0.201.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- SocketRocket (~> 0.6.0)
- FlipperKit/CppBridge (0.201.0):
- Flipper (~> 0.201.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.201.0):
- Flipper-Folly (~> 2.6)
- FlipperKit/FBDefines (0.201.0)
- FlipperKit/FKPortForwarding (0.201.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.201.0)
- FlipperKit/FlipperKitLayoutHelpers (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutTextSearchable (0.201.0)
- FlipperKit/FlipperKitNetworkPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1)
- glog (0.3.5)
- hermes-engine (0.73.5):
Expand All @@ -90,7 +33,6 @@ PODS:
- lottie-ios (~> 4.4.1)
- RCT-Folly (= 2022.05.16.00)
- React-Core
- OpenSSL-Universal (1.1.1100)
- RCT-Folly (2022.05.16.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -970,7 +912,7 @@ PODS:
- React-Core
- react-native-camera/RN (4.2.1):
- React-Core
- react-native-image-picker (7.1.0):
- react-native-image-picker (7.1.2):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
Expand Down Expand Up @@ -1149,13 +1091,15 @@ PODS:
- React-Core
- RNDateTimePicker (7.6.1):
- React-Core
- RNDeviceInfo (10.6.0):
- React-Core
- RNFastImage (8.6.3):
- React-Core
- SDWebImage (~> 5.11.1)
- SDWebImageWebPCoder (~> 0.8.4)
- RNReactNativeHapticFeedback (2.0.3):
- React-Core
- RNSVG (15.0.0):
- RNSVG (15.1.0):
Comment on lines +1094 to +1102

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This diff hunk shows the addition of RNDeviceInfo (10.6.0) and an update to RNSVG (15.0.0 to 15.1.0), alongside other changes in Podfile.lock.

  1. RNDeviceInfo: package.json lists react-native-device-info: "14.0.0" in devDependencies. Was the intention to link this existing dev dependency natively? If so, is the version mismatch (JS 14.0.0 vs. native 10.6.0) expected for this library?
  2. Other Updates: Several other dependencies have had version bumps or checksum changes (e.g., react-native-image-picker to 7.1.2, lottie-react-native, etc.).

Could you clarify if these dependency additions/updates are intentional and specifically tested as part of this PR's scope (fixing Storybook by disabling Flipper)? It's often recommended to handle significant dependency changes in separate PRs to isolate potential issues.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cara.. o bicho é perspicaz ein. também faz sentido. mas pode seguir

- React-Core
- RNVectorIcons (10.0.3):
- glog
Expand All @@ -1175,31 +1119,10 @@ DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- Flipper (= 0.201.0)
- Flipper-Boost-iOSX (= 1.76.0.1.11)
- Flipper-DoubleConversion (= 3.2.0.1)
- Flipper-Fmt (= 7.1.7)
- Flipper-Folly (= 2.6.10)
- Flipper-Glog (= 0.5.0.5)
- Flipper-PeerTalk (= 0.0.4)
- FlipperKit (= 0.201.0)
- FlipperKit/Core (= 0.201.0)
- FlipperKit/CppBridge (= 0.201.0)
- FlipperKit/FBCxxFollyDynamicConvert (= 0.201.0)
- FlipperKit/FBDefines (= 0.201.0)
- FlipperKit/FKPortForwarding (= 0.201.0)
- FlipperKit/FlipperKitHighlightOverlay (= 0.201.0)
- FlipperKit/FlipperKitLayoutPlugin (= 0.201.0)
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.201.0)
- FlipperKit/FlipperKitNetworkPlugin (= 0.201.0)
- FlipperKit/FlipperKitReactPlugin (= 0.201.0)
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.201.0)
- FlipperKit/SKIOSNetworkPlugin (= 0.201.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- libevent (~> 2.1.12)
- lottie-react-native (from `../node_modules/lottie-react-native`)
- OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
Expand All @@ -1208,7 +1131,6 @@ DEPENDENCIES:
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
- React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`)
- React-Core/DevSupport (from `../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
Expand Down Expand Up @@ -1250,6 +1172,7 @@ DEPENDENCIES:
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
- "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
- RNFastImage (from `../node_modules/react-native-fast-image`)
- RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
- RNSVG (from `../node_modules/react-native-svg`)
Expand All @@ -1258,20 +1181,10 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- CocoaAsyncSocket
- Flipper
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- FlipperKit
- fmt
- libevent
- libwebp
- lottie-ios
- OpenSSL-Universal
- SDWebImage
- SDWebImageWebPCoder
- SocketRocket
Expand Down Expand Up @@ -1386,6 +1299,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-async-storage/async-storage"
RNDateTimePicker:
:path: "../node_modules/@react-native-community/datetimepicker"
RNDeviceInfo:
:path: "../node_modules/react-native-device-info"
RNFastImage:
:path: "../node_modules/react-native-fast-image"
RNReactNativeHapticFeedback:
Expand All @@ -1399,82 +1314,73 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494
lottie-react-native: 13cd0c4782c3e6bb26bfa4cc2d08bfb84f6d1ab6
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
lottie-react-native: b186d59a3164b5f78173f91e912bbc3ad279bd71
RCT-Folly: cd21f1661364f975ae76b3308167ad66b09f53f5
RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
React: 84221d5e0ce297bc57c4b6af539a62d812d89f10
React-callinvoker: 5d17577ecc7f784535ebedf3aad4bcbf8f4b5117
React-Codegen: 857e7984fc277aadde2a7a427288b6918ece7b2b
React-Core: 8e782e7e24c7843871a0d9c3c8d7c5b3ebb73832
React-CoreModules: 7875ee247e3e6e0e683b52cd1cdda1b71618bd55
React-cxxreact: 788cd771c6e94d44f8d472fdfae89b67226067ea
React-Codegen: 98969fb1b2ed186d38e769f3cdea4c3201085278
React-Core: 45b57cf8f26a1b73a968376b78a181a0a55fae1a
React-CoreModules: 2dbe7b44ef03a6526327d2fcf5978abb1adbf12b
React-cxxreact: 9c345807a3c8aeabb010a55bbb18fbd56ae85a35
React-debug: 55c7f2b8463bfe85567c9f4ede904085601130c9
React-Fabric: 8cb43853496bb8032420edf62e7281c53109e682
React-FabricImage: fbdc0ef7ed58a87c77600017c19a751932de3e47
React-graphics: dc8307b615f14e13f1081ac23ea66697808bcd29
React-hermes: d9acaa4ebf2118d9bd8a541af8c620c467b356b6
React-ImageManager: 2a97ddc9b1f459121697d629cfbe69712997d76f
React-jserrorhandler: b97b16674258ccaeff5a70047a097a140e76d12d
React-jsi: 1d59d0a148c76641ac577729e0268bafa494152c
React-jsiexecutor: 262b66928ad948491d03fd328bb5b822cce94647
React-Fabric: 846efe22d5d2343f0587bc73c9ccf9bd6226fc83
React-FabricImage: 0c1a9aacc0cd7a820ca3dda1a608af9e3af0234f
React-graphics: adcac65d292de4120c48abfeca73c8d4f5203cfa
React-hermes: aec5c2d84156696e3a86bb47dede28b6acc320ba
React-ImageManager: bdf336b924b643757cb5fd6bf974964ad26720f8
React-jserrorhandler: 9f8f34cfcc9fccb6c889ff7dbca3e280e0d52d26
React-jsi: 1f373f98095a9259761b7a4c815704953f308b3e
React-jsiexecutor: 8661ec8d9487e6e0ca71fa45dc34e2ac4f932d03
React-jsinspector: 32db5e364bcae8fca8cdf8891830636275add0c5
React-logger: 0331362115f0f5b392bd7ed14636d1a3ea612479
React-Mapbuffer: 7c35cd53a22d0be04d3f26f7881c7fb7dd230216
react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
react-native-image-picker: e8f292d7d7f04778cfd0fa91466ac66acea96b1a
react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
react-native-slider: 33b8d190b59d4f67a541061bb91775d53d617d9d
React-logger: 4136cd22748f4275b04bf82f7b6853ba93b5e0e3
React-Mapbuffer: ee9b45b26e759a099a3e024df50b25af390ee998
react-native-camera: 079d80421f0572d6b4e836908114d614d0adb553
react-native-image-picker: 16b817ac5df3f835fc9d187349e7d9ce8836a260
react-native-safe-area-context: 435f4c13ac75ceed6135382ee77d57d1a5b5b2d6
react-native-slider: 3051c537444d711b566d1e4d681c6cd35081ae6f
React-nativeconfig: 1166714a4f7ea57a0df5c2cb44fbc70f98d580f9
React-NativeModulesApple: 726664e9829eb5eed8170241000e46ead269a05f
React-NativeModulesApple: d4a50e6739e201716bc90178c143d019c8e09c36
React-perflogger: 0dd9f1725d55f8264b81efadd373fe1d9cca7dc2
React-RCTActionSheet: 05656d2102b0d0a2676d58bad4d80106af5367b2
React-RCTAnimation: 6c66beae98730fb7615df28caf651e295f2401e5
React-RCTAppDelegate: 891b80c596fffcb3f90431739495d606a9a0d610
React-RCTBlob: 8ecee445ec5fa9ed8a8621a136183c1045165100
React-RCTFabric: f291e06bc63fef26cdd105537bae5c6a8d3bdca8
React-RCTImage: 585b16465146cb839da02f3179ce7cb19d332642
React-RCTLinking: 09ba11f7df62946e7ddca1b51aa3bf47b230e008
React-RCTNetwork: e070f8d2fca60f1e9571936ce54d165e77129e76
React-RCTSettings: b08c7ff191f0a5421aab198ea1086c9a8d513bde
React-RCTText: f6cc5a3cf0f1a4f3d1256657dca1025e4cfe45e0
React-RCTVibration: d9948962139f9924ef87f23ab240e045e496213b
React-rendererdebug: ee05480666415f7a76e6cf0a7a50363423f44809
React-RCTAnimation: 53140af71e408cf1fbd18acb4a1b594d61f63fb5
React-RCTAppDelegate: d99a344209527f00e14e14000023ef3c7bc513df
React-RCTBlob: 9d9c402e6810ff6aa10f198f466860fe099ef61f
React-RCTFabric: 75262242a19f9b4cad13d49e3c25ab2ecb8157e1
React-RCTImage: 7870ebb8b85aa8d4b239c2b7093f1aecf36370be
React-RCTLinking: cbff83cb2704551ea9055a6d2937e0ad26931699
React-RCTNetwork: 493e092ddfbacb1a7fb1b10a86f227f40047a5a1
React-RCTSettings: 476ee6374acf88579b5a63cfcbdaa5ca34bd4e6f
React-RCTText: 9b5260bffb76472e6b6ed2aa9e41f7130b0854f4
React-RCTVibration: ebeba2c27494c21867cabc2787cdfeba8cdf0e43
React-rendererdebug: b26004c421d64e73562a4aec5b780802852a8b98
React-rncore: 010565651e9cf2e4fac9517a348446789dd55e01
React-runtimeexecutor: 56f562a608056fb0c1711d900a992e26f375d817
React-runtimescheduler: 814b644a5f456c7df1fba7bcd9914707152527c6
React-utils: 987a4526a2fc0acdfaf87888adfe0bf9d0452066
ReactCommon: 2947b0bffd82ea0e58ca7928881152d4c6dae9af
RNCAsyncStorage: 014a78b2cc8cc107c9e92ee428dc0c1ac3223416
RNDateTimePicker: 8fb39263b721223e095248acaf6f406d5b7f6713
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
RNReactNativeHapticFeedback: afa5bf2794aecbb2dba2525329253da0d66656df
RNSVG: 3f65a03e0c61a8495dee92bf82545ed9041cbf3b
RNVectorIcons: 73ab573085f65a572d3b6233e68996d4707fd505
React-runtimescheduler: 23cacc34a0a2b0b17fbd4262c5f0f8dcf3fb7903
React-utils: c89ba7cfbcc24a54c229928aa971a2539f5bdc21
ReactCommon: 878d3e9687f81294648a1d025b91ecde7e22179e
RNCAsyncStorage: b94801a40fc7cf7f17f1af19a98b3a6337b96298
RNDateTimePicker: f56da0202e73cb1b02eefa3f8d045ae12183b5e6
RNDeviceInfo: e38f15f203e786b0a11bd7232d4b79ebcbb94a7c
RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
RNReactNativeHapticFeedback: f6632582d9576a7d85697902f6100b46a24d9da2
RNSVG: a31e321979e3001f56ba9331d10ac917f8ad1851
RNVectorIcons: 102cd20472bf0d7cd15443d43cd87f9c97228ac3
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7

PODFILE CHECKSUM: f2633ad834404861cd5a2c6d05c19f70dc9d3725
PODFILE CHECKSUM: 2543e9e07766de0309bdba2b51430dc4c34506ee

COCOAPODS: 1.14.3
COCOAPODS: 1.16.2
Comment on lines +1384 to +1386

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The COCOAPODS version used to generate this Podfile.lock has been updated from 1.14.3 to 1.16.2. This is a notable change in the tooling.

Was this CocoaPods version upgrade intentional? While updates are generally good, they can sometimes introduce subtle changes in dependency resolution or build behavior. It would be good to confirm this was a planned part of this work and that its implications have been considered and tested.