Skip to content

Commit 57d8cbb

Browse files
authored
Reorder paths so that @components takes priority (#17577)
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
1 parent 4143e4a commit 57d8cbb

3 files changed

Lines changed: 18 additions & 15 deletions

File tree

pkg/harvester-manager/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
"scripthost"
3030
],
3131
"paths": {
32+
"@components/*": [
33+
"../../pkg/rancher-components/src/components/*"
34+
],
3235
"@shell/core/*": [
3336
"../../shell/core/*"
3437
],

shell/tsconfig.paths.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"compilerOptions": {
33
"paths": {
4-
"~/*": [
5-
"../*"
6-
],
7-
"@/*": [
8-
"../*"
4+
"@components/*": [
5+
"./rancher-components/*",
6+
"../pkg/rancher-components/src/components/*"
97
],
108
"@shell/*": [
119
"../shell/*"
1210
],
1311
"@pkg/*": [
1412
"../shell/pkg/*"
1513
],
16-
"@components/*": [
17-
"./rancher-components/*",
18-
"../pkg/rancher-components/src/components/*"
14+
"~/*": [
15+
"../*"
16+
],
17+
"@/*": [
18+
"../*"
1919
]
2020
},
2121
},

tsconfig.paths.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"compilerOptions": {
33
"paths": {
4-
"~/*": [
5-
"*"
6-
],
7-
"@/*": [
8-
"*"
4+
"@components/*": [
5+
"pkg/rancher-components/src/components/*"
96
],
107
"@shell/*": [
118
"shell/*"
129
],
1310
"@pkg/*": [
1411
"shell/pkg/*"
1512
],
16-
"@components/*": [
17-
"pkg/rancher-components/src/components/*"
13+
"~/*": [
14+
"*"
15+
],
16+
"@/*": [
17+
"*"
1818
]
1919
},
2020
},

0 commit comments

Comments
 (0)