Skip to content

Commit 09831fb

Browse files
authored
Merge pull request #1061 from merico-dev/1016-upgrade-yarn-from-v1-to-v3
1016 upgrade yarn from v1 to v3
2 parents 6df4c51 + 25142f7 commit 09831fb

File tree

6 files changed

+19559
-17853
lines changed

6 files changed

+19559
-17853
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ node_modules
1111
dist
1212
dist-ssr
1313
*.local
14-
dashboard/packages/**/yarn.lock
15-
dashboard/packages/**/stats.html
14+
.yarn/
1615

1716
.env
1817

@@ -34,4 +33,5 @@ api/src/preset/dashboards
3433
api/src/fs_cache
3534

3635
api/.jest_cache
37-
api/coverage*
36+
api/coverage*
37+
api/yarn.lock

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

api/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"@types/express": "^4.17.13",
7171
"@types/fs-extra": "^11.0.1",
7272
"@types/i18n": "^0.13.6",
73-
"@types/inversify": "^2.0.33",
7473
"@types/jest": "^29.4.0",
7574
"@types/jsonwebtoken": "^8.5.8",
7675
"@types/lodash": "^4.14.182",

0 commit comments

Comments
 (0)