Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade deps #4963

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
8 changes: 6 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
plugins: [require('@babel/plugin-transform-export-namespace-from'), 'react-native-reanimated/plugin']
presets: ['module:@react-native/babel-preset'],
plugins: [
// The react-native preset should have included this, but somehow forgot:
require('@babel/plugin-transform-export-namespace-from'),
'react-native-reanimated/plugin'
]
}
46 changes: 11 additions & 35 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,8 @@ PODS:
- RCTTypeSafety
- React-Core
- ReactCommon/turbomodule/core
- react-native-webview (13.2.2):
- react-native-webview (13.8.4):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-zcash (0.6.10):
- gRPC-Swift (~> 1.8)
Expand Down Expand Up @@ -591,7 +592,7 @@ PODS:
- React-Core
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.13.4):
- RNGestureHandler (2.16.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- RNLocalize (3.0.2):
Expand All @@ -603,38 +604,13 @@ PODS:
- ZXingObjC
- RNReactNativeHapticFeedback (1.14.0):
- React-Core
- RNReanimated (3.5.4):
- DoubleConversion
- FBLazyVector
- FBReactNativeSpec
- glog
- hermes-engine
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-callinvoker
- RNReanimated (3.8.1):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- React-Core/DevSupport
- React-Core/RCTWebSocket
- React-CoreModules
- React-cxxreact
- React-hermes
- React-jsi
- React-jsiexecutor
- React-jsinspector
- React-RCTActionSheet
- React-RCTAnimation
- React-RCTBlob
- React-RCTImage
- React-RCTLinking
- React-RCTNetwork
- React-RCTSettings
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.19.0):
- RNScreens (3.30.1):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- React-RCTImage
- RNShare (7.1.2):
- React-Core
- RNSound (0.11.0):
Expand Down Expand Up @@ -1216,7 +1192,7 @@ SPEC CHECKSUMS:
react-native-piratechain: 7775af3e8dd813587eab8574d9f46c0ed7148f32
react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
react-native-safe-area-context: 68b07eabfb0d14547d36f6929c0e98d818064f02
react-native-webview: b8ec89966713985111a14d6e4bf98d8b54bced0d
react-native-webview: fa228e55c53372c2b361d2fa5e415844fa83eabf
react-native-zcash: a4085aedd9722e186566bdd33079406414b190ef
React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468
Expand Down Expand Up @@ -1246,13 +1222,13 @@ SPEC CHECKSUMS:
RNFBRemoteConfig: 837617c42142be01e0c3f9bc6a0c0e7330131206
RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
RNGestureHandler: 69d0a928253547ef857a7be4f453220b9c472e07
RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
RNPermissions: 5829ce9a821b8bcab921dae16a7d1a3dc4c95a03
RNQrGenerator: 90461ba3ca88c1d38ef73da50fade35d9648215d
RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
RNReanimated: be07c7ae209074d0e8a84cf38b7909457ac59a32
RNScreens: ea4cd3a853063cda19a4e3c28d2e52180c80f4eb
RNReanimated: 4943d1e286130877c0539f053c3f36a22d8c66f5
RNScreens: bb06f14b5c352e603f2527caac02ca0d6398c6e5
RNShare: 0fec82bd2e67d09f895937ccb4f5a097e714dec2
RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
RNStoreReview: 923b1c888c13469925bf0256dc2c046eab557ce5
Expand Down
6 changes: 6 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx'],
preset: 'react-native',
setupFiles: ['./jestSetup.js'],
transformIgnorePatterns: ['<rootDir>/node_modules/(?!(@react-native|react-native|react-navigation))']
}
69 changes: 13 additions & 56 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,51 +60,6 @@
"lint-staged": {
"*.{js,jsx,ts,tsx}": "eslint"
},
"jest": {
"moduleFileExtensions": [
"js",
"json",
"jsx",
"ts",
"tsx"
],
"preset": "react-native",
"setupFiles": [
"./jestSetup.js"
],
"transformIgnorePatterns": [
"<rootDir>/node_modules/(?!(@react-native|react-native|react-navigation))"
]
},
"resolutions": {
"@ledgerhq/hw-transport-node-hid": "file:./patches/fake-hw-transport-node-hid",
"axios": "0.21.1",
"babel-runtime": "6.26.0",
"bip39": "3.0.2",
"bn.js": "4.11.8",
"bs58": "4.0.1",
"bs58check": "2.1.2",
"clipboardy": "3.0.0",
"core-js": "2.5.3",
"create-hash": "1.2.0",
"elliptic": "6.5.4",
"eosjs-api": "https://github.com/EdgeApp/eosjs-api.git#prepare-script",
"hash-base": "3.0.4",
"hdkey": "1.1.1",
"inherits": "2.0.4",
"long": "4.0.0",
"msw": "1.3.2",
"process-nextick-args": "2.0.0",
"randombytes": "2.1.0",
"regenerator-runtime": "0.13.2",
"ripemd160": "2.0.2",
"ripple-binary-codec": "0.2.3",
"safe-buffer": "5.1.2",
"scrypt.js": "0.3.0",
"sha.js": "2.4.11",
"tweetnacl": "^1.0.3",
"uuid": "3.3.2"
},
"dependencies": {
"@bugsnag/react-native": "^7.22.3",
"@bugsnag/react-native-performance": "^2.2.0",
Expand Down Expand Up @@ -171,7 +126,7 @@
"react-native-fast-shadow": "^0.1.0",
"react-native-file-access": "^3.0.5",
"react-native-fs": "^2.19.0",
"react-native-gesture-handler": "^2.13.4",
"react-native-gesture-handler": "^2.16.0",
"react-native-get-random-values": "^1.9.0",
"react-native-haptic-feedback": "^1.14.0",
"react-native-image-colors": "^2.3.0",
Expand All @@ -187,17 +142,17 @@
"react-native-permissions": "^4.1.5",
"react-native-piratechain": "^0.4.7",
"react-native-popup-menu": "^0.16.1",
"react-native-reanimated": "^3.5.4",
"react-native-reanimated": "^3.8.1",
"react-native-safari-view": "^2.1.0",
"react-native-safe-area-context": "^4.6.4",
"react-native-screens": "^3.19.0",
"react-native-screens": "^3.30.1",
"react-native-share": "^7.1.2",
"react-native-snap-carousel": "^3.9.1",
"react-native-sound": "^0.11.0",
"react-native-store-review": "^0.4.1",
"react-native-svg": "^13.9.0",
"react-native-vector-icons": "^9.2.0",
"react-native-webview": "^13.2.2",
"react-native-webview": "^13.8.4",
"react-native-zcash": "^0.6.10",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
Expand All @@ -211,7 +166,7 @@
"url-parse": "^1.5.2",
"use-context-selector": "^1.4.1",
"yaob": "^0.3.12",
"yavent": "^0.1.3"
"yavent": "^0.1.4"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand All @@ -220,10 +175,11 @@
"@babel/preset-typescript": "^7.18.6",
"@babel/runtime": "^7.20.0",
"@bugsnag/source-maps": "^2.3.1",
"@react-native/babel-preset": "0.73.21",
"@react-native/typescript-config": "0.73.1",
"@rollup/plugin-babel": "^6.0.3",
"@stakekit/api-hooks": "^0.0.52",
"@sucrase/webpack-loader": "^2.0.0",
"@tsconfig/react-native": "^2.0.2",
"@typechain/ethers-v5": "^11.1.2",
"@types/async-lock": "^1.1.5",
"@types/csv-stringify": "^3.1.0",
Expand Down Expand Up @@ -251,7 +207,7 @@
"@welldone-software/why-did-you-render": "^8.0.1",
"appcenter-cli": "^2.12.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^29.2.1",
"babel-jest": "^29.6.3",
"body-parser": "^1.18.2",
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
Expand All @@ -270,18 +226,17 @@
"fs-extra": "^10.1.0",
"https-browserify": "^1.0.0",
"husky": "^7.0.0",
"jest": "^29.2.1",
"jest": "^29.6.3",
"jetifier": "^1.6.5",
"lint-staged": "^10.5.3",
"metro-react-native-babel-preset": "0.73.10",
"node-fetch": "2.x",
"os-browserify": "^0.3.0",
"patch-package": "^6.2.2",
"path-browserify": "^1.0.1",
"prettier": "^2.8.8",
"process": "^0.11.10",
"react-native-performance": "^5.1.0",
"react-native-svg-transformer": "^1.0.0",
"react-native-svg-transformer": "^1.3.0",
"react-test-renderer": "18.2.0",
"readable-stream": "^3.6.2",
"rollup": "^3.20.6",
Expand All @@ -290,7 +245,6 @@
"stream-http": "^3.2.0",
"string_decoder": "^1.3.0",
"sucrase": "^3.20.0",
"tweetnacl": "^1.0.3",
"typechain": "^8.3.2",
"typescript": "5.0.4",
"updot": "^1.1.7",
Expand All @@ -299,5 +253,8 @@
"webpack-cli": "^5.0.1",
"webpack-dev-server": "^4.6.0",
"yarn-deduplicate": "^5.0.0"
},
"engines": {
"node": ">=18"
}
}
23 changes: 0 additions & 23 deletions patches/react-native-reanimated+3.5.4.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java b/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java
index d5f3533..6e88590 100644
index d5f3533..b4cc669 100644
--- a/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java
+++ b/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java
@@ -325,10 +325,6 @@ public class RNCWebViewModuleImpl implements ActivityEventListener {
Expand All @@ -13,29 +13,25 @@ index d5f3533..6e88590 100644

boolean result = ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
if (!result && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/node_modules/react-native-webview/lib/WebViewShared.js b/node_modules/react-native-webview/lib/WebViewShared.js
index 347e915..167692f 100644
--- a/node_modules/react-native-webview/lib/WebViewShared.js
+++ b/node_modules/react-native-webview/lib/WebViewShared.js
@@ -17,7 +17,7 @@ var extractOrigin = function (url) {
return result === null ? '' : result[0];
};
var originWhitelistToRegex = function (originWhitelist) {
- return "^".concat(escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*'));
+ return "^" + escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*') + "$";
};
var passesWhitelist = function (compiledWhitelist, url) {
var origin = extractOrigin(url);
diff --git a/node_modules/react-native-webview/src/WebViewShared.tsx b/node_modules/react-native-webview/src/WebViewShared.tsx
index 7e4bc18..759bed8 100644
index 08905ea..2d8b360 100644
--- a/node_modules/react-native-webview/src/WebViewShared.tsx
+++ b/node_modules/react-native-webview/src/WebViewShared.tsx
@@ -199,6 +199,8 @@ export const useWebViewLogic = ({
}
// !patch for Android only
onLoadProgress?.(event);
+ // @ts-expect-error
+ updateNavigationState(event);
}, [onLoadProgress]);
@@ -25,7 +25,7 @@ const extractOrigin = (url: string): string => {
};

const originWhitelistToRegex = (originWhitelist: string): string =>
- `^${escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*')}`;
+ `^${escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*')}$`;

const onShouldStartLoadWithRequest = useMemo(() => createOnShouldStartLoadWithRequest(
const passesWhitelist = (compiledWhitelist: readonly string[], url: string) => {
const origin = extractOrigin(url);
@@ -240,6 +240,8 @@ export const useWebViewLogic = ({
}
// !patch for Android only
onLoadProgress?.(event);
+ // @ts-expect-error
+ updateNavigationState(event);
},
[onLoadProgress]
);
Loading
Loading