Skip to content

Commit 5dd6097

Browse files
masb0ymasmasb0ymas
authored
Merge pull request #1292 from masb0ymas/dev
Dev
2 parents b87fa99 + de9aa80 commit 5dd6097

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3153
-3050
lines changed

‎.env.docker-production‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ REDIS_PORT=6379
5151
REDIS_PASSWORD=
5252

5353
STORAGE_PROVIDER=minio
54+
STORAGE_HOST= # for minio only
5455
STORAGE_ACCESS_KEY=
5556
STORAGE_SECRET_KEY=
5657
STORAGE_BUCKET_NAME=expresso

‎.env.docker-staging‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ REDIS_PORT=6379
5151
REDIS_PASSWORD=
5252

5353
STORAGE_PROVIDER=minio
54+
STORAGE_HOST= # for minio only
5455
STORAGE_ACCESS_KEY=
5556
STORAGE_SECRET_KEY=
5657
STORAGE_BUCKET_NAME=expresso

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ REDIS_PORT=6379
5151
REDIS_PASSWORD=
5252

5353
STORAGE_PROVIDER=minio
54+
STORAGE_HOST= # for minio only
5455
STORAGE_ACCESS_KEY=
5556
STORAGE_SECRET_KEY=
5657
STORAGE_BUCKET_NAME=expresso

‎.eslintrc.js‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,7 @@ module.exports = {
2121
'import/no-unresolved': 'off',
2222
'new-cap': 'off',
2323
'no-new': 'off',
24-
'import/extensions': [
25-
'error',
26-
'ignorePackages',
27-
{
28-
js: 'never',
29-
jsx: 'never',
30-
ts: 'never',
31-
tsx: 'never',
32-
mjs: 'never',
33-
},
34-
],
24+
'import/extensions': 'off',
3525
'no-useless-constructor': 'off',
3626
'@typescript-eslint/no-misused-promises': 'off',
3727
'@typescript-eslint/strict-boolean-expressions': 'off',

‎.swcrc‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
"dynamicImport": false
1010
},
1111
"paths": {
12-
"@apps/*": ["dist/apps/*"],
13-
"@core/*": ["dist/core/*"],
14-
"@config/*": ["dist/config/*"],
15-
"@database/*": ["dist/database/*"],
16-
"@routes/*": ["dist/routes/*"]
12+
"~/*": ["dist/*"]
1713
},
1814
"target": "es2022",
1915
"loose": true,
@@ -43,11 +39,7 @@
4339
"dynamicImport": false
4440
},
4541
"paths": {
46-
"@apps/*": ["dist/apps/*"],
47-
"@core/*": ["dist/core/*"],
48-
"@config/*": ["dist/config/*"],
49-
"@database/*": ["dist/database/*"],
50-
"@routes/*": ["dist/routes/*"]
42+
"~/*": ["dist/*"]
5143
},
5244
"target": "es2022",
5345
"loose": true,

‎jest.config.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ module.exports = {
77
modulePaths: ['src'],
88
moduleDirectories: ['node_modules'],
99
moduleNameMapper: {
10-
'^@apps(.*)$': '<rootDir>/src/apps$1',
11-
'^@core(.*)$': '<rootDir>/src/core$1',
12-
'^@config(.*)$': '<rootDir>/src/config$1',
13-
'^@database(.*)$': '<rootDir>/src/database$1',
14-
'^@routes(.*)$': '<rootDir>/src/routes$1',
10+
'^~(.*)$': '<rootDir>/src$1',
1511
},
1612
modulePathIgnorePatterns: ['<rootDir>/dist/'],
1713
transformIgnorePatterns: ['<rootDir>/node_modules/'],

‎package.json‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -42,89 +42,88 @@
4242
"node": ">= 16.x"
4343
},
4444
"dependencies": {
45-
"@aws-sdk/client-s3": "^3.316.0",
46-
"@aws-sdk/s3-request-presigner": "^3.316.0",
47-
"@google-cloud/storage": "^6.9.5",
48-
"@types/validator": "^13.7.15",
49-
"axios": "^1.3.6",
45+
"@aws-sdk/client-s3": "^3.344.0",
46+
"@aws-sdk/s3-request-presigner": "^3.344.0",
47+
"@google-cloud/storage": "^6.10.1",
48+
"axios": "^1.4.0",
5049
"bcrypt": "^5.1.0",
51-
"chalk": "~4.1.2",
50+
"chalk": "4.1.2",
5251
"compression": "^1.7.4",
53-
"concurrently": "^8.0.1",
52+
"concurrently": "^8.1.0",
5453
"cookie-parser": "^1.4.6",
5554
"cors": "^2.8.5",
56-
"date-fns": "^2.29.3",
57-
"dotenv": "^16.0.3",
55+
"date-fns": "^2.30.0",
56+
"dotenv": "^16.1.3",
5857
"express": "^4.18.2",
5958
"express-async-handler": "^1.2.0",
6059
"express-rate-limit": "^6.7.0",
6160
"express-useragent": "^1.0.15",
62-
"expresso-core": "^0.5.0",
63-
"expresso-hooks": "^0.5.0",
64-
"expresso-provider": "^0.5.0",
65-
"expresso-query": "^0.5.0",
61+
"expresso-core": "^0.6.0",
62+
"expresso-hooks": "^0.6.0",
63+
"expresso-provider": "^0.6.0",
64+
"expresso-query": "^0.6.0",
6665
"handlebars": "^4.7.7",
67-
"helmet": "^6.1.5",
66+
"helmet": "^6.2.0",
6867
"hpp": "^0.2.3",
69-
"i18next": "^22.4.15",
70-
"i18next-fs-backend": "^2.1.1",
71-
"i18next-http-middleware": "^3.3.0",
68+
"i18next": "^22.5.0",
69+
"i18next-fs-backend": "^2.1.2",
70+
"i18next-http-middleware": "^3.3.1",
7271
"ioredis": "^5.3.2",
7372
"jsonwebtoken": "^9.0.0",
74-
"libphonenumber-js": "^1.10.28",
73+
"libphonenumber-js": "^1.10.31",
7574
"lodash": "^4.17.21",
76-
"minio": "^7.0.33",
75+
"minio": "^7.1.1",
7776
"module-alias": "^2.2.2",
7877
"morgan": "^1.10.0",
7978
"multer": "1.4.5-lts.1",
8079
"node-cron": "^3.0.2",
8180
"npm-run-all": "^4.1.5",
82-
"pg": "^8.10.0",
81+
"pg": "^8.11.0",
8382
"pg-hstore": "^2.3.4",
8483
"pm2": "^5.3.0",
8584
"reflect-metadata": "^0.1.13",
8685
"request-ip": "^3.3.0",
87-
"sequelize": "^6.31.0",
86+
"sequelize": "^6.32.0",
8887
"sequelize-cli": "^6.6.0",
8988
"sequelize-typescript": "^2.1.5",
9089
"slugify": "^1.6.6",
9190
"swagger-jsdoc": "^6.2.8",
92-
"swagger-ui-express": "^4.6.2",
91+
"swagger-ui-express": "^4.6.3",
9392
"uuid": "^9.0.0",
94-
"winston": "^3.8.2",
95-
"yup": "^1.1.1"
93+
"winston": "^3.9.0",
94+
"yup": "^1.2.0"
9695
},
9796
"devDependencies": {
98-
"@commitlint/cli": "^17.6.1",
99-
"@commitlint/config-conventional": "^17.6.1",
97+
"@commitlint/cli": "^17.6.5",
98+
"@commitlint/config-conventional": "^17.6.5",
10099
"@jest/globals": "^29.5.0",
101100
"@swc/cli": "^0.1.62",
102-
"@swc/core": "^1.3.52",
101+
"@swc/core": "^1.3.61",
103102
"@types/bcrypt": "^5.0.0",
104103
"@types/compression": "^1.7.2",
105104
"@types/cookie-parser": "^1.4.3",
106105
"@types/cors": "^2.8.13",
107106
"@types/express": "^4.17.17",
108107
"@types/express-useragent": "^1.0.2",
109108
"@types/hpp": "^0.2.2",
110-
"@types/ioredis-mock": "^8.2.1",
111-
"@types/jest": "^29.5.1",
112-
"@types/jsonwebtoken": "^9.0.1",
113-
"@types/lodash": "^4.14.194",
114-
"@types/minio": "^7.0.18",
109+
"@types/ioredis-mock": "^8.2.2",
110+
"@types/jest": "^29.5.2",
111+
"@types/jsonwebtoken": "^9.0.2",
112+
"@types/lodash": "^4.14.195",
113+
"@types/minio": "^7.1.0",
115114
"@types/module-alias": "^2.0.1",
116115
"@types/morgan": "^1.9.4",
117116
"@types/multer": "^1.4.7",
118-
"@types/node": "^18.15.12",
117+
"@types/node": "^18.16.16",
119118
"@types/node-cron": "^3.0.7",
120119
"@types/request-ip": "^0.0.37",
121120
"@types/supertest": "^2.0.12",
122121
"@types/swagger-jsdoc": "^6.0.1",
123122
"@types/swagger-ui-express": "^4.1.3",
124123
"@types/uuid": "^9.0.1",
125-
"@typescript-eslint/eslint-plugin": "^5.59.0",
126-
"@typescript-eslint/parser": "^5.59.0",
127-
"eslint": "^8.38.0",
124+
"@typescript-eslint/eslint-plugin": "^5.59.8",
125+
"@typescript-eslint/parser": "^5.59.8",
126+
"eslint": "^8.41.0",
128127
"eslint-config-prettier": "^8.8.0",
129128
"eslint-config-standard-with-typescript": "^34.0.1",
130129
"eslint-import-resolver-alias": "^1.1.2",
@@ -136,18 +135,14 @@
136135
"ioredis-mock": "^8.7.0",
137136
"jest": "^29.5.0",
138137
"nodemon": "^2.0.22",
139-
"prettier": "^2.8.7",
138+
"prettier": "^2.8.8",
140139
"rimraf": "^4.4.1",
141140
"standard-version": "^9.5.0",
142141
"supertest": "^6.3.3",
143142
"ts-jest": "^29.1.0",
144143
"typescript": "^4.9.5"
145144
},
146145
"_moduleAliases": {
147-
"@apps/*": "dist/apps/*",
148-
"@core/*": "dist/core/*",
149-
"@config/*": "dist/config/*",
150-
"@database/*": "dist/database/*",
151-
"@routes/*": "dist/routes/*"
146+
"~/*": "dist/*"
152147
}
153148
}

0 commit comments

Comments
 (0)