chore(wallet): RN 74 running within workspace, deps bumped

Emurgo · Sep 23, 2024 · 0b814e6 · 0b814e6
1 parent d1302c0
commit 0b814e6
Show file tree

Hide file tree

Showing 27 changed files with 3,049 additions and 4,815 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,5 +1,5 @@
 nodejs 18.19.1
 rust 1.69.0
-java adoptopenjdk-17.0.10+7
+java zulu-17.52.19
 ruby 3.1.2
 python 3.11.3
diff --git a/apps/wallet-mobile/_package.json b/apps/wallet-mobile/_package.json
@@ -166,7 +166,7 @@
     "react": "18.2.0",
     "react-error-boundary": "^3.1.4",
     "react-intl": "^6.6.2",
-    "react-native": "~0.71.0",
+    "react-native": "0.74.4",
     "react-native-background-timer": "2.4.1",
     "react-native-ble-plx": "2.0.3",
     "react-native-bootsplash": "^4.6.0",

diff --git a/apps/wallet/android/app/build.gradle b/apps/wallet/android/app/build.gradle
@@ -9,7 +9,7 @@ apply plugin: "com.facebook.react"
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    root = file("../../../..")
+    // root = file("..")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
     reactNativeDir = file("../../../../node_modules/react-native")
     //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
@@ -45,7 +45,7 @@ react {
 
     /* Hermes Commands */
     //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
+    // hermesCommand = "../../../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]

diff --git a/apps/wallet/android/build.gradle b/apps/wallet/android/build.gradle
@@ -19,25 +19,3 @@ buildscript {
 }
 
 apply plugin: "com.facebook.react.rootproject"
-
-// allprojects {
-//     repositories {
-//         maven {
-//             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-//             url("$rootDir/../../../node_modules/react-native/android")
-//         }
-//         maven {
-//             // Android JSC is installed from npm
-//             url("$rootDir/../../../node_modules/jsc-android/dist")
-//         }
-//         mavenCentral {
-//             // We don't want to fetch react-native from Maven Central as there are
-//             // older versions over there.
-//             content {
-//                 excludeGroup "com.facebook.react"
-//             }
-//         }
-//         google()
-//         maven { url 'https://www.jitpack.io' }
-//     }
-// }
diff --git a/apps/wallet/android/settings.gradle b/apps/wallet/android/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'yoroi'
-apply from: file("../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
+apply from: file('../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle'); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../../../node_modules/@react-native/gradle-plugin')
diff --git a/apps/wallet/ios/Podfile.lock b/apps/wallet/ios/Podfile.lock
diff --git a/apps/wallet/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet/ios/yoroi.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = yoroi/main.m; sourceTree = "<group>"; };
 		13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = yoroi/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		19F6CBCC0A4E27FBF8BF4A61 /* libPods-yoroi-yoroiTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-yoroi-yoroiTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		24E44580F48DB6EC65278814 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = yoroi/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		24E44580F48DB6EC65278814 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = yoroi/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		3B4392A12AC88292D35C810B /* Pods-yoroi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-yoroi.debug.xcconfig"; path = "Target Support Files/Pods-yoroi/Pods-yoroi.debug.xcconfig"; sourceTree = "<group>"; };
 		5709B34CF0A7D63546082F79 /* Pods-yoroi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-yoroi.release.xcconfig"; path = "Target Support Files/Pods-yoroi/Pods-yoroi.release.xcconfig"; sourceTree = "<group>"; };
 		5B7EB9410499542E8C5724F5 /* Pods-yoroi-yoroiTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-yoroi-yoroiTests.debug.xcconfig"; path = "Target Support Files/Pods-yoroi-yoroiTests/Pods-yoroi-yoroiTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -419,6 +419,7 @@
 			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-yoroi-yoroiTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -447,6 +448,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				INFOPLIST_FILE = yoroiTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -472,6 +474,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = yoroi/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -499,6 +502,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				INFOPLIST_FILE = yoroi/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -594,7 +598,7 @@
 					"$(inherited)",
 					" ",
 				);
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
 			};
@@ -669,7 +673,7 @@
 					"$(inherited)",
 					" ",
 				);
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;

diff --git a/apps/wallet/metro.config.js b/apps/wallet/metro.config.js
@@ -1,4 +1,4 @@
-const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
+const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
 const path = require('path');
 
 const projectRoot = __dirname;
@@ -14,6 +14,7 @@ const config = {
   projectRoot,
   watchFolders: [workspaceRoot],
   resolver: {
+    unstable_enableSymlinks: true,
     nodeModulesPaths: [
       path.resolve(projectRoot, 'node_modules'),
       path.resolve(workspaceRoot, 'node_modules'),

diff --git a/apps/wallet/package.json b/apps/wallet/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
+    "pod-install": "cd ios && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "lint": "eslint .",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -136,6 +136,21 @@
     "@emurgo/cip14-js": "^3.0.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.0",
+    "@babel/preset-env": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "@react-native/babel-preset": "0.74.86",
+    "@react-native/eslint-config": "0.74.86",
+    "@react-native/metro-config": "0.74.86",
+    "@react-native/typescript-config": "0.74.86",
+    "@types/react": "^18.2.6",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.6.3",
+    "eslint": "^8.19.0",
+    "jest": "^29.6.3",
+    "prettier": "2.8.8",
+    "react-test-renderer": "18.2.0",
+    "typescript": "5.0.4",
     "@commitlint/config-conventional": "^17.0.2",
     "@react-native-async-storage/async-storage": "^1.19.3",
     "@react-native-community/eslint-config": "^3.0.2",
@@ -146,42 +161,37 @@
     "@testing-library/react-native": "^12.3.0",
     "@tsconfig/react-native": "^3.0.3",
     "@types/jest": "^29.5.12",
-    "@types/react": "^18.2.55",
-    "@types/react-test-renderer": "^18.0.7",
     "@yoroi/types": "1.5.8",
     "axios": "^1.5.0",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
     "dependency-cruiser": "^13.1.1",
-    "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ft-flow": "^3.0.0",
     "eslint-plugin-prettier": "^4.0.0",
     "flowgen": "^1.21.0",
-    "jest": "^28.1.1",
     "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
     "react": "18.2.0",
-    "react-native": "~0.71.0",
+    "react-native": "0.74.4",
     "react-native-builder-bob": "^0.23.2",
     "react-query": "^3.39.3",
-    "react-test-renderer": "^18.2.0",
     "release-it": "^15.0.0",
-    "typescript": "^5.3.3",
     "zod": "^3.22.1"
   },
   "peerDependencies": {
     "@yoroi/common": "^1.5.4",
     "axios": "^1.5.0",
     "immer": "^10.0.3",
-    "react": ">= 16.8.0 <= 19.0.0",
-    "react-query": "^3.39.3",
     "zod": "^3.22.1"
   },
+  "optionalDependencies": {
+    "react": "18.2.0",
+    "react-query": "^3.39.3"
+  },
   "packageManager": "[email protected]",
   "engines": {
-    "node": ">= 16.19.0"
+    "node": ">= 18.19.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

diff --git a/packages/claim/package.json b/packages/claim/package.json
@@ -142,6 +142,21 @@
     ]
   },
   "devDependencies": {
+    "@babel/core": "^7.20.0",
+    "@babel/preset-env": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "@react-native/babel-preset": "0.74.86",
+    "@react-native/eslint-config": "0.74.86",
+    "@react-native/metro-config": "0.74.86",
+    "@react-native/typescript-config": "0.74.86",
+    "@types/react": "^18.2.6",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.6.3",
+    "eslint": "^8.19.0",
+    "jest": "^29.6.3",
+    "prettier": "2.8.8",
+    "react-test-renderer": "18.2.0",
+    "typescript": "5.0.4",
     "@commitlint/config-conventional": "^17.0.2",
     "@react-native-async-storage/async-storage": "^1.19.3",
     "@react-native-community/eslint-config": "^3.0.2",
@@ -150,46 +165,39 @@
     "@testing-library/react-native": "^12.3.0",
     "@tsconfig/react-native": "^3.0.3",
     "@types/jest": "^29.5.12",
-    "@types/react": "^18.2.55",
-    "@types/react-test-renderer": "^18.0.7",
     "@yoroi/common": "^1.5.4",
     "@yoroi/portfolio": "1.0.3",
     "@yoroi/types": "1.5.8",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
     "dependency-cruiser": "^13.1.1",
-    "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ft-flow": "^3.0.0",
     "eslint-plugin-prettier": "^4.0.0",
     "flowgen": "^1.21.0",
     "immer": "^10.0.2",
-    "jest": "^29.7.0",
     "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
     "react": "18.2.0",
-    "react-native": "~0.71.0",
+    "react-native": "0.74.4",
     "react-native-builder-bob": "^0.23.2",
     "react-query": "^3.39.3",
-    "react-test-renderer": "^18.2.0",
-    "release-it": "^15.0.0",
-    "typescript": "^5.3.3"
+    "release-it": "^15.0.0"
   },
   "peerDependencies": {
-    "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
     "@yoroi/common": "1.5.4",
     "@yoroi/portfolio": "1.0.3",
-    "immer": "^10.0.2",
-    "react": ">= 16.8.0 <= 19.0.0",
-    "react-query": "^3.39.3"
+    "bignumber.js": "^9.0.1",
+    "immer": "^10.0.2"
   },
   "optionalDependencies": {
-    "@react-native-async-storage/async-storage": "^1.19.3"
+    "@react-native-async-storage/async-storage": "^1.19.3",
+    "react": "18.2.0",
+    "react-query": "^3.39.3"
   },
   "packageManager": "[email protected]",
   "engines": {
-    "node": ">= 16.19.0"
+    "node": ">= 18.19.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -134,6 +134,21 @@
     ]
   },
   "devDependencies": {
+    "@babel/core": "^7.20.0",
+    "@babel/preset-env": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "@react-native/babel-preset": "0.74.86",
+    "@react-native/eslint-config": "0.74.86",
+    "@react-native/metro-config": "0.74.86",
+    "@react-native/typescript-config": "0.74.86",
+    "@types/react": "^18.2.6",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.6.3",
+    "eslint": "^8.19.0",
+    "jest": "^29.6.3",
+    "prettier": "2.8.8",
+    "react-test-renderer": "18.2.0",
+    "typescript": "5.0.4",
     "@commitlint/config-conventional": "^17.0.2",
     "@react-native-async-storage/async-storage": "^1.19.3",
     "@react-native-community/eslint-config": "^3.0.2",
@@ -144,49 +159,44 @@
     "@testing-library/react-native": "^12.3.0",
     "@tsconfig/react-native": "^3.0.3",
     "@types/jest": "^29.5.12",
-    "@types/react": "^18.2.55",
-    "@types/react-test-renderer": "^18.0.7",
     "@yoroi/types": "1.5.8",
     "axios": "^1.5.0",
     "axios-mock-adapter": "^1.21.5",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
     "dependency-cruiser": "^13.1.1",
-    "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ft-flow": "^3.0.0",
     "eslint-plugin-prettier": "^4.0.0",
     "flowgen": "^1.21.0",
     "immer": "^10.0.3",
-    "jest": "^28.1.1",
     "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
     "react": "18.2.0",
-    "react-native": "~0.71.0",
+    "react-native": "0.74.4",
     "react-native-builder-bob": "^0.23.2",
     "react-native-mmkv": "^2.11.0",
     "react-query": "^3.39.3",
-    "react-test-renderer": "^18.2.0",
     "release-it": "^15.0.0",
     "rxjs": "^7.8.1",
-    "typescript": "^5.3.3",
     "zod": "^3.22.1"
   },
   "peerDependencies": {
-    "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
     "axios": "^1.5.0",
     "bignumber.js": "^9.0.1",
     "immer": "^10.0.3",
-    "react": ">= 16.8.0 <= 19.0.0",
-    "react-native-mmkv": "^2.11.0",
-    "react-query": "^3.39.3",
     "rxjs": "^7.8.1",
     "zod": "^3.22.1"
   },
+  "optionalDependencies": {
+    "@react-native-async-storage/async-storage": "^1.19.3",
+    "react": "18.2.0",
+    "react-native-mmkv": "^2.11.0",
+    "react-query": "^3.39.3"
+  },
   "packageManager": "[email protected]",
   "engines": {
-    "node": ">= 16.19.0"
+    "node": ">= 18.19.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"