Skip to content

Commit e1aeb9b

Browse files
committed
Merge branch 'integration/v9' into typescript-integration-rebase-next-catchup
# Conflicts: # .eslintignore # .gitignore # bin/local-test-util # dockerfiles/Dockerfile.node # package-lock.json # packages/browser/package.json # packages/core/event.d.ts # packages/core/package.json # packages/core/types/event.d.ts # packages/delivery-fetch/package.json # packages/delivery-react-native/package.json # packages/delivery-x-domain-request/package.json # packages/delivery-xml-http-request/package.json # packages/electron/package.json # packages/node/package.json # packages/plugin-angular/package.json # packages/plugin-app-duration/package.json # packages/plugin-aws-lambda/package.json # packages/plugin-browser-context/package.json # packages/plugin-browser-device/device.js # packages/plugin-browser-device/package.json # packages/plugin-browser-request/package.json # packages/plugin-browser-session/package.json # packages/plugin-client-ip/package.json # packages/plugin-console-breadcrumbs/package.json # packages/plugin-electron-preload-error/package.json # packages/plugin-express/package.json # packages/plugin-inline-script-content/package.json # packages/plugin-inline-script-content/src/inline-script-content.ts # packages/plugin-interaction-breadcrumbs/package.json # packages/plugin-navigation-breadcrumbs/package.json # packages/plugin-network-breadcrumbs/package.json # packages/plugin-network-breadcrumbs/src/network-breadcrumbs.ts # packages/plugin-node-in-project/package.json # packages/plugin-react-native-client-sync/package.json # packages/plugin-react-native-global-error-handler/package.json # packages/plugin-react-native-hermes/package.json # packages/plugin-react-native-orientation-breadcrumbs/package.json # packages/plugin-react-native-session/package.json # packages/plugin-react/package.json # packages/plugin-simple-throttle/package.json # packages/plugin-strip-project-root/package.json # packages/plugin-strip-query-string/package.json # packages/plugin-window-onerror/package.json # packages/plugin-window-unhandled-rejection/package.json # packages/react-native/ios/vendor/bugsnag-cocoa # packages/web-worker/package.json # scripts/generate-react-native-fixture.js # test/browser/features/fixtures/handled/webpack3/webpack.config.js # test/browser/features/fixtures/handled/webpack4/webpack.config.js # tsconfig.json
2 parents 34899cb + 1495764 commit e1aeb9b

189 files changed

Lines changed: 77144 additions & 26351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/basic/electron-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
- "^28.0.0"
2222
- "^30.0.0"
2323
node_version:
24-
- "18"
24+
- "22"
2525
commands:
2626
- echo "Running on Node `node -v`"
2727
- npm install electron@${ELECTRON_VERSION} --no-audit --progress=false --no-save

.buildkite/basic/expo-pipeline.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,3 @@ steps:
2525
BUGSNAG_JS_COMMIT: "${BUILDKITE_COMMIT}"
2626
# a branch name that's safe to use as a docker cache identifier
2727
BUGSNAG_JS_CACHE_SAFE_BRANCH_NAME: "${BRANCH_NAME}"
28-
29-
- label: "@bugsnag/expo v52/next"
30-
depends_on: "publish-js"
31-
trigger: "bugsnag-expo"
32-
build:
33-
branch: "v52/next"
34-
env:
35-
BUGSNAG_JS_BRANCH: "${BUILDKITE_BRANCH}"
36-
BUGSNAG_JS_COMMIT: "${BUILDKITE_COMMIT}"
37-
# a branch name that's safe to use as a docker cache identifier
38-
BUGSNAG_JS_CACHE_SAFE_BRANCH_NAME: "${BRANCH_NAME}"

.buildkite/basic/node-pipeline.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ steps:
3535
- 16
3636
- 18
3737
- 20
38+
- 22
3839
plugins:
3940
docker-compose#v4.12.0:
4041
run: node-maze-runner

.buildkite/basic/react-native-android-full-pipeline.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ steps:
8080
- "0.76"
8181
- "0.78"
8282
- "0.80"
83-
- "0.81"
83+
- "0.82"
84+
- "0.83"
8485
reactnavigation:
8586
- "true"
8687
adjustments:
@@ -93,10 +94,10 @@ steps:
9394
key: "build-react-native-navigation-android-fixture-old-arch"
9495
timeout_in_minutes: 30
9596
agents:
96-
queue: macos-node-18
97+
queue: macos-node-22
9798
env:
9899
JAVA_VERSION: "17"
99-
NODE_VERSION: "18"
100+
NODE_VERSION: "22"
100101
RN_VERSION: "{{matrix}}"
101102
RCT_NEW_ARCH_ENABLED: "0"
102103
BUILD_ANDROID: "true"
@@ -118,10 +119,10 @@ steps:
118119
key: "build-react-native-navigation-android-fixture-new-arch"
119120
timeout_in_minutes: 30
120121
agents:
121-
queue: macos-node-18
122+
queue: macos-node-22
122123
env:
123124
JAVA_VERSION: "17"
124-
NODE_VERSION: "18"
125+
NODE_VERSION: "22"
125126
RN_VERSION: "{{matrix}}"
126127
RCT_NEW_ARCH_ENABLED: "1"
127128
BUILD_ANDROID: "true"
@@ -187,7 +188,6 @@ steps:
187188
- "0.78"
188189
- "0.80"
189190
- "0.81"
190-
191191
# current latest version (v7.40.1) of react-native-navigation's autolinking tool doesn't support RN 0.73+,
192192
# causing a build failure - see https://github.com/wix/react-native-navigation/issues/7821
193193
# TODO: Investigate and try to re-enable when we add tests for more recent React Native versions
@@ -235,7 +235,8 @@ steps:
235235
- "0.76"
236236
- "0.78"
237237
- "0.80"
238-
- "0.81"
238+
- "0.82"
239+
- "0.83"
239240
reactnavigation:
240241
- "true"
241242
adjustments:

.buildkite/basic/react-native-android-pipeline.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ steps:
1313
env:
1414
JAVA_VERSION: "17"
1515
RN_VERSION: "{{matrix}}"
16+
NODE_VERSION: "22"
1617
RCT_NEW_ARCH_ENABLED: "1"
1718
BUILD_ANDROID: "true"
1819
REACT_NAVIGATION: "true"
@@ -26,7 +27,7 @@ steps:
2627
- exit_status: "*"
2728
limit: 1
2829
matrix:
29-
- "0.82"
30+
- "0.84"
3031

3132
#
3233
# End-to-end tests
@@ -69,5 +70,5 @@ steps:
6970
concurrency_group: "bitbar"
7071
concurrency_method: eager
7172
matrix:
72-
- "0.82"
73+
- "0.84"
7374

.buildkite/basic/react-native-cli-pipeline.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ steps:
2525
- "bundle install"
2626
- "bundle exec maze-runner features/build-app-tests/build-android-app.feature"
2727
matrix:
28+
- "0.84"
29+
- "0.83"
2830
- "0.82"
29-
- "0.81"
30-
- "0.80"
3131
retry:
3232
automatic:
3333
- exit_status: "*"
@@ -54,9 +54,9 @@ steps:
5454
- "bundle install"
5555
- "bundle exec maze-runner features/build-app-tests/build-ios-app.feature"
5656
matrix:
57+
- "0.84"
58+
- "0.83"
5759
- "0.82"
58-
- "0.81"
59-
- "0.80"
6060
retry:
6161
automatic:
6262
- exit_status: "*"
@@ -92,9 +92,9 @@ steps:
9292
concurrency_group: "browserstack-app"
9393
concurrency_method: eager
9494
matrix:
95+
- "0.84"
96+
- "0.83"
9597
- "0.82"
96-
- "0.81"
97-
- "0.80"
9898
retry:
9999
automatic:
100100
- exit_status: 103 # Appium session failed
@@ -127,9 +127,9 @@ steps:
127127
concurrency_group: "browserstack-app"
128128
concurrency_method: eager
129129
matrix:
130+
- "0.84"
131+
- "0.83"
130132
- "0.82"
131-
- "0.81"
132-
- "0.80"
133133
retry:
134134
automatic:
135135
- exit_status: 103 # Appium session failed

.buildkite/basic/react-native-ios-full-pipeline.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ steps:
3535
- "0.78"
3636
- "0.80"
3737
- "0.81"
38+
3839
node:
3940
- "22"
4041
adjustments:
@@ -73,7 +74,8 @@ steps:
7374
- "0.76"
7475
- "0.78"
7576
- "0.80"
76-
- "0.81"
77+
- "0.82"
78+
- "0.83"
7779
reactnavigation:
7880
- "true"
7981
adjustments:
@@ -91,7 +93,7 @@ steps:
9193
agents:
9294
queue: "macos-15"
9395
env:
94-
NODE_VERSION: "18"
96+
NODE_VERSION: "22"
9597
RN_VERSION: "{{matrix}}"
9698
RCT_NEW_ARCH_ENABLED: "0"
9799
BUILD_IOS: "true"
@@ -153,7 +155,7 @@ steps:
153155
command:
154156
- --app=/app/features/fixtures/generated/old-arch/{{matrix}}/output/reactnative.ipa
155157
- --farm=bb
156-
- --device=IOS_15
158+
- --device=IOS_17|IOS_18|IOS_26
157159
- --fail-fast
158160
- --no-tunnel
159161
- --aws-public-ip
@@ -184,7 +186,7 @@ steps:
184186
- "0.78"
185187
- "0.80"
186188
- "0.81"
187-
189+
188190
- label: ":bitbar: :mac: RN {{matrix.reactnative}} iOS (New Arch) end-to-end tests"
189191
depends_on: "build-react-native-ios-fixture-new-arch-full"
190192
timeout_in_minutes: 60
@@ -199,7 +201,7 @@ steps:
199201
command:
200202
- --app=/app/features/fixtures/generated/new-arch/{{matrix.reactnative}}/output/reactnative.ipa
201203
- --farm=bb
202-
- --device=IOS_15
204+
- --device=IOS_17|IOS_18|IOS_26
203205
- --fail-fast
204206
- --no-tunnel
205207
- --aws-public-ip
@@ -228,7 +230,8 @@ steps:
228230
- "0.76"
229231
- "0.78"
230232
- "0.80"
231-
- "0.81"
233+
- "0.82"
234+
- "0.83"
232235
reactnavigation:
233236
- "true"
234237
adjustments:
@@ -253,7 +256,7 @@ steps:
253256
command:
254257
- --app=/app/features/fixtures/generated/react-native-navigation/old-arch/{{matrix}}/output/reactnative.ipa
255258
- --farm=bb
256-
- --device=IOS_15
259+
- --device=IOS_17|IOS_18|IOS_26
257260
- --fail-fast
258261
- --no-tunnel
259262
- --aws-public-ip
@@ -295,7 +298,7 @@ steps:
295298
# command:
296299
# - --app=/app/features/fixtures/generated/react-native-navigation/new-arch/{{matrix}}/output/reactnative.ipa
297300
# - --farm=bb
298-
# - --device=IOS_15
301+
# - --device=IOS_17|IOS_18|IOS_26
299302
# - --fail-fast
300303
# - --no-tunnel
301304
# - --aws-public-ip

.buildkite/basic/react-native-ios-pipeline.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ steps:
1616
queue: "macos-15"
1717
env:
1818
RN_VERSION: "{{matrix}}"
19+
NODE_VERSION: "22"
1920
RCT_NEW_ARCH_ENABLED: "1"
2021
BUILD_IOS: "true"
2122
XCODE_VERSION: "16.2.0"
@@ -26,7 +27,7 @@ steps:
2627
- "bundle install"
2728
- "node scripts/generate-react-native-fixture.js"
2829
matrix:
29-
- "0.82"
30+
- "0.84"
3031
retry:
3132
automatic:
3233
- exit_status: "*"
@@ -48,7 +49,7 @@ steps:
4849
command:
4950
- --app=/app/features/fixtures/generated/new-arch/{{matrix}}/output/reactnative.ipa
5051
- --farm=bb
51-
- --device=IOS_15
52+
- --device=IOS_17|IOS_18|IOS_26
5253
- --fail-fast
5354
- --no-tunnel
5455
- --aws-public-ip
@@ -71,5 +72,5 @@ steps:
7172
concurrency_group: "bitbar"
7273
concurrency_method: eager
7374
matrix:
74-
- "0.82"
75+
- "0.84"
7576

.buildkite/package_manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"packages/plugin-interaction-breadcrumbs",
2121
"packages/plugin-navigation-breadcrumbs",
2222
"packages/plugin-network-breadcrumbs",
23+
"packages/plugin-network-instrumentation",
2324
"packages/plugin-simple-throttle",
2425
"packages/plugin-strip-query-string",
2526
"packages/plugin-window-onerror",
@@ -97,6 +98,7 @@
9798
"packages/delivery-react-native",
9899
"packages/plugin-console-breadcrumbs",
99100
"packages/plugin-network-breadcrumbs",
101+
"packages/plugin-network-instrumentation",
100102
"packages/plugin-react",
101103
"packages/plugin-react-native-client-sync",
102104
"packages/plugin-react-native-event-sync",
@@ -121,6 +123,7 @@
121123
"packages/delivery-react-native",
122124
"packages/plugin-console-breadcrumbs",
123125
"packages/plugin-network-breadcrumbs",
126+
"packages/plugin-network-instrumentation",
124127
"packages/plugin-react",
125128
"packages/plugin-react-native-client-sync",
126129
"packages/plugin-react-native-event-sync",

.buildkite/pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
- label: ":copyright: License Audit"
99
timeout_in_minutes: 20
1010
agents:
11-
queue: "macos-node-18"
11+
queue: "macos-node-22"
1212
command: scripts/license_finder.sh
1313

1414
#
@@ -26,9 +26,9 @@ steps:
2626
key: "publish-js"
2727
timeout_in_minutes: 10
2828
agents:
29-
queue: "macos-node-18"
29+
queue: "macos-node-22"
3030
env:
31-
NODE_VERSION: "18"
31+
NODE_VERSION: "22"
3232
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
3333
command:
3434
- "bundle install"
@@ -92,6 +92,6 @@ steps:
9292
#
9393
- label: ":git: Detect changed packages"
9494
agents:
95-
queue: "macos-node-18"
95+
queue: "macos-node-22"
9696
timeout_in_minutes: 5
9797
command: node .buildkite/pipeline_trigger.js

0 commit comments

Comments
 (0)