Skip to content

Commit 282d028

Browse files
committed
fix: Merge
1 parent 5ac8b2b commit 282d028

File tree

4 files changed

+42
-14
lines changed

4 files changed

+42
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build:es5": "lerna run --stream --concurrency 1 --sort build:es5",
66
"build:esm": "lerna run --stream --concurrency 1 --sort build:esm",
77
"build:watch": "lerna run build:watch --stream --no-sort --concurrency 9999",
8-
"clean": "lerna run --stream clean",
8+
"clean": "lerna run --stream clean && lerna clean --yes",
99
"fix": "lerna run --stream --concurrency 1 fix",
1010
"link:yarn": "lerna run --stream --concurrency 1 link:yarn",
1111
"lint": "lerna run --stream --concurrency 1 lint",

packages/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/types",
3-
"version": "5.8.0-beta.1",
3+
"version": "5.7.1",
44
"description": "Types for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",

packages/utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "5.8.0-beta.1",
19+
"@sentry/types": "5.7.1",
2020
"tslib": "^1.9.3"
2121
},
2222
"devDependencies": {

yarn.lock

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,6 +1092,11 @@
10921092
universal-user-agent "^2.0.0"
10931093
url-template "^2.0.8"
10941094

1095+
"@sentry/types@5.8.0-beta.1":
1096+
version "5.8.0-beta.1"
1097+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.8.0-beta.1.tgz#dc71504ee9e3287bdb4c9ccf2e8d2571147a8713"
1098+
integrity sha512-r7xNKs7ky/E7dF50ZUYJtb43rA/uzAevVZOUxgsSRcxT9p/UV9dwWqwMJECIeGo+jIQmmdG0uu5mvwwdRWnv4w==
1099+
10951100
"@sinonjs/commons@^1", "@sinonjs/commons@^1.4.0":
10961101
version "1.4.0"
10971102
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.4.0.tgz#7b3ec2d96af481d7a0321252e7b1c94724ec5a78"
@@ -1647,7 +1652,7 @@ after@0.8.2:
16471652
version "0.8.2"
16481653
resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
16491654

1650-
agent-base@4, agent-base@4.3.0, agent-base@^4.1.0, agent-base@~4.2.0:
1655+
agent-base@4, agent-base@4.3.0, agent-base@^4.1.0, agent-base@^4.3.0, agent-base@~4.2.0:
16511656
version "4.3.0"
16521657
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
16531658
integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
@@ -3564,7 +3569,7 @@ cookie-signature@1.0.6:
35643569
version "1.0.6"
35653570
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
35663571

3567-
cookie@0.3.1:
3572+
cookie@0.3.1, cookie@^0.3.1:
35683573
version "0.3.1"
35693574
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
35703575

@@ -5482,13 +5487,21 @@ https-browserify@^1.0.0:
54825487
version "1.0.0"
54835488
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
54845489

5485-
https-proxy-agent@2.2.1, https-proxy-agent@^2.2.1:
5490+
https-proxy-agent@^2.2.1:
54865491
version "2.2.1"
54875492
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
54885493
dependencies:
54895494
agent-base "^4.1.0"
54905495
debug "^3.1.0"
54915496

5497+
https-proxy-agent@^3.0.0:
5498+
version "3.0.1"
5499+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81"
5500+
integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==
5501+
dependencies:
5502+
agent-base "^4.3.0"
5503+
debug "^3.1.0"
5504+
54925505
humanize-ms@^1.2.1:
54935506
version "1.2.1"
54945507
resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -7227,7 +7240,7 @@ lru-cache@^5.0.0, lru-cache@^5.1.1:
72277240
dependencies:
72287241
yallist "^3.0.2"
72297242

7230-
lru_map@0.3.3:
7243+
lru_map@^0.3.3:
72317244
version "0.3.3"
72327245
resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
72337246
integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=
@@ -7243,20 +7256,20 @@ magic-string@0.25.1, magic-string@^0.25.1:
72437256
dependencies:
72447257
sourcemap-codec "^1.4.1"
72457258

7259+
magic-string@0.25.2, magic-string@^0.25.2:
7260+
version "0.25.2"
7261+
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
7262+
integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
7263+
dependencies:
7264+
sourcemap-codec "^1.4.4"
7265+
72467266
magic-string@^0.19.0:
72477267
version "0.19.1"
72487268
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201"
72497269
integrity sha1-FNdoATyvLsj96hakmvgvw3fnUgE=
72507270
dependencies:
72517271
vlq "^0.2.1"
72527272

7253-
magic-string@^0.25.2:
7254-
version "0.25.2"
7255-
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
7256-
integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
7257-
dependencies:
7258-
sourcemap-codec "^1.4.4"
7259-
72607273
make-dir@^1.0.0, make-dir@^1.3.0:
72617274
version "1.3.0"
72627275
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8237,6 +8250,13 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
82378250
os-homedir "^1.0.0"
82388251
os-tmpdir "^1.0.0"
82398252

8253+
ospec@3.1.0:
8254+
version "3.1.0"
8255+
resolved "https://registry.yarnpkg.com/ospec/-/ospec-3.1.0.tgz#d36b8e10110f58f63a463df2390a7a73fe9579a8"
8256+
integrity sha512-+nGtjV3vlADp+UGfL51miAh/hB4awPBkQrArhcgG4trAaoA2gKt5bf9w0m9ch9zOr555cHWaCHZEDiBOkNZSxw==
8257+
dependencies:
8258+
glob "^7.1.3"
8259+
82408260
override-require@^1.1.1:
82418261
version "1.1.1"
82428262
resolved "https://registry.yarnpkg.com/override-require/-/override-require-1.1.1.tgz#6ae22fadeb1f850ffb0cf4c20ff7b87e5eb650df"
@@ -9410,6 +9430,14 @@ rollup-plugin-license@^0.8.1:
94109430
mkdirp "0.5.1"
94119431
moment "2.23.0"
94129432

9433+
rollup-plugin-modify@^3.0.0:
9434+
version "3.0.0"
9435+
resolved "https://registry.yarnpkg.com/rollup-plugin-modify/-/rollup-plugin-modify-3.0.0.tgz#5326e11dfec247e8bbdd9507f3da1da1e5c7818b"
9436+
integrity sha512-p/ffs0Y2jz2dEnWjq1oVC7SY37tuS+aP7whoNaQz1EAAOPg+k3vKJo8cMMWx6xpdd0NzhX4y2YF9o/NPu5YR0Q==
9437+
dependencies:
9438+
magic-string "0.25.2"
9439+
ospec "3.1.0"
9440+
94139441
rollup-plugin-node-resolve@^4.2.3:
94149442
version "4.2.3"
94159443
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.3.tgz#638a373a54287d19fcc088fdd1c6fd8a58e4d90a"

0 commit comments

Comments
 (0)