Skip to content

Commit c6ee2fe

Browse files
committed
Merge branch 'v2' into v2-cleanup
2 parents 659f646 + e8f3a86 commit c6ee2fe

File tree

2 files changed

+6
-86
lines changed

2 files changed

+6
-86
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"eslint-plugin-ember": "^5.2.0",
8888
"eslint-plugin-node": "^7.0.1",
8989
"esprima": "^4.0.0",
90-
"got": "^9.2.2",
90+
"got": "^8.0.0",
9191
"in-repo-a": "link:tests/dummy/lib/in-repo-a",
9292
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
9393
"loader.js": "^4.7.0",

yarn.lock

Lines changed: 5 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -661,25 +661,11 @@
661661
dependencies:
662662
"@glimmer/di" "^0.2.0"
663663

664-
"@sindresorhus/is@^0.11.0":
665-
version "0.11.0"
666-
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.11.0.tgz#a65970040a5b55c4713452666703b92a6c331fdb"
667-
integrity sha512-i5Zh5+3QARyXtzq3Bd2Lg3aBRFLcgYbNoap3Hyu1uRN8X+D+0JMqqc4uk4XjhNxfVdCnL8WHUA2wxa33QCC50w==
668-
dependencies:
669-
symbol-observable "^1.2.0"
670-
671664
"@sindresorhus/is@^0.7.0":
672665
version "0.7.0"
673666
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
674667
integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
675668

676-
"@szmarczak/http-timer@^1.1.0":
677-
version "1.1.1"
678-
resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.1.tgz#6402258dfe467532b26649ef076b4d11f74fb612"
679-
integrity sha512-WljfOGkmSJe8SUkl+4TPvN2ec0dpUGVyfTBQLoXJUiILs+wBSc4Kvp2N3aAWE4VwwDSLGdmD3/bufS5BgZpVSQ==
680-
dependencies:
681-
defer-to-connect "^1.0.1"
682-
683669
"@types/body-parser@*":
684670
version "1.17.0"
685671
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
@@ -2872,19 +2858,6 @@ cacheable-request@^2.1.1:
28722858
normalize-url "2.0.1"
28732859
responselike "1.0.2"
28742860

2875-
cacheable-request@^5.0.0:
2876-
version "5.1.0"
2877-
resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-5.1.0.tgz#ce0958e977bdb4a5b718464049793b8d4bf7d75d"
2878-
integrity sha512-UCdjX4N/QjymZGpKY7hW4VJsxsVJM+drIiCxPa9aTvFQN5sL2+kJCYyeys8f2W0dJ0sU6Et54Ovl0sAmCpHHsA==
2879-
dependencies:
2880-
clone-response "^1.0.2"
2881-
get-stream "^4.0.0"
2882-
http-cache-semantics "^4.0.0"
2883-
keyv "^3.0.0"
2884-
lowercase-keys "^1.0.1"
2885-
normalize-url "^3.1.0"
2886-
responselike "^1.0.2"
2887-
28882861
calculate-cache-key-for-tree@^1.1.0:
28892862
version "1.1.0"
28902863
resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.1.0.tgz#0c3e42c9c134f3c9de5358c0f16793627ea976d6"
@@ -3171,7 +3144,7 @@ cliui@^4.0.0:
31713144
strip-ansi "^4.0.0"
31723145
wrap-ansi "^2.0.0"
31733146

3174-
[email protected], clone-response@^1.0.2:
3147+
31753148
version "1.0.2"
31763149
resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
31773150
integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
@@ -3555,11 +3528,6 @@ defaults@^1.0.3:
35553528
dependencies:
35563529
clone "^1.0.2"
35573530

3558-
defer-to-connect@^1.0.1:
3559-
version "1.0.1"
3560-
resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.1.tgz#41ec1dd670dc4c6dcbe7e54c9e44d784d025fe63"
3561-
integrity sha512-2e0FJesseUqQj671gvZWfUyxpnFx/5n4xleamlpCD3U6Fm5dh5qzmmLNxNhtmHF06+SYVHH8QU6FACffYTnj0Q==
3562-
35633531
define-properties@^1.1.2:
35643532
version "1.1.3"
35653533
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -5500,7 +5468,7 @@ got@^6.7.1:
55005468
unzip-response "^2.0.1"
55015469
url-parse-lax "^1.0.0"
55025470

5503-
got@^8.0.1:
5471+
got@^8.0.0, got@^8.0.1:
55045472
version "8.3.2"
55055473
resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
55065474
integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
@@ -5523,22 +5491,6 @@ got@^8.0.1:
55235491
url-parse-lax "^3.0.0"
55245492
url-to-options "^1.0.1"
55255493

5526-
got@^9.2.2:
5527-
version "9.2.2"
5528-
resolved "https://registry.yarnpkg.com/got/-/got-9.2.2.tgz#d6cb73f40d4cb512864c2f66f275f258ab43aa25"
5529-
integrity sha512-XLXmtO1QxLuzj6t4JBClWD1NI/bMvsR9utYl0yyPg49eUJjqU7HaQhPDvSVGwYoSbAqsRfe5aNZXHl1Zctzwmw==
5530-
dependencies:
5531-
"@sindresorhus/is" "^0.11.0"
5532-
"@szmarczak/http-timer" "^1.1.0"
5533-
cacheable-request "^5.0.0"
5534-
decompress-response "^3.3.0"
5535-
duplexer3 "^0.1.4"
5536-
get-stream "^4.0.0"
5537-
mimic-response "^1.0.1"
5538-
p-cancelable "^0.5.0"
5539-
to-readable-stream "^1.0.0"
5540-
url-parse-lax "^3.0.0"
5541-
55425494
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
55435495
version "4.1.11"
55445496
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -5746,11 +5698,6 @@ [email protected]:
57465698
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
57475699
integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
57485700

5749-
http-cache-semantics@^4.0.0:
5750-
version "4.0.0"
5751-
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#2d0069a73c36c80e3297bc3a0cadd669b78a69ce"
5752-
integrity sha512-NtexGRtaV5z3ZUX78W9UDTOJPBdpqms6RmwQXmOhHws7CuQK3cqIoQtnmeqi1VvVD6u6eMMRL0sKE9BCZXTDWQ==
5753-
57545701
57555702
version "1.6.2"
57565703
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
@@ -6438,13 +6385,6 @@ [email protected]:
64386385
dependencies:
64396386
json-buffer "3.0.0"
64406387

6441-
keyv@^3.0.0:
6442-
version "3.1.0"
6443-
resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
6444-
integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
6445-
dependencies:
6446-
json-buffer "3.0.0"
6447-
64486388
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
64496389
version "3.2.2"
64506390
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -6987,7 +6927,7 @@ [email protected]:
69876927
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
69886928
integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
69896929

6990-
lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
6930+
lowercase-keys@^1.0.0:
69916931
version "1.0.1"
69926932
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
69936933
integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
@@ -7246,7 +7186,7 @@ mimic-fn@^1.0.0:
72467186
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
72477187
integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
72487188

7249-
mimic-response@^1.0.0, mimic-response@^1.0.1:
7189+
mimic-response@^1.0.0:
72507190
version "1.0.1"
72517191
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
72527192
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -7545,11 +7485,6 @@ [email protected]:
75457485
query-string "^5.0.1"
75467486
sort-keys "^2.0.0"
75477487

7548-
normalize-url@^3.1.0:
7549-
version "3.3.0"
7550-
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
7551-
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
7552-
75537488
npm-bundled@^1.0.1:
75547489
version "1.0.5"
75557490
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@@ -7765,11 +7700,6 @@ p-cancelable@^0.4.0:
77657700
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
77667701
integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
77677702

7768-
p-cancelable@^0.5.0:
7769-
version "0.5.1"
7770-
resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.5.1.tgz#b797a33c43c645cd70d5a838b1d25352b9e29e75"
7771-
integrity sha512-vkOBXQgQb03QTOoMeeB5/uS2W3iafXzQLaIh7ChHjEb8DDT06sWJizhdOACL1Sittl5dFqsyumJ4rD1WUF8Isw==
7772-
77737703
p-finally@^1.0.0:
77747704
version "1.0.0"
77757705
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -8554,7 +8484,7 @@ resolve@^1.3.2, resolve@^1.6.0, resolve@^1.7.1, resolve@^1.8.1:
85548484
dependencies:
85558485
path-parse "^1.0.5"
85568486

8557-
[email protected], responselike@^1.0.2:
8487+
85588488
version "1.0.2"
85598489
resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
85608490
integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
@@ -9295,11 +9225,6 @@ supports-color@^5.3.0:
92959225
dependencies:
92969226
has-flag "^3.0.0"
92979227

9298-
symbol-observable@^1.2.0:
9299-
version "1.2.0"
9300-
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
9301-
integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
9302-
93039228
symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
93049229
version "1.2.0"
93059230
resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393"
@@ -9506,11 +9431,6 @@ to-object-path@^0.3.0:
95069431
dependencies:
95079432
kind-of "^3.0.2"
95089433

9509-
to-readable-stream@^1.0.0:
9510-
version "1.0.0"
9511-
resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
9512-
integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
9513-
95149434
to-regex-range@^2.1.0:
95159435
version "2.1.1"
95169436
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"

0 commit comments

Comments
 (0)