feat: optimize deps (#3091)

OneKeyHQ · Jun 14, 2023 · 530e155 · 530e155
1 parent f343dff
commit 530e155
Show file tree

Hide file tree

Showing 11 changed files with 339 additions and 281 deletions.
diff --git a/package.json b/package.json
@@ -155,7 +155,7 @@
     "react-native-bundle-visualizer": "^3.1.3",
     "react-refresh": "^0.14.0",
     "react-test-renderer": "18.1.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4",
     "ts-jest": "^27.0.5",
     "typescript": "^5.0.4",
     "ultra-runner": "^3.10.5",
@@ -185,7 +185,7 @@
     "react-native-webview": "https://github.com/OneKeyHQ/react-native-webview.git#feat/refactor-webview",
     "dmg-builder": "23.6.0",
     "keccak": "^3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4",
     "postinstall-postinstall": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
     "fs": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
     "minimatch": "patch:minimatch@npm%3A3.1.2#./.yarn/patches/minimatch-npm-3.1.2-9405269906.patch",

diff --git a/packages/app/ios/Podfile.lock b/packages/app/ios/Podfile.lock
@@ -28,7 +28,7 @@ PODS:
     - React-Core
   - EXNotifications (0.18.1):
     - ExpoModulesCore
-  - Expo (48.0.17):
+  - Expo (48.0.19):
     - ExpoModulesCore
   - ExpoBlur (12.3.1):
     - ExpoModulesCore
@@ -1060,7 +1060,7 @@ SPEC CHECKSUMS:
   EXLocation: 0d7331f0385de210c677313a6a1512099b455347
   EXMediaLibrary: 2e91d1eb14df5c6af1ddfe183a8c8ee7eaf557d8
   EXNotifications: dd628737af60fc8cc62dccebacd326b0fbbc0dcb
-  Expo: d351b4546895fb99ae4e5a1bc39df770ab9dc7d1
+  Expo: 8448e3a2aa1b295f029c81551e1ab6d986517fdb
   ExpoBlur: 83186055c9c5c7ea564d04c6ed766ef7896889ed
   ExpoClipboard: 872ae8ea230649404705b7cc09a155531e74b7bb
   ExpoDevice: 516146e17529c3eae3f5c2c09e826efc9ffc6938
@@ -1185,4 +1185,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 378641444e16b53374eb08f9204e4c8f404b5843
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -51,6 +51,7 @@
     "@walletconnect/utils": "^1.8.0",
     "asyncstorage-down": "^4.2.0",
     "buffer": "^6.0.3",
+    "expo": "^48.0.19",
     "expo-clipboard": "^4.1.2",
     "expo-device": "^5.2.1",
     "expo-haptics": "^12.2.1",
@@ -106,15 +107,13 @@
     "realm": "^11.9.0",
     "realm-flipper-plugin-device": "^1.1.0",
     "redux-flipper": "^2.0.2",
-    "rimraf": "^4.1.2",
     "stream-http": "^3.2.0",
     "text-encoding": "^0.7.0",
     "v8-android-jit": "11.1000.3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@types/levelup": "^5",
-    "@types/node": "^18.11.18",
     "@types/react-native-canvas": "^0.1.9",
     "react-native-flipper-performance-plugin": "^0.4.0"
   },

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -25,8 +25,7 @@
     "recyclerlistview": "^4.2.0"
   },
   "devDependencies": {
-    "@types/qrcode": "^1.4.2",
-    "rimraf": "^4.1.2"
+    "@types/qrcode": "^1.4.2"
   },
   "scripts": {
     "build:icons": "rm -rf src/Icon/react && npx @svgr/[email protected] --config-file .svgrrc.json -d src/Icon/react svg && node src/Icon/script.js",

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -37,15 +37,13 @@
     "electron-store": "^8.1.0",
     "electron-updater": "^5.2.1",
     "keytar": "^7.9.0",
-    "node-fetch": "^2.6.7",
-    "rimraf": "^3.0.2"
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
     "@electron/remote": "^2.0.1",
     "@types/adm-zip": "^0",
     "@types/electron-localshortcut": "^3.1.0",
     "@types/node-fetch": "^2.6.1",
-    "cross-env": "^7.0.3",
     "electron": "19.1.8",
     "electron-builder": "22.14.13",
     "electron-notarize": "^1.1.1",

diff --git a/packages/engine/package.json b/packages/engine/package.json
@@ -17,9 +17,7 @@
     "@types/bchaddrjs": "^0.4.0",
     "@types/bs58": "^4.0.1",
     "@types/bs58check": "^2.1.0",
-    "@types/elliptic": "^6.4.14",
-    "@types/node": "^17.0.2",
-    "rimraf": "^3.0.2"
+    "@types/elliptic": "^6.4.14"
   },
   "dependencies": {
     "@conflux-dev/conflux-address-js": "^1.3.13",

diff --git a/packages/ext/package.json b/packages/ext/package.json
@@ -22,7 +22,6 @@
   "dependencies": {
     "@expo/next-adapter": "^4.0.13",
     "@vespaiach/axios-fetch-adapter": "^0.3.1",
-    "cross-env": "^7.0.3",
     "next": "^11.1.2",
     "next-compose-plugins": "^2.2.0",
     "next-transpile-modules": "^8.0.0",

diff --git a/packages/kit-bg/package.json b/packages/kit-bg/package.json
@@ -11,12 +11,8 @@
     "@siddomains/sidjs": "^0.1.22",
     "@types/url-parse": "^1.4.8",
     "@unstoppabledomains/resolution": "^8.3.3",
-    "date-fns": "^2.27.0",
     "dotbit": "^0.4.1",
-    "react-native-restart": "0.0.24",
     "react-native-uuid": "^2.0.1",
-    "rimraf": "^3.0.2",
-    "semver": "^7.3.7",
     "socket.io-client": "^4.5.2"
   },
   "scripts": {

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -31,19 +31,15 @@
     "expo-secure-store": "^12.1.1",
     "fuse.js": "^6.5.3",
     "lightweight-charts": "^3.8.0",
-    "moti": "^0.25.3",
     "react-async-hook": "^4.0.0",
     "react-freeze": "^1.0.3",
     "react-intl": "^5.21.2",
     "react-native-animated-splash-screen": "^2.0.5",
     "react-native-camera-kit": "14.0.0-beta2",
-    "react-native-root-siblings": "^4.1.1",
     "react-native-uuid": "^2.0.1",
     "react-redux": "^8.0.5",
     "redux-logger": "^3.0.6",
     "redux-persist": "^6.0.0",
-    "rimraf": "^4.1.2",
-    "semver": "^7.3.8",
     "socket.io-client": "^4.5.4",
     "swr": "^2.1.5",
     "url-parse": "^1.5.10",

diff --git a/patches/react-native+0.71.8.patch b/patches/react-native+0.71.8.patch
@@ -1,3 +1,63 @@
+diff --git a/node_modules/react-native/Libraries/Components/View/View.js b/node_modules/react-native/Libraries/Components/View/View.js
+index 8ef1f81..6d417ca 100644
+--- a/node_modules/react-native/Libraries/Components/View/View.js
++++ b/node_modules/react-native/Libraries/Components/View/View.js
+@@ -66,21 +66,41 @@ const View: React.AbstractComponent<
+     const _accessibilityLabelledBy =
+       ariaLabelledBy?.split(/\s*,\s*/g) ?? accessibilityLabelledBy;
+
+-    const _accessibilityState = {
+-      busy: ariaBusy ?? accessibilityState?.busy,
+-      checked: ariaChecked ?? accessibilityState?.checked,
+-      disabled: ariaDisabled ?? accessibilityState?.disabled,
+-      expanded: ariaExpanded ?? accessibilityState?.expanded,
+-      selected: ariaSelected ?? accessibilityState?.selected,
+-    };
+-
+-    const _accessibilityValue = {
+-      max: ariaValueMax ?? accessibilityValue?.max,
+-      min: ariaValueMin ?? accessibilityValue?.min,
+-      now: ariaValueNow ?? accessibilityValue?.now,
+-      text: ariaValueText ?? accessibilityValue?.text,
+-    };
++    // remove this patch after 0.72
++    // https://github.com/facebook/react-native/issues/37797
++    let _accessibilityState;
++    if (
++      accessibilityState != null ||
++      ariaBusy != null ||
++      ariaChecked != null ||
++      ariaDisabled != null ||
++      ariaExpanded != null ||
++      ariaSelected != null
++    ) {
++      _accessibilityState = {
++        busy: ariaBusy ?? accessibilityState?.busy,
++        checked: ariaChecked ?? accessibilityState?.checked,
++        disabled: ariaDisabled ?? accessibilityState?.disabled,
++        expanded: ariaExpanded ?? accessibilityState?.expanded,
++        selected: ariaSelected ?? accessibilityState?.selected,
++      };
++    }
+
++    let _accessibilityValue;
++    if (
++      accessibilityValue != null ||
++      ariaValueMax != null ||
++      ariaValueMin != null ||
++      ariaValueNow != null ||
++      ariaValueText != null
++    ) {
++      _accessibilityValue = {
++        max: ariaValueMax ?? accessibilityValue?.max,
++        min: ariaValueMin ?? accessibilityValue?.min,
++        now: ariaValueNow ?? accessibilityValue?.now,
++        text: ariaValueText ?? accessibilityValue?.text,
++      };
++    }
+     const flattenedStyle = flattenStyle(style);
+     const newPointerEvents = flattenedStyle?.pointerEvents || pointerEvents;
+
 diff --git a/node_modules/react-native/Libraries/Components/View/ViewAccessibility.d.ts b/node_modules/react-native/Libraries/Components/View/ViewAccessibility.d.ts
 index b06d1cb..6c2e083 100644
 --- a/node_modules/react-native/Libraries/Components/View/ViewAccessibility.d.ts