Skip to content

Commit 1a6e43a

Browse files
Merge branch 'main' into antonis/bump-axios
2 parents 71700d7 + 19a0088 commit 1a6e43a

File tree

3 files changed

+23
-29
lines changed

3 files changed

+23
-29
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@
6161
"resolutions": {
6262
"appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
6363
"axios": "^1.13.5",
64+
"fast-xml-parser": "^5.3.6",
6465
"form-data": "4.0.4",
66+
"qs": "^6.14.2",
67+
"lodash": "^4.17.23",
6568
"tar-fs": "^3.1.1",
6669
"tar": "^7.5.7"
6770
},

packages/core/scripts/sentry-xcode.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ if [ "$SENTRY_DISABLE_AUTO_UPLOAD" != true ]; then
5757
echo "$SENTRY_XCODE_COMMAND_OUTPUT" | awk '{print "output: sentry-cli - " $0}'
5858
else
5959
if [ "$SENTRY_ALLOW_FAILURE" == true ]; then
60+
echo "$SENTRY_XCODE_COMMAND_OUTPUT" | awk '{print "warning: sentry-cli - " $0}'
6061
echo "warning: sentry-cli - Source maps upload failed, but continuing build because SENTRY_ALLOW_FAILURE=true"
61-
echo "warning: sentry-cli - $SENTRY_XCODE_COMMAND_OUTPUT"
6262
else
63+
echo "$SENTRY_XCODE_COMMAND_OUTPUT" | awk '{print "error: sentry-cli - " $0}'
6364
echo "error: sentry-cli - To disable source maps auto upload, set SENTRY_DISABLE_AUTO_UPLOAD=true in your environment variables. Or to allow failing upload, set SENTRY_ALLOW_FAILURE=true"
64-
echo "error: sentry-cli - $SENTRY_XCODE_COMMAND_OUTPUT"
6565
exitCode=1
6666
fi
6767
fi

yarn.lock

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20059,14 +20059,14 @@ __metadata:
2005920059
languageName: node
2006020060
linkType: hard
2006120061

20062-
"fast-xml-parser@npm:^4.0.12, fast-xml-parser@npm:^4.2.4, fast-xml-parser@npm:^4.4.1":
20063-
version: 4.4.1
20064-
resolution: "fast-xml-parser@npm:4.4.1"
20062+
"fast-xml-parser@npm:^5.3.6":
20063+
version: 5.3.7
20064+
resolution: "fast-xml-parser@npm:5.3.7"
2006520065
dependencies:
20066-
strnum: "npm:^1.0.5"
20066+
strnum: ^2.1.2
2006720067
bin:
2006820068
fxparser: src/cli/cli.js
20069-
checksum: f440c01cd141b98789ae777503bcb6727393296094cc82924ae9f88a5b971baa4eec7e65306c7e07746534caa661fc83694ff437d9012dc84dee39dfbfaab947
20069+
checksum: 0bb307bc63a01c079ae28b6b62eeea0007d787e6ab47dfca493f40305f78aeedea2906b2632bf0eb9d4d868e748c77c70393a808441fb5949c9d2e6f8f2825f0
2007020070
languageName: node
2007120071
linkType: hard
2007220072

@@ -24519,10 +24519,10 @@ __metadata:
2451924519
languageName: node
2452024520
linkType: hard
2452124521

24522-
"lodash@npm:4.17.21, lodash@npm:^4.0.0, lodash@npm:^4.17.11, lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.2.1":
24523-
version: 4.17.21
24524-
resolution: "lodash@npm:4.17.21"
24525-
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
24522+
"lodash@npm:^4.17.23":
24523+
version: 4.17.23
24524+
resolution: "lodash@npm:4.17.23"
24525+
checksum: 7daad39758a72872e94651630fbb54ba76868f904211089721a64516ce865506a759d9ad3d8ff22a2a49a50a09db5d27c36f22762d21766e47e3ba918d6d7bab
2452624526
languageName: node
2452724527
linkType: hard
2452824528

@@ -28920,21 +28920,12 @@ __metadata:
2892028920
languageName: node
2892128921
linkType: hard
2892228922

28923-
"qs@npm:6.11.0":
28924-
version: 6.11.0
28925-
resolution: "qs@npm:6.11.0"
28926-
dependencies:
28927-
side-channel: ^1.0.4
28928-
checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
28929-
languageName: node
28930-
linkType: hard
28931-
28932-
"qs@npm:6.13.0":
28933-
version: 6.13.0
28934-
resolution: "qs@npm:6.13.0"
28923+
"qs@npm:^6.14.2":
28924+
version: 6.15.0
28925+
resolution: "qs@npm:6.15.0"
2893528926
dependencies:
28936-
side-channel: ^1.0.6
28937-
checksum: e9404dc0fc2849245107108ce9ec2766cde3be1b271de0bf1021d049dc5b98d1a2901e67b431ac5509f865420a7ed80b7acb3980099fe1c118a1c5d2e1432ad8
28927+
side-channel: ^1.1.0
28928+
checksum: 65e797e3747fa1092e062da7b3e0684a9194e07ccab3a9467d416d2579d2feab0adf3aa4b94446e9f69ba7426589a8728f78a10a549308c97563a79d1c0d8595
2893828929
languageName: node
2893928930
linkType: hard
2894028931

@@ -32522,10 +32513,10 @@ __metadata:
3252232513
languageName: node
3252332514
linkType: hard
3252432515

32525-
"strnum@npm:^1.0.5":
32526-
version: 1.0.5
32527-
resolution: "strnum@npm:1.0.5"
32528-
checksum: 651b2031db5da1bf4a77fdd2f116a8ac8055157c5420f5569f64879133825915ad461513e7202a16d7fec63c54fd822410d0962f8ca12385c4334891b9ae6dd2
32516+
"strnum@npm:^2.1.2":
32517+
version: 2.1.2
32518+
resolution: "strnum@npm:2.1.2"
32519+
checksum: 755e8327ee68201d700169ceee097ea52da7b675f4521442a8dbd1517021f89a91399213c446d1bf3d1123ca1896a76f0ff076d04c88ffe6056e78828ce6f60a
3252932520
languageName: node
3253032521
linkType: hard
3253132522

0 commit comments

Comments
 (0)