Skip to content

Commit 52ae586

Browse files
committed
feature #1200 Allow TypeScript 5 (jmsche)
This PR was squashed before being merged into the main branch. Discussion ---------- Allow TypeScript 5 Hi, This PR allows to use TypeScript 5 without having any warning message. The first commit is due to a local `yarn install` before making any changes. I tried running it using the `--frozen-lockfile` flag but it wouldn't pass. Commits ------- 2570800 Allow TypeScript 5
2 parents a2b14f3 + 2570800 commit 52ae586

File tree

2 files changed

+45
-41
lines changed

2 files changed

+45
-41
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"svelte": "^3.50.0",
9494
"svelte-loader": "^3.1.0",
9595
"ts-loader": "^9.0.0",
96-
"typescript": "^4.2.2",
96+
"typescript": "^4.2.2 || ^5.0.0",
9797
"vue": "^3.2.14",
9898
"vue-loader": "^17.0.0",
9999
"vue-template-compiler": "^2.5",
@@ -127,7 +127,7 @@
127127
"stylus": "^0.58.1",
128128
"stylus-loader": "^7.0.0",
129129
"ts-loader": "^9.0.0",
130-
"typescript": "^4.2.2",
130+
"typescript": "^4.2.2 || ^5.0.0",
131131
"vue": "^2.6 || ^3.2.14",
132132
"vue-loader": "^15.0.11 || ^17.0.0",
133133
"vue-template-compiler": "^2.5",

yarn.lock

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,22 +1696,20 @@
16961696
"@webassemblyjs/ast" "1.11.1"
16971697
"@xtuc/long" "4.2.2"
16981698

1699-
"@webpack-cli/configtest@^1.2.0":
1700-
version "1.2.0"
1701-
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
1702-
integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
1699+
"@webpack-cli/configtest@^2.0.1":
1700+
version "2.0.1"
1701+
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
1702+
integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
17031703

1704-
"@webpack-cli/info@^1.5.0":
1705-
version "1.5.0"
1706-
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
1707-
integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
1708-
dependencies:
1709-
envinfo "^7.7.3"
1704+
"@webpack-cli/info@^2.0.1":
1705+
version "2.0.1"
1706+
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
1707+
integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
17101708

1711-
"@webpack-cli/serve@^1.7.0":
1712-
version "1.7.0"
1713-
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
1714-
integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
1709+
"@webpack-cli/serve@^2.0.1":
1710+
version "2.0.1"
1711+
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
1712+
integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
17151713

17161714
"@xtuc/ieee754@^1.2.0":
17171715
version "1.2.0"
@@ -2388,11 +2386,16 @@ commander@^2.20.0:
23882386
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
23892387
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
23902388

2391-
commander@^7.0.0, commander@^7.2.0:
2389+
commander@^7.2.0:
23922390
version "7.2.0"
23932391
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
23942392
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
23952393

2394+
commander@^9.4.1:
2395+
version "9.5.0"
2396+
resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
2397+
integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
2398+
23962399
commondir@^1.0.1:
23972400
version "1.0.1"
23982401
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -4037,10 +4040,10 @@ internal-slot@^1.0.3:
40374040
has "^1.0.3"
40384041
side-channel "^1.0.4"
40394042

4040-
interpret@^2.2.0:
4041-
version "2.2.0"
4042-
resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
4043-
integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
4043+
interpret@^3.1.1:
4044+
version "3.1.1"
4045+
resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
4046+
integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
40444047

40454048
invariant@^2.2.0:
40464049
version "2.2.4"
@@ -5653,12 +5656,12 @@ readdirp@~3.6.0:
56535656
dependencies:
56545657
picomatch "^2.2.1"
56555658

5656-
rechoir@^0.7.0:
5657-
version "0.7.1"
5658-
resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
5659-
integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
5659+
rechoir@^0.8.0:
5660+
version "0.8.0"
5661+
resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
5662+
integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
56605663
dependencies:
5661-
resolve "^1.9.0"
5664+
resolve "^1.20.0"
56625665

56635666
regenerate-unicode-properties@^10.1.0:
56645667
version "10.1.0"
@@ -5828,7 +5831,7 @@ resolve-url-loader@^5.0.0:
58285831
postcss "^8.2.14"
58295832
source-map "0.6.1"
58305833

5831-
resolve@^1.10.1, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0:
5834+
resolve@^1.10.1, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
58325835
version "1.22.1"
58335836
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
58345837
integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -6528,10 +6531,10 @@ type-is@~1.6.18:
65286531
media-typer "0.3.0"
65296532
mime-types "~2.1.24"
65306533

6531-
typescript@^4.2.2:
6532-
version "4.8.4"
6533-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
6534-
integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
6534+
"typescript@^4.2.2 || ^5.0.0":
6535+
version "5.0.2"
6536+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5"
6537+
integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==
65356538

65366539
uglify-js@^3.1.4:
65376540
version "3.17.3"
@@ -6702,22 +6705,23 @@ webidl-conversions@^4.0.2:
67026705
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
67036706
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
67046707

6705-
webpack-cli@^4.9.1:
6706-
version "4.10.0"
6707-
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
6708-
integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
6708+
"webpack-cli@^4.9.1 || ^5.0.1":
6709+
version "5.0.1"
6710+
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
6711+
integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
67096712
dependencies:
67106713
"@discoveryjs/json-ext" "^0.5.0"
6711-
"@webpack-cli/configtest" "^1.2.0"
6712-
"@webpack-cli/info" "^1.5.0"
6713-
"@webpack-cli/serve" "^1.7.0"
6714+
"@webpack-cli/configtest" "^2.0.1"
6715+
"@webpack-cli/info" "^2.0.1"
6716+
"@webpack-cli/serve" "^2.0.1"
67146717
colorette "^2.0.14"
6715-
commander "^7.0.0"
6718+
commander "^9.4.1"
67166719
cross-spawn "^7.0.3"
6720+
envinfo "^7.7.3"
67176721
fastest-levenshtein "^1.0.12"
67186722
import-local "^3.0.2"
6719-
interpret "^2.2.0"
6720-
rechoir "^0.7.0"
6723+
interpret "^3.1.1"
6724+
rechoir "^0.8.0"
67216725
webpack-merge "^5.7.3"
67226726

67236727
webpack-dev-middleware@^5.3.1:

0 commit comments

Comments
 (0)