Skip to content

Commit 4616749

Browse files
dfreemanchriskrycho
authored andcommittedOct 26, 2022
Always use local e-c-ts, regardless of transitive dependencies
(cherry picked from commit be7b567)
1 parent 50f43fb commit 4616749

File tree

2 files changed

+27
-86
lines changed

2 files changed

+27
-86
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: 25 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,18 @@
7070
browserslist "^4.12.0"
7171
semver "^5.5.0"
7272

73-
"@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.5.5":
74-
version "7.12.1"
75-
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
76-
integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
77-
dependencies:
78-
"@babel/helper-function-name" "^7.10.4"
79-
"@babel/helper-member-expression-to-functions" "^7.12.1"
80-
"@babel/helper-optimise-call-expression" "^7.10.4"
81-
"@babel/helper-replace-supers" "^7.12.1"
82-
"@babel/helper-split-export-declaration" "^7.10.4"
73+
"@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.12.1":
74+
version "7.19.0"
75+
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
76+
integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
77+
dependencies:
78+
"@babel/helper-annotate-as-pure" "^7.18.6"
79+
"@babel/helper-environment-visitor" "^7.18.9"
80+
"@babel/helper-function-name" "^7.19.0"
81+
"@babel/helper-member-expression-to-functions" "^7.18.9"
82+
"@babel/helper-optimise-call-expression" "^7.18.6"
83+
"@babel/helper-replace-supers" "^7.18.9"
84+
"@babel/helper-split-export-declaration" "^7.18.6"
8385

8486
"@babel/helper-create-regexp-features-plugin@^7.12.1":
8587
version "7.12.1"
@@ -270,7 +272,7 @@
270272
"@babel/helper-remap-async-to-generator" "^7.12.1"
271273
"@babel/plugin-syntax-async-generators" "^7.8.0"
272274

273-
"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1":
275+
"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1":
274276
version "7.12.1"
275277
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
276278
integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
@@ -468,7 +470,7 @@
468470
dependencies:
469471
"@babel/helper-plugin-utils" "^7.10.4"
470472

471-
"@babel/plugin-syntax-typescript@^7.12.1", "@babel/plugin-syntax-typescript@^7.2.0":
473+
"@babel/plugin-syntax-typescript@^7.12.1":
472474
version "7.12.1"
473475
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
474476
integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
@@ -736,23 +738,6 @@
736738
"@babel/helper-plugin-utils" "^7.10.4"
737739
"@babel/plugin-syntax-typescript" "^7.12.1"
738740

739-
"@babel/plugin-transform-typescript@~7.4.0":
740-
version "7.4.5"
741-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
742-
integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
743-
dependencies:
744-
"@babel/helper-plugin-utils" "^7.0.0"
745-
"@babel/plugin-syntax-typescript" "^7.2.0"
746-
747-
"@babel/plugin-transform-typescript@~7.5.0":
748-
version "7.5.5"
749-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
750-
integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
751-
dependencies:
752-
"@babel/helper-create-class-features-plugin" "^7.5.5"
753-
"@babel/helper-plugin-utils" "^7.0.0"
754-
"@babel/plugin-syntax-typescript" "^7.2.0"
755-
756741
"@babel/plugin-transform-unicode-escapes@^7.12.1":
757742
version "7.12.1"
758743
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
@@ -1891,7 +1876,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
18911876
"@types/color-name" "^1.1.1"
18921877
color-convert "^2.0.1"
18931878

1894-
ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
1879+
ansi-to-html@^0.6.15:
18951880
version "0.6.15"
18961881
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
18971882
integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
@@ -4826,7 +4811,7 @@ ember-cli-app-version@4.0.0:
48264811
ember-cli-babel "^7.22.1"
48274812
git-repo-info "^2.1.1"
48284813

4829-
ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
4814+
ember-cli-babel-plugin-helpers@^1.1.0, ember-cli-babel-plugin-helpers@^1.1.1:
48304815
version "1.1.1"
48314816
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
48324817
integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
@@ -5022,39 +5007,16 @@ ember-cli-test-loader@^2.2.0:
50225007
ember-cli-babel "^6.8.1"
50235008

50245009
ember-cli-typescript@3.0.0:
5025-
version "3.0.0"
5026-
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
5027-
integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
5028-
dependencies:
5029-
"@babel/plugin-transform-typescript" "~7.5.0"
5030-
ansi-to-html "^0.6.6"
5031-
debug "^4.0.0"
5032-
ember-cli-babel-plugin-helpers "^1.0.0"
5033-
execa "^2.0.0"
5034-
fs-extra "^8.0.0"
5035-
resolve "^1.5.0"
5036-
rsvp "^4.8.1"
5037-
semver "^6.0.0"
5038-
stagehand "^1.0.0"
5039-
walk-sync "^2.0.0"
5010+
version "0.0.0"
5011+
uid ""
50405012

50415013
ember-cli-typescript@^2.0.2:
5042-
version "2.0.2"
5043-
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
5044-
integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
5045-
dependencies:
5046-
"@babel/plugin-proposal-class-properties" "^7.1.0"
5047-
"@babel/plugin-transform-typescript" "~7.4.0"
5048-
ansi-to-html "^0.6.6"
5049-
debug "^4.0.0"
5050-
ember-cli-babel-plugin-helpers "^1.0.0"
5051-
execa "^1.0.0"
5052-
fs-extra "^7.0.0"
5053-
resolve "^1.5.0"
5054-
rsvp "^4.8.1"
5055-
semver "^6.0.0"
5056-
stagehand "^1.0.0"
5057-
walk-sync "^1.0.0"
5014+
version "0.0.0"
5015+
uid ""
5016+
5017+
"ember-cli-typescript@link:.":
5018+
version "0.0.0"
5019+
uid ""
50585020

50595021
ember-cli-uglify@3.0.0:
50605022
version "3.0.0"
@@ -5823,21 +5785,6 @@ execa@^1.0.0:
58235785
signal-exit "^3.0.0"
58245786
strip-eof "^1.0.0"
58255787

5826-
execa@^2.0.0:
5827-
version "2.1.0"
5828-
resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
5829-
integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
5830-
dependencies:
5831-
cross-spawn "^7.0.0"
5832-
get-stream "^5.0.0"
5833-
is-stream "^2.0.0"
5834-
merge-stream "^2.0.0"
5835-
npm-run-path "^3.0.0"
5836-
onetime "^5.1.0"
5837-
p-finally "^2.0.0"
5838-
signal-exit "^3.0.2"
5839-
strip-final-newline "^2.0.0"
5840-
58415788
execa@^3.0.0, execa@^3.4.0:
58425789
version "3.4.0"
58435790
resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
@@ -9248,13 +9195,6 @@ npm-run-path@^2.0.0:
92489195
dependencies:
92499196
path-key "^2.0.0"
92509197

9251-
npm-run-path@^3.0.0:
9252-
version "3.1.0"
9253-
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
9254-
integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
9255-
dependencies:
9256-
path-key "^3.0.0"
9257-
92589198
npm-run-path@^4.0.0:
92599199
version "4.0.1"
92609200
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -12382,7 +12322,7 @@ walk-sync@^1.0.0, walk-sync@^1.1.3:
1238212322
ensure-posix-path "^1.1.0"
1238312323
matcher-collection "^1.1.1"
1238412324

12385-
walk-sync@^2.0.0, walk-sync@^2.0.2, walk-sync@^2.2.0:
12325+
walk-sync@^2.0.2, walk-sync@^2.2.0:
1238612326
version "2.2.0"
1238712327
resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
1238812328
integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==

0 commit comments

Comments
 (0)
Please sign in to comment.