From f42628e7806cb23d5511e227645a80aeba145ccb Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Mon, 10 Jul 2023 10:40:37 +0100 Subject: [PATCH 1/9] bump dependencies --- package.json | 48 +++++++++---------- packages/delivery-expo/package.json | 12 ++--- packages/expo-cli/package.json | 2 +- packages/expo/package.json | 6 +-- packages/plugin-expo-app/package.json | 8 ++-- .../package.json | 4 +- packages/plugin-expo-device/package.json | 8 ++-- .../plugin-expo-eas-sourcemaps/package.json | 2 +- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 143b2789..464ec12b 100644 --- a/package.json +++ b/package.json @@ -1,26 +1,26 @@ { - "devDependencies": { - "eslint": "^6.8.0", - "eslint-config-standard": "^14.1.0", - "eslint-plugin-import": "^2.20.1", - "eslint-plugin-jest": "^23.7.0", - "eslint-plugin-node": "^11.0.0", - "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-react": "^7.18.3", - "eslint-plugin-standard": "^4.0.1", - "expo": "^48.0.0", - "jest": "^26.6.3", - "jest-expo": "^48.0.1", - "lerna": "^6.0.1", - "react": "18.2.0", - "react-native": "0.71.3", - "verdaccio": "^5.10.2" - }, - "scripts": { - "bootstrap": "lerna bootstrap", - "test:unit": "jest", - "test:lint": "eslint --report-unused-disable-directives --max-warnings=0 .", - "local-npm:start": "verdaccio --config ./verdaccio-config.yml", - "local-npm:publish-all": "lerna publish --yes --force-publish --exact --no-push --no-git-reset --no-git-tag-version --registry 'http://localhost:4873'" - } + "devDependencies": { + "eslint": "^6.8.0", + "eslint-config-standard": "^14.1.0", + "eslint-plugin-import": "^2.20.1", + "eslint-plugin-jest": "^23.7.0", + "eslint-plugin-node": "^11.0.0", + "eslint-plugin-promise": "^4.2.1", + "eslint-plugin-react": "^7.18.3", + "eslint-plugin-standard": "^4.0.1", + "expo": "^49.0.0", + "jest": "^29.2.1", + "jest-expo": "^49.0.0", + "lerna": "^6.0.1", + "react": "18.2.0", + "react-native": "0.72.1", + "verdaccio": "^5.10.2" + }, + "scripts": { + "bootstrap": "lerna bootstrap", + "test:unit": "jest", + "test:lint": "eslint --report-unused-disable-directives --max-warnings=0 .", + "local-npm:start": "verdaccio --config ./verdaccio-config.yml", + "local-npm:publish-all": "lerna publish --yes --force-publish --exact --no-push --no-git-reset --no-git-tag-version --registry 'http://localhost:4873'" + } } diff --git a/packages/delivery-expo/package.json b/packages/delivery-expo/package.json index 2c4c0adb..fb35dd71 100644 --- a/packages/delivery-expo/package.json +++ b/packages/delivery-expo/package.json @@ -18,14 +18,14 @@ "license": "MIT", "devDependencies": { "@bugsnag/core": "^7.16.0", - "@react-native-community/netinfo": "9.3.7", - "expo-crypto": "~12.2.1", - "expo-file-system": "~15.2.2" + "@react-native-community/netinfo": "9.4.1", + "expo-crypto": "~12.4.0", + "expo-file-system": "~15.4.2" }, "peerDependencies": { "@bugsnag/core": "^7.0.0", - "@react-native-community/netinfo": "9.3.7", - "expo-crypto": "~12.2.1", - "expo-file-system": "~15.2.2" + "@react-native-community/netinfo": "9.4.1", + "expo-crypto": "~12.4.0", + "expo-file-system": "~15.4.2" } } diff --git a/packages/expo-cli/package.json b/packages/expo-cli/package.json index b04c2fdc..921ac29b 100644 --- a/packages/expo-cli/package.json +++ b/packages/expo-cli/package.json @@ -11,7 +11,7 @@ "author": "Bugsnag", "license": "MIT", "dependencies": { - "@expo/package-manager": "^1.0.1", + "@expo/package-manager": "^1.0.2", "command-line-args": "^5.0.2", "kleur": "^3.0.2", "prompts": "^2.0.4", diff --git a/packages/expo/package.json b/packages/expo/package.json index 0b31280c..8b78e907 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -49,11 +49,11 @@ "bugsnag-build-reporter": "^1.0.1" }, "devDependencies": { - "expo-constants": "~14.2.1" + "expo-constants": "~14.4.2" }, "peerDependencies": { - "expo": "^48.0.0", - "expo-constants": "~14.2.1", + "expo": "^49.0.0", + "expo-constants": "~14.4.2", "promise": "^8.3.0", "react": "*" } diff --git a/packages/plugin-expo-app/package.json b/packages/plugin-expo-app/package.json index 0cb9b6f8..0565abc6 100644 --- a/packages/plugin-expo-app/package.json +++ b/packages/plugin-expo-app/package.json @@ -18,12 +18,12 @@ "license": "MIT", "devDependencies": { "@bugsnag/core": "^7.16.0", - "expo-application": "~5.1.1", - "expo-constants": "~14.2.1" + "expo-application": "~5.3.0", + "expo-constants": "~14.4.2" }, "peerDependencies": { "@bugsnag/core": "^7.0.0", - "expo-application": "~5.1.1", - "expo-constants": "~14.2.1" + "expo-application": "~5.3.0", + "expo-constants": "~14.4.2" } } diff --git a/packages/plugin-expo-connectivity-breadcrumbs/package.json b/packages/plugin-expo-connectivity-breadcrumbs/package.json index b3b8f226..d2e0443f 100644 --- a/packages/plugin-expo-connectivity-breadcrumbs/package.json +++ b/packages/plugin-expo-connectivity-breadcrumbs/package.json @@ -18,10 +18,10 @@ "license": "MIT", "devDependencies": { "@bugsnag/core": "^7.16.0", - "@react-native-community/netinfo": "9.3.7" + "@react-native-community/netinfo": "9.4.1" }, "peerDependencies": { "@bugsnag/core": "^7.0.0", - "@react-native-community/netinfo": "9.3.7" + "@react-native-community/netinfo": "9.4.1" } } diff --git a/packages/plugin-expo-device/package.json b/packages/plugin-expo-device/package.json index 52f956bd..dd92b53d 100644 --- a/packages/plugin-expo-device/package.json +++ b/packages/plugin-expo-device/package.json @@ -18,12 +18,12 @@ "license": "MIT", "devDependencies": { "@bugsnag/core": "^7.16.0", - "expo-constants": "~14.2.1", - "expo-device": "~5.2.1" + "expo-constants": "~14.4.2", + "expo-device": "~5.4.0" }, "peerDependencies": { "@bugsnag/core": "^7.0.0", - "expo-constants": "~14.2.1", - "expo-device": "~5.2.1" + "expo-constants": "~14.4.2", + "expo-device": "~5.4.0" } } diff --git a/packages/plugin-expo-eas-sourcemaps/package.json b/packages/plugin-expo-eas-sourcemaps/package.json index 4aaa4422..85af7c52 100644 --- a/packages/plugin-expo-eas-sourcemaps/package.json +++ b/packages/plugin-expo-eas-sourcemaps/package.json @@ -24,7 +24,7 @@ }, "peerDependencies": { "@bugsnag/source-maps": "^2.3.1", - "@expo/config": "^8.0.2" + "@expo/config": "^8.1.1" }, "author": "Bugsnag", "license": "MIT" From a07d3048d12be22587bbf387d037ed28730901d5 Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Mon, 10 Jul 2023 10:40:47 +0100 Subject: [PATCH 2/9] bump latest supported version in CLI --- packages/expo-cli/lib/version-information.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/expo-cli/lib/version-information.js b/packages/expo-cli/lib/version-information.js index 38ca2fa4..0582c65c 100644 --- a/packages/expo-cli/lib/version-information.js +++ b/packages/expo-cli/lib/version-information.js @@ -1,7 +1,7 @@ const semver = require('semver') // the major version number of the latest Expo SDK we support -const LATEST_SUPPORTED_EXPO_SDK = 48 +const LATEST_SUPPORTED_EXPO_SDK = 49 class Version { constructor (expoSdkVersion, bugsnagVersion, isLegacy = false) { From c48e428268549aafc743114278c8d2d39d037f5d Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Mon, 10 Jul 2023 14:14:34 +0100 Subject: [PATCH 3/9] upgrade test fixture to expo 49 --- features/fixtures/test-app/package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/features/fixtures/test-app/package.json b/features/fixtures/test-app/package.json index 671d4090..13d90ca6 100644 --- a/features/fixtures/test-app/package.json +++ b/features/fixtures/test-app/package.json @@ -9,17 +9,17 @@ "web": "expo start --web" }, "dependencies": { - "@react-native-community/netinfo": "9.3.7", - "expo": "~48.0.4", - "expo-application": "~5.1.1", - "expo-constants": "~14.2.1", - "expo-crypto": "~12.2.1", - "expo-device": "~5.2.1", - "expo-file-system": "~15.2.2", - "expo-screen-orientation": "~5.1.1", - "expo-status-bar": "~1.4.4", + "@react-native-community/netinfo": "9.3.10", + "expo": "^49.0.0", + "expo-application": "~5.3.0", + "expo-constants": "~14.4.2", + "expo-crypto": "~12.4.1", + "expo-device": "~5.4.0", + "expo-file-system": "~15.4.2", + "expo-screen-orientation": "~6.0.2", + "expo-status-bar": "~1.6.0", "react": "18.2.0", - "react-native": "0.71.3" + "react-native": "0.72.1" }, "resolutions": { "expo-modules-core": "1.2.3" From 1c5de6f137e4a942b58af03819c04aef8d4a7f12 Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Mon, 10 Jul 2023 14:38:58 +0100 Subject: [PATCH 4/9] revert netinfo dependency to v9.3.10 --- packages/delivery-expo/package.json | 4 ++-- packages/plugin-expo-connectivity-breadcrumbs/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/delivery-expo/package.json b/packages/delivery-expo/package.json index fb35dd71..0b64b128 100644 --- a/packages/delivery-expo/package.json +++ b/packages/delivery-expo/package.json @@ -18,13 +18,13 @@ "license": "MIT", "devDependencies": { "@bugsnag/core": "^7.16.0", - "@react-native-community/netinfo": "9.4.1", + "@react-native-community/netinfo": "9.3.10", "expo-crypto": "~12.4.0", "expo-file-system": "~15.4.2" }, "peerDependencies": { "@bugsnag/core": "^7.0.0", - "@react-native-community/netinfo": "9.4.1", + "@react-native-community/netinfo": "9.3.10", "expo-crypto": "~12.4.0", "expo-file-system": "~15.4.2" } diff --git a/packages/plugin-expo-connectivity-breadcrumbs/package.json b/packages/plugin-expo-connectivity-breadcrumbs/package.json index d2e0443f..2a1264b9 100644 --- a/packages/plugin-expo-connectivity-breadcrumbs/package.json +++ b/packages/plugin-expo-connectivity-breadcrumbs/package.json @@ -18,10 +18,10 @@ "license": "MIT", "devDependencies": { "@bugsnag/core": "^7.16.0", - "@react-native-community/netinfo": "9.4.1" + "@react-native-community/netinfo": "9.3.10" }, "peerDependencies": { "@bugsnag/core": "^7.0.0", - "@react-native-community/netinfo": "9.4.1" + "@react-native-community/netinfo": "9.3.10" } } From 02e05ceddbf5d154c490269cdcf7e6369bca7a5f Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Mon, 10 Jul 2023 15:05:04 +0100 Subject: [PATCH 5/9] remove expo-modules-core resolution override from test fixture This is no longer needed --- features/fixtures/test-app/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/features/fixtures/test-app/package.json b/features/fixtures/test-app/package.json index 13d90ca6..e148acd5 100644 --- a/features/fixtures/test-app/package.json +++ b/features/fixtures/test-app/package.json @@ -21,9 +21,6 @@ "react": "18.2.0", "react-native": "0.72.1" }, - "resolutions": { - "expo-modules-core": "1.2.3" - }, "devDependencies": { "@babel/core": "^7.20.0" }, From 15b3de84c5083b00e3083d5c170071d7ac536f6a Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Mon, 10 Jul 2023 17:52:56 +0100 Subject: [PATCH 6/9] revert jest version bump and remove jest-expo dependency --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 464ec12b..78e724ae 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ "eslint-plugin-react": "^7.18.3", "eslint-plugin-standard": "^4.0.1", "expo": "^49.0.0", - "jest": "^29.2.1", - "jest-expo": "^49.0.0", + "jest": "^26.6.3", "lerna": "^6.0.1", "react": "18.2.0", "react-native": "0.72.1", From 6ce909a12273f167dc695a835e5a944b78d71801 Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Tue, 11 Jul 2023 14:01:21 +0100 Subject: [PATCH 7/9] reinstate jest-expo (still currently disabled) --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 78e724ae..3f2192ab 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "eslint-plugin-standard": "^4.0.1", "expo": "^49.0.0", "jest": "^26.6.3", + "jest-expo": "^48.0.1", "lerna": "^6.0.1", "react": "18.2.0", "react-native": "0.72.1", From e38a4bcc0e3f8953925766d46a1cebbf5f6d00b6 Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Tue, 11 Jul 2023 14:49:29 +0100 Subject: [PATCH 8/9] bump bugsnag deps --- packages/expo/package.json | 20 ++++++++++---------- packages/plugin-expo-app/package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/expo/package.json b/packages/expo/package.json index 8b78e907..7e8e1faf 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -32,21 +32,21 @@ "author": "Bugsnag", "license": "MIT", "dependencies": { - "@bugsnag/core": "^7.16.0", + "@bugsnag/core": "^7.19.0", "@bugsnag/delivery-expo": "^48.0.0", - "@bugsnag/plugin-browser-session": "^7.16.0", - "@bugsnag/plugin-console-breadcrumbs": "^7.16.0", + "@bugsnag/plugin-browser-session": "^7.19.0", + "@bugsnag/plugin-console-breadcrumbs": "^7.19.0", "@bugsnag/plugin-expo-app": "^48.0.0", "@bugsnag/plugin-expo-app-state-breadcrumbs": "^48.0.0", "@bugsnag/plugin-expo-connectivity-breadcrumbs": "^48.0.0", "@bugsnag/plugin-expo-device": "^48.1.0", - "@bugsnag/plugin-network-breadcrumbs": "^7.16.0", - "@bugsnag/plugin-react": "^7.16.0", - "@bugsnag/plugin-react-native-global-error-handler": "^7.16.0", - "@bugsnag/plugin-react-native-orientation-breadcrumbs": "^7.16.0", - "@bugsnag/plugin-react-native-unhandled-rejection": "^7.16.0", - "@bugsnag/source-maps": "^2.3.0", - "bugsnag-build-reporter": "^1.0.1" + "@bugsnag/plugin-network-breadcrumbs": "^7.19.0", + "@bugsnag/plugin-react": "^7.19.0", + "@bugsnag/plugin-react-native-global-error-handler": "^7.19.0", + "@bugsnag/plugin-react-native-orientation-breadcrumbs": "^7.19.0", + "@bugsnag/plugin-react-native-unhandled-rejection": "^7.19.0", + "@bugsnag/source-maps": "^2.3.1", + "bugsnag-build-reporter": "^2.0.0" }, "devDependencies": { "expo-constants": "~14.4.2" diff --git a/packages/plugin-expo-app/package.json b/packages/plugin-expo-app/package.json index 0565abc6..50f10769 100644 --- a/packages/plugin-expo-app/package.json +++ b/packages/plugin-expo-app/package.json @@ -17,7 +17,7 @@ "author": "Bugsnag", "license": "MIT", "devDependencies": { - "@bugsnag/core": "^7.16.0", + "@bugsnag/core": "^7.19.0", "expo-application": "~5.3.0", "expo-constants": "~14.4.2" }, From 80d81e47f814672c74080d26d409dce954085039 Mon Sep 17 00:00:00 2001 From: Yousif Ahmed Date: Wed, 12 Jul 2023 09:50:03 +0100 Subject: [PATCH 9/9] add config plugin to test fixture to allow http traffic on android --- features/fixtures/test-app/app.json | 2 +- .../withAddClearTextTrafficAndroid.js | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 features/fixtures/test-app/config-plugins/withAddClearTextTrafficAndroid.js diff --git a/features/fixtures/test-app/app.json b/features/fixtures/test-app/app.json index 27e17453..35dd2033 100644 --- a/features/fixtures/test-app/app.json +++ b/features/fixtures/test-app/app.json @@ -34,7 +34,7 @@ "web": { "favicon": "./assets/favicon.png" }, - "plugins": ["./config-plugins/withRemoveiOSNotificationEntitlement"], + "plugins": ["./config-plugins/withRemoveiOSNotificationEntitlement", "./config-plugins/withAddClearTextTrafficAndroid"], "extra": { "eas": { "projectId": "EXPO_EAS_PROJECT_ID" diff --git a/features/fixtures/test-app/config-plugins/withAddClearTextTrafficAndroid.js b/features/fixtures/test-app/config-plugins/withAddClearTextTrafficAndroid.js new file mode 100644 index 00000000..0f663e1b --- /dev/null +++ b/features/fixtures/test-app/config-plugins/withAddClearTextTrafficAndroid.js @@ -0,0 +1,19 @@ +const { AndroidConfig, withAndroidManifest } = require('@expo/config-plugins') +const { getMainApplicationOrThrow } = AndroidConfig.Manifest + +const withAddClearTextTrafficAndroid = config => { + config = withAndroidManifest(config, config => { + config.modResults = setUsesCleartextTraffic(config, config.modResults) + return config + }) + + return config +} + +function setUsesCleartextTraffic(config, androidManifest) { + const mainApplication = getMainApplicationOrThrow(androidManifest); + mainApplication.$['android:usesCleartextTraffic'] = 'true' + return androidManifest; +} + +module.exports = withAddClearTextTrafficAndroid \ No newline at end of file