diff --git a/package.json b/package.json index c7beea8..9d65f71 100644 --- a/package.json +++ b/package.json @@ -88,9 +88,9 @@ "@semantic-release/release-notes-generator": "^11.0.4", "@storybook/addon-links": "^6.3.8", "@storybook/react-native": "^5.3.25", - "@testing-library/jest-native": "^5.4.2", + "@testing-library/jest-native": "^5.4.3", "@testing-library/react-hooks": "^8.0.0", - "@testing-library/react-native": "^8.0.0", + "@testing-library/react-native": "^12.8.1", "@types/jest": "^24.0.24", "@types/node": "^16.9.6", "@types/react": "^17.0.24", diff --git a/preview/ios/FreudDSPreview.xcodeproj/project.pbxproj b/preview/ios/FreudDSPreview.xcodeproj/project.pbxproj index c8b999c..716e7cb 100644 --- a/preview/ios/FreudDSPreview.xcodeproj/project.pbxproj +++ b/preview/ios/FreudDSPreview.xcodeproj/project.pbxproj @@ -12,13 +12,13 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 5E14CF79053246C988A4E1DA /* SourceSansPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */; }; 6132EF182BDFF13200BBE14D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */; }; 7699B88040F8A987B510C191 /* libPods-FreudDSPreview-FreudDSPreviewTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-FreudDSPreview-FreudDSPreviewTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + 89CB6AA84EBA462483B67C54 /* freud-icon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */; }; 9EB3C73129F1412F9762B323 /* SourceSansPro-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */; }; - 5E14CF79053246C988A4E1DA /* SourceSansPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */; }; F93CCC72A3D14EDEA12BC001 /* SourceSansPro-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */; }; - 89CB6AA84EBA462483B67C54 /* freud-icon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -35,6 +35,7 @@ 00E356EE1AD99517003FC87E /* FreudDSPreviewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FreudDSPreviewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* FreudDSPreviewTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FreudDSPreviewTests.m; sourceTree = ""; }; + 0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-SemiBold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-SemiBold.ttf"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* FreudDSPreview.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FreudDSPreview.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = FreudDSPreview/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = FreudDSPreview/AppDelegate.mm; sourceTree = ""; }; @@ -42,18 +43,17 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = FreudDSPreview/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FreudDSPreview/main.m; sourceTree = ""; }; 19F6CBCC0A4E27FBF8BF4A61 /* libPods-FreudDSPreview-FreudDSPreviewTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FreudDSPreview-FreudDSPreviewTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "freud-icon.ttf"; path = "../node_modules/@freud-ds/icons/fonts/freud-icon.ttf"; sourceTree = ""; }; 3B4392A12AC88292D35C810B /* Pods-FreudDSPreview.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview.debug.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview.debug.xcconfig"; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-FreudDSPreview.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview.release.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview.release.xcconfig"; sourceTree = ""; }; + 584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-Bold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Bold.ttf"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-FreudDSPreview-FreudDSPreviewTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview-FreudDSPreviewTests.debug.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests.debug.xcconfig"; sourceTree = ""; }; 5DCACB8F33CDC322A6C60F78 /* libPods-FreudDSPreview.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FreudDSPreview.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = FreudDSPreview/PrivacyInfo.xcprivacy; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = FreudDSPreview/LaunchScreen.storyboard; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-FreudDSPreview-FreudDSPreviewTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview-FreudDSPreviewTests.release.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests.release.xcconfig"; sourceTree = ""; }; + C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-Regular.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Regular.ttf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - 584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */ = {isa = PBXFileReference; name = "SourceSansPro-Bold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */ = {isa = PBXFileReference; name = "SourceSansPro-Regular.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */ = {isa = PBXFileReference; name = "SourceSansPro-SemiBold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-SemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */ = {isa = PBXFileReference; name = "freud-icon.ttf"; path = "../node_modules/@freud-ds/icons/fonts/freud-icon.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -106,6 +106,18 @@ name = FreudDSPreview; sourceTree = ""; }; + 1644104D66FC405F91A82E6B /* Resources */ = { + isa = PBXGroup; + children = ( + 584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */, + C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */, + 0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */, + 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */, + ); + name = Resources; + path = ""; + sourceTree = ""; + }; 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( @@ -160,18 +172,6 @@ path = Pods; sourceTree = ""; }; - 1644104D66FC405F91A82E6B /* Resources */ = { - isa = "PBXGroup"; - children = ( - 584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */, - C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */, - 0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */, - 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */, - ); - name = Resources; - sourceTree = ""; - path = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -183,7 +183,6 @@ 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */, F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -206,7 +205,6 @@ 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */, E235C05ADACE081382539298 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -295,23 +293,6 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -356,23 +337,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/preview/ios/Podfile b/preview/ios/Podfile index c09e42f..32595b0 100644 --- a/preview/ios/Podfile +++ b/preview/ios/Podfile @@ -17,7 +17,7 @@ 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 +flipper_config = FlipperConfiguration.disabled linkage = ENV['USE_FRAMEWORKS'] if linkage != nil @@ -34,7 +34,7 @@ target 'FreudDSPreview' do use_react_native!( :path => config[:reactNativePath], # Hermes is now enabled by default. Disable by setting this flag to false. - :hermes_enabled => flags[:hermes_enabled], + :hermes_enabled => false, :fabric_enabled => flags[:fabric_enabled], # Enables Flipper. # diff --git a/preview/ios/Podfile.lock b/preview/ios/Podfile.lock index ae8da4c..0593d4a 100644 --- a/preview/ios/Podfile.lock +++ b/preview/ios/Podfile.lock @@ -1,6 +1,5 @@ PODS: - boost (1.76.0) - - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.72.15) - FBReactNativeSpec (0.72.15): @@ -10,71 +9,8 @@ PODS: - React-Core (= 0.72.15) - React-jsi (= 0.72.15) - ReactCommon/turbomodule/core (= 0.72.15) - - Flipper (0.182.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.182.0): - - FlipperKit/Core (= 0.182.0) - - FlipperKit/Core (0.182.0): - - Flipper (~> 0.182.0) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) - - FlipperKit/CppBridge (0.182.0): - - Flipper (~> 0.182.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.182.0): - - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.182.0) - - FlipperKit/FKPortForwarding (0.182.0): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.182.0) - - FlipperKit/FlipperKitLayoutHelpers (0.182.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.182.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.182.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutIOSDescriptors - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.182.0) - - FlipperKit/FlipperKitNetworkPlugin (0.182.0): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.182.0): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.182.0): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.182.0): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.72.15): - - hermes-engine/Pre-built (= 0.72.15) - - hermes-engine/Pre-built (0.72.15) - - libevent (2.1.12) - - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -86,12 +22,6 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Futures (2021.07.22.00): - - boost - - DoubleConversion - - fmt (~> 6.2.1) - - glog - - libevent - RCTRequired (0.72.15) - RCTTypeSafety (0.72.15): - FBLazyVector (= 0.72.15) @@ -115,11 +45,11 @@ PODS: - DoubleConversion - FBReactNativeSpec - glog - - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core + - React-jsc - React-jsi - React-jsiexecutor - React-NativeModulesApple @@ -128,11 +58,10 @@ PODS: - ReactCommon/turbomodule/core - React-Core (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default (= 0.72.15) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -142,11 +71,10 @@ PODS: - Yoga - React-Core/CoreModulesHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -156,10 +84,9 @@ PODS: - Yoga - React-Core/Default (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -169,12 +96,11 @@ PODS: - Yoga - React-Core/DevSupport (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default (= 0.72.15) - React-Core/RCTWebSocket (= 0.72.15) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-jsinspector (= 0.72.15) @@ -185,11 +111,10 @@ PODS: - Yoga - React-Core/RCTActionSheetHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -199,11 +124,10 @@ PODS: - Yoga - React-Core/RCTAnimationHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -213,11 +137,10 @@ PODS: - Yoga - React-Core/RCTBlobHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -227,11 +150,10 @@ PODS: - Yoga - React-Core/RCTImageHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -241,11 +163,10 @@ PODS: - Yoga - React-Core/RCTLinkingHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -255,11 +176,10 @@ PODS: - Yoga - React-Core/RCTNetworkHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -269,11 +189,10 @@ PODS: - Yoga - React-Core/RCTSettingsHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -283,11 +202,10 @@ PODS: - Yoga - React-Core/RCTTextHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -297,11 +215,10 @@ PODS: - Yoga - React-Core/RCTVibrationHeaders (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -311,11 +228,10 @@ PODS: - Yoga - React-Core/RCTWebSocket (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default (= 0.72.15) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -337,7 +253,6 @@ PODS: - boost (= 1.76.0) - DoubleConversion - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-callinvoker (= 0.72.15) - React-debug (= 0.72.15) @@ -347,27 +262,19 @@ PODS: - React-perflogger (= 0.72.15) - React-runtimeexecutor (= 0.72.15) - React-debug (0.72.15) - - React-hermes (0.72.15): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.72.15) - - React-jsi - - React-jsiexecutor (= 0.72.15) - - React-jsinspector (= 0.72.15) - - React-perflogger (= 0.72.15) + - React-jsc (0.72.15): + - React-jsc/Fabric (= 0.72.15) + - React-jsi (= 0.72.15) + - React-jsc/Fabric (0.72.15): + - React-jsi (= 0.72.15) - React-jsi (0.72.15): - boost (= 1.76.0) - DoubleConversion - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-jsiexecutor (0.72.15): - DoubleConversion - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-cxxreact (= 0.72.15) - React-jsi (= 0.72.15) @@ -375,10 +282,11 @@ PODS: - React-jsinspector (0.72.15) - React-logger (0.72.15): - glog + - react-native-freud-ds (0.0.0): + - React-Core - react-native-safe-area-context (4.11.1): - React-Core - React-NativeModulesApple (0.72.15): - - hermes-engine - React-callinvoker - React-Core - React-cxxreact @@ -402,14 +310,13 @@ PODS: - RCTTypeSafety - React-Core - React-CoreModules - - React-hermes + - React-jsc - React-NativeModulesApple - React-RCTImage - React-RCTNetwork - React-runtimescheduler - ReactCommon/turbomodule/core - React-RCTBlob (0.72.15): - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Codegen (= 0.72.15) - React-Core/RCTBlobHeaders (= 0.72.15) @@ -457,7 +364,6 @@ PODS: - React-jsi (= 0.72.15) - React-runtimescheduler (0.72.15): - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-callinvoker - React-debug @@ -470,7 +376,6 @@ PODS: - ReactCommon/turbomodule/bridging (0.72.15): - DoubleConversion - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-callinvoker (= 0.72.15) - React-cxxreact (= 0.72.15) @@ -480,7 +385,6 @@ PODS: - ReactCommon/turbomodule/core (0.72.15): - DoubleConversion - glog - - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-callinvoker (= 0.72.15) - React-cxxreact (= 0.72.15) @@ -499,38 +403,13 @@ PODS: - React-Core - SocketRocket (0.6.1) - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - 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.182.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.182.0) - - FlipperKit/Core (= 0.182.0) - - FlipperKit/CppBridge (= 0.182.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.182.0) - - FlipperKit/FBDefines (= 0.182.0) - - FlipperKit/FKPortForwarding (= 0.182.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.182.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.182.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.182.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.182.0) - - FlipperKit/FlipperKitReactPlugin (= 0.182.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.182.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.182.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) - - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -538,16 +417,16 @@ 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`) - React-debug (from `../node_modules/react-native/ReactCommon/react/debug`) - - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) + - React-jsc (from `../node_modules/react-native/ReactCommon/jsc`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - "react-native-freud-ds (from `../node_modules/@freud-ds/react-native`)" - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) @@ -575,20 +454,8 @@ DEPENDENCIES: SPEC REPOS: trunk: - - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - FlipperKit - fmt - - libevent - - OpenSSL-Universal - SocketRocket - - YogaKit EXTERNAL SOURCES: boost: @@ -601,8 +468,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" - hermes-engine: - :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -623,8 +488,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/cxxreact" React-debug: :path: "../node_modules/react-native/ReactCommon/react/debug" - React-hermes: - :path: "../node_modules/react-native/ReactCommon/hermes" + React-jsc: + :path: "../node_modules/react-native/ReactCommon/jsc" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: @@ -633,6 +498,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" + react-native-freud-ds: + :path: "../node_modules/@freud-ds/react-native" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" React-NativeModulesApple: @@ -684,45 +551,34 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 7dcd2de282d72e344012f7d6564d024930a6a440 - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: 25cbffbaec517695d376ab4bc428948cd0f08088 FBReactNativeSpec: e03b22fbf7017a6f76641ea4472e73c915dcdda7 - Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818 - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: 5b340c6a5affbf3aba22185be41563bbb2426654 - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: fb207f74935626041e7308c9e88dcdda680f1073 RCTTypeSafety: 146fd11361680250b7580dd1f7f601995cfad1b1 React: f3712351445cc96ba507425675a0cd8d31321d0c React-callinvoker: dcc51a66e02d20a70aeca2abbb1388d4d3011bf8 - React-Codegen: d64399cfcc319735a4f61c2f7df64fdfee9f7307 - React-Core: f8ceb3440b6cf30ce4eea884ed77990b7f9bec13 + React-Codegen: 04b7e88a7f5d3933d058ffb9cea7b0268666de79 + React-Core: ed3aeebf41aeb621de2ab4b58216a2fd5a5fd141 React-CoreModules: 9d1e6f44bf658431a3b99561c8058b54b5959190 - React-cxxreact: 2150e05cdd30c815c1bf27f41062cd33832ffe31 + React-cxxreact: d2d14fc0c0782bd9ed7a556892769b4034ae027c React-debug: 4e90d08c78aa207c064a3860e1540ff252695585 - React-hermes: 1ed296db543b7fdb01916a8e56255fcea0758264 - React-jsi: af5a8eaca28d67822fb14c648486d40737d2d2ab - React-jsiexecutor: d3eef5ddc78eeb9f0d02bed657a7f41d4910b966 + React-jsc: 9ffa4c837c5286366d27c892b6c7c34da3cd5f3d + React-jsi: 020729f637b93456de0018061d44ce36f33c2d8a + React-jsiexecutor: ce8ecfcd3b7dbc9cb65a661110be17f5afd18aa3 React-jsinspector: b86a8abae760c28d69366bbc1d991561e51341ed React-logger: ed7c9e01e58529065e7da6bf8318baf15024283e + react-native-freud-ds: 54f5f0cb0acd29cdd748b3df1e4c731615697094 react-native-safe-area-context: 5141f11858b033636f1788b14f32eaba92cee810 - React-NativeModulesApple: ee36a33f5ad8d80487c43e6b4370ea2eaaa81750 + React-NativeModulesApple: 7bab439cb5de9a76299210ed1127698170777a7f React-perflogger: 6acc671f527e69c0cd93b8e62821d33d3ddf25ca React-RCTActionSheet: 569bb9db46d85565d14697e15ecf2166e035eb07 React-RCTAnimation: 0eea98143c2938a8751a33722623d3e8a38fe1e4 - React-RCTAppDelegate: b4511be9c9c947ef53c9a26c996139cd903bfdc9 - React-RCTBlob: e6fd9d6b975faf765fdc29a959e8e79eb0bb65a0 + React-RCTAppDelegate: 74d38dbb3d8691f72e6dda670006e85d9ea21c91 + React-RCTBlob: 9b3b60e806ce5c9fe5a8ee449f3e41087617441c React-RCTImage: 0220975422a367e784dfd794adfc6454fab23c1f React-RCTLinking: 1abf9834017e080ecbd5b6a28b4fb15eb843a3dd React-RCTNetwork: 5ed275bf87d97a7ba5218cf245b1f103e96f82cd @@ -731,9 +587,9 @@ SPEC CHECKSUMS: React-RCTVibration: 372a12b697a170aaee792f8a9999c40e1f2692d0 React-rncore: d1ccbd5adaf4a67703790838b7c62f140e72d32a React-runtimeexecutor: d4f7ff5073fcf87e14dbf89541d434218630246e - React-runtimescheduler: ae08ede2e0267be2a4d8ba82a54d5908949d5a34 + React-runtimescheduler: b360635f6f804ec42fa875500620882a6b97d2f5 React-utils: 8eb3c12fd4a4da6df3824f7d9a961d73a6ed6e5d - ReactCommon: d2de36ed3eebe700d7169b9e80f7d1a4b98e178d + ReactCommon: 317bddf4a70fca9e542343e942a504285282971c RNCAsyncStorage: d35c79ffba52c1013013e16b1fc295aec2feabb6 RNCPicker: 0b6860a6b208d4046227d2f626ad0722f99a969c RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a @@ -741,8 +597,7 @@ SPEC CHECKSUMS: RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 6f5ab94cd8b1ecd04b6e973d0bc583ede2a598cc - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 7a37ccfe712b6121ec9198146d6ec5793b8a3422 +PODFILE CHECKSUM: 30bfe6d460c730725efafdfb4d4a5eb241d171f4 COCOAPODS: 1.14.3 diff --git a/preview/react-native.config.js b/preview/react-native.config.js index f1e0e8c..8904064 100644 --- a/preview/react-native.config.js +++ b/preview/react-native.config.js @@ -1,4 +1,9 @@ module.exports = { + dependencies: { + ...(process.env.NO_FLIPPER + ? { 'react-native-flipper': { platforms: { ios: null } } } + : {}), + }, project: { ios: {}, android: {}, diff --git a/src/components/__tests__/button.test.tsx b/src/components/__tests__/button.test.tsx deleted file mode 100644 index 3b706fb..0000000 --- a/src/components/__tests__/button.test.tsx +++ /dev/null @@ -1,129 +0,0 @@ -import '@testing-library/jest-native/extend-expect'; -import React from 'react'; -import { renderWithProviders } from '../../helpers/testing'; -import { Button } from '../button/button'; -import { iconCharMap } from '../icon/constants'; - -const testID = 'button-test'; - -const sizes = ['sm', 'md', 'lg'] as const; -const sizesMap = { - sm: 32, - md: 40, - lg: 48, -}; - -const iconSizeMap = { - sm: 16, - md: 20, - lg: 24, -}; - -type VariantIconColorMap = { - variant: 'solid' | 'outline' | 'ghost'; - iconColor: string; -}; - -const buttonVariantsIconColorsMap: VariantIconColorMap[] = [ - { variant: 'solid', iconColor: '#FFFFFF' }, - { variant: 'outline', iconColor: '#6732D1' }, - { variant: 'ghost', iconColor: '#6732D1' }, -]; -const buttonInvertedVariantsIconColorsMap: VariantIconColorMap[] = [ - { variant: 'solid', iconColor: '#6732D1' }, - { variant: 'outline', iconColor: '#FFFFFF' }, - { variant: 'ghost', iconColor: '#FFFFFF' }, -]; - -describe('Forms > Button', () => { - it('should render button container correctly', () => { - const { getByTestId } = renderWithProviders( - - ); - expect(getByTestId(`${testID}-container`)).toBeTruthy(); - }); - - it.each(sizes)('should render button size "%s" correctly', (size) => { - const { getByTestId } = renderWithProviders( -