Skip to content

Commit 1941536

Browse files
committed
Remove yarn 2 and upgrade package
1 parent 4643fcf commit 1941536

File tree

7 files changed

+7466
-11551
lines changed

7 files changed

+7466
-11551
lines changed

.eslintrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"root": true,
33
"parser": "@typescript-eslint/parser",
44
"plugins": [
5-
"prettier",
65
"security",
76
"@typescript-eslint"
87
],
@@ -12,14 +11,12 @@
1211
},
1312
"ignorePatterns": ["./node_modules/*"],
1413
"extends": [
15-
"prettier",
1614
"eslint:recommended",
1715
"plugin:security/recommended",
1816
"plugin:@typescript-eslint/recommended",
1917
"plugin:@typescript-eslint/eslint-recommended"
2018
],
2119
"rules": {
22-
"prettier/prettier": 2,
2320
"no-error-on-unmatched-pattern": "off",
2421
"@typescript-eslint/no-explicit-any": "off", // TODO: Remove this.
2522
"no-return-await": "off",

.gitattributes

Lines changed: 0 additions & 2 deletions
This file was deleted.

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 0 additions & 77 deletions
This file was deleted.

.yarn/releases/yarn-sources.cjs

Lines changed: 0 additions & 631 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

package.json

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"transpile": "tsc",
2020
"clean": "rimraf build",
2121
"sync-env": "sync-dotenv",
22-
"build": "run-s clean lint:fix transpile",
22+
"build": "concurrently 'yarn clean' 'yarn lint:fix' 'yarn transpile'",
2323
"send:mail": "ts-node scripts/mail-test",
2424
"load:fake": "NODE_ENV=test ts-node scripts/fake-loader",
2525
"test": "NODE_ENV=test yarn migrate && NODE_ENV=test jest --forceExit --detectOpenHandles --maxWorkers=1 --verbose",
@@ -57,62 +57,54 @@
5757
"bcrypt": "^5.0.1",
5858
"bookshelf": "^1.2.0",
5959
"bookshelf-case-converter-plugin": "^2.0.0",
60-
"chalk": "^4.1.1",
6160
"cors": "^2.8.5",
6261
"date-fns": "^2.11.1",
63-
"dotenv": "^10.0.0",
64-
"express": "^4.17.1",
62+
"dotenv": "^16.0.1",
63+
"express": "4.17.1",
6564
"helmet": "^4.6.0",
6665
"http-status-codes": "^2.1.4",
67-
"joi": "^14.3.1",
66+
"joi": "^17.6.0",
6867
"jsonwebtoken": "^8.5.1",
6968
"knex": "^0.21.19",
70-
"lodash": "^4.17.21",
7169
"morgan": "^1.10.0",
7270
"nodemailer": "^6.6.3",
7371
"nodemailer-markdown": "^1.0.3",
7472
"pg": "^8.6.0",
75-
"uuid": "^8.3.2",
7673
"winston": "^3.3.3",
7774
"winston-daily-rotate-file": "^4.5.5"
7875
},
7976
"devDependencies": {
8077
"@babel/core": "^7.14.8",
8178
"@babel/preset-env": "^7.14.8",
8279
"@babel/preset-typescript": "^7.14.5",
80+
"@faker-js/faker": "^7.3.0",
8381
"@types/bcrypt": "^5.0.0",
8482
"@types/bookshelf": "^1.2.2",
8583
"@types/cors": "^2.8.12",
8684
"@types/express": "^4.17.13",
87-
"@types/faker": "^5.5.7",
8885
"@types/jest": "^26.0.24",
89-
"@types/joi": "^14.3.4",
9086
"@types/jsonwebtoken": "^8.5.4",
91-
"@types/lodash": "^4.14.171",
9287
"@types/morgan": "^1.9.3",
9388
"@types/node": "^16.4.0",
9489
"@types/nodemailer": "^6.4.4",
9590
"@types/supertest": "^2.0.11",
96-
"@types/uuid": "^8.3.1",
97-
"@typescript-eslint/eslint-plugin": "^4.28.4",
98-
"@typescript-eslint/parser": "^4.28.4",
91+
"@typescript-eslint/eslint-plugin": "^5.30.0",
92+
"@typescript-eslint/parser": "^5.30.0",
9993
"babel-jest": "^27.0.6",
100-
"eslint": "^7.31.0",
101-
"eslint-config-prettier": "^8.3.0",
102-
"eslint-plugin-prettier": "^3.4.0",
94+
"chalk": "^5.0.1",
95+
"concurrently": "^7.2.2",
96+
"eslint": "^8.18.0",
10397
"eslint-plugin-security": "^1.4.0",
104-
"faker": "^5.5.3",
105-
"husky": "^7.0.1",
98+
"husky": "^8.0.1",
10699
"jest": "^27.0.6",
107100
"lint-staged": "^11.0.1",
108101
"nodemon": "^2.0.12",
109-
"npm-run-all": "^4.1.5",
110102
"prettier": "^2.3.2",
111103
"rimraf": "^3.0.2",
112104
"supertest": "^6.1.4",
113105
"sync-dotenv": "^2.6.2",
114-
"ts-node": "^10.1.0",
115-
"tslib": "^2.3.0",
116-
"typescript": "^4.3.5"
106+
"ts-node": "^10.8.1",
107+
"tslib": "^2.4.0",
108+
"typescript": "^4.7.4"
117109
}
118110
}

0 commit comments

Comments
 (0)