Skip to content

Commit be7b567

Browse files
committed
Always use local e-c-ts, regardless of transitive dependencies
1 parent f929bfb commit be7b567

File tree

2 files changed

+16
-77
lines changed

2 files changed

+16
-77
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@
121121
"typescript": "4.5.5"
122122
},
123123
"resolutions": {
124-
"hawk": "7"
124+
"hawk": "7",
125+
"ember-cli-typescript": "link:."
125126
},
126127
"engines": {
127128
"node": ">= 12.*"

yarn.lock

Lines changed: 14 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
browserslist "^4.21.3"
8585
semver "^6.3.0"
8686

87-
"@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.19.0", "@babel/helper-create-class-features-plugin@^7.5.5":
87+
"@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.19.0":
8888
version "7.19.0"
8989
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
9090
integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
@@ -288,7 +288,7 @@
288288
"@babel/helper-remap-async-to-generator" "^7.12.1"
289289
"@babel/plugin-syntax-async-generators" "^7.8.0"
290290

291-
"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1":
291+
"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1":
292292
version "7.12.1"
293293
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
294294
integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
@@ -486,7 +486,7 @@
486486
dependencies:
487487
"@babel/helper-plugin-utils" "^7.10.4"
488488

489-
"@babel/plugin-syntax-typescript@^7.18.6", "@babel/plugin-syntax-typescript@^7.2.0":
489+
"@babel/plugin-syntax-typescript@^7.18.6":
490490
version "7.18.6"
491491
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
492492
integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
@@ -753,23 +753,6 @@
753753
"@babel/helper-plugin-utils" "^7.19.0"
754754
"@babel/plugin-syntax-typescript" "^7.18.6"
755755

756-
"@babel/plugin-transform-typescript@~7.4.0":
757-
version "7.4.5"
758-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
759-
integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
760-
dependencies:
761-
"@babel/helper-plugin-utils" "^7.0.0"
762-
"@babel/plugin-syntax-typescript" "^7.2.0"
763-
764-
"@babel/plugin-transform-typescript@~7.5.0":
765-
version "7.5.5"
766-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
767-
integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
768-
dependencies:
769-
"@babel/helper-create-class-features-plugin" "^7.5.5"
770-
"@babel/helper-plugin-utils" "^7.0.0"
771-
"@babel/plugin-syntax-typescript" "^7.2.0"
772-
773756
"@babel/plugin-transform-unicode-escapes@^7.12.1":
774757
version "7.12.1"
775758
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
@@ -1964,7 +1947,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
19641947
"@types/color-name" "^1.1.1"
19651948
color-convert "^2.0.1"
19661949

1967-
ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
1950+
ansi-to-html@^0.6.15:
19681951
version "0.6.15"
19691952
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
19701953
integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
@@ -4927,7 +4910,7 @@ [email protected]:
49274910
ember-cli-babel "^7.22.1"
49284911
git-repo-info "^2.1.1"
49294912

4930-
ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
4913+
ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
49314914
version "1.1.1"
49324915
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
49334916
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
@@ -5123,39 +5106,16 @@ ember-cli-test-loader@^2.2.0:
51235106
ember-cli-babel "^6.8.1"
51245107

51255108
5126-
version "3.0.0"
5127-
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
5128-
integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
5129-
dependencies:
5130-
"@babel/plugin-transform-typescript" "~7.5.0"
5131-
ansi-to-html "^0.6.6"
5132-
debug "^4.0.0"
5133-
ember-cli-babel-plugin-helpers "^1.0.0"
5134-
execa "^2.0.0"
5135-
fs-extra "^8.0.0"
5136-
resolve "^1.5.0"
5137-
rsvp "^4.8.1"
5138-
semver "^6.0.0"
5139-
stagehand "^1.0.0"
5140-
walk-sync "^2.0.0"
5109+
version "0.0.0"
5110+
uid ""
51415111

51425112
ember-cli-typescript@^2.0.2:
5143-
version "2.0.2"
5144-
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
5145-
integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
5146-
dependencies:
5147-
"@babel/plugin-proposal-class-properties" "^7.1.0"
5148-
"@babel/plugin-transform-typescript" "~7.4.0"
5149-
ansi-to-html "^0.6.6"
5150-
debug "^4.0.0"
5151-
ember-cli-babel-plugin-helpers "^1.0.0"
5152-
execa "^1.0.0"
5153-
fs-extra "^7.0.0"
5154-
resolve "^1.5.0"
5155-
rsvp "^4.8.1"
5156-
semver "^6.0.0"
5157-
stagehand "^1.0.0"
5158-
walk-sync "^1.0.0"
5113+
version "0.0.0"
5114+
uid ""
5115+
5116+
"ember-cli-typescript@link:.":
5117+
version "0.0.0"
5118+
uid ""
51595119

51605120
51615121
version "3.0.0"
@@ -5911,21 +5871,6 @@ execa@^1.0.0:
59115871
signal-exit "^3.0.0"
59125872
strip-eof "^1.0.0"
59135873

5914-
execa@^2.0.0:
5915-
version "2.1.0"
5916-
resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
5917-
integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
5918-
dependencies:
5919-
cross-spawn "^7.0.0"
5920-
get-stream "^5.0.0"
5921-
is-stream "^2.0.0"
5922-
merge-stream "^2.0.0"
5923-
npm-run-path "^3.0.0"
5924-
onetime "^5.1.0"
5925-
p-finally "^2.0.0"
5926-
signal-exit "^3.0.2"
5927-
strip-final-newline "^2.0.0"
5928-
59295874
execa@^3.0.0, execa@^3.4.0:
59305875
version "3.4.0"
59315876
resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
@@ -9429,13 +9374,6 @@ npm-run-path@^2.0.0:
94299374
dependencies:
94309375
path-key "^2.0.0"
94319376

9432-
npm-run-path@^3.0.0:
9433-
version "3.1.0"
9434-
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
9435-
integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
9436-
dependencies:
9437-
path-key "^3.0.0"
9438-
94399377
npm-run-path@^4.0.0, npm-run-path@^4.0.1:
94409378
version "4.0.1"
94419379
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -12639,7 +12577,7 @@ walk-sync@^1.0.0, walk-sync@^1.1.3:
1263912577
ensure-posix-path "^1.1.0"
1264012578
matcher-collection "^1.1.1"
1264112579

12642-
walk-sync@^2.0.0, walk-sync@^2.0.2, walk-sync@^2.2.0:
12580+
walk-sync@^2.0.2, walk-sync@^2.2.0:
1264312581
version "2.2.0"
1264412582
resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
1264512583
integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==

0 commit comments

Comments
 (0)