Skip to content
This repository was archived by the owner on Mar 28, 2024. It is now read-only.

Commit eb96d83

Browse files
committed
chore: add lerna and move eslint to root
1 parent e7d683c commit eb96d83

File tree

9 files changed

+3040
-568
lines changed

9 files changed

+3040
-568
lines changed

packages/server/.eslintrc.json renamed to .eslintrc.json

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
{
22
"parser": "@typescript-eslint/parser",
33
"parserOptions": {
4-
"project": "./packages/server/tsconfig.json",
4+
"project": ["./packages/*/tsconfig.json"],
55
"sourceType": "module"
66
},
7-
"plugins": ["@typescript-eslint/eslint-plugin", "import", "sonarjs"],
7+
"plugins": [
8+
"@typescript-eslint/eslint-plugin",
9+
"import",
10+
"react",
11+
"react-hooks",
12+
"jsx",
13+
"jsx-a11y",
14+
"sonarjs",
15+
"prettier"
16+
],
817
"extends": [
918
"plugin:@typescript-eslint/eslint-recommended",
1019
"plugin:@typescript-eslint/recommended",
11-
"prettier",
12-
"prettier/@typescript-eslint",
13-
"plugin:sonarjs/recommended"
20+
"plugin:prettier/recommended",
21+
"plugin:prettier/@typescript-eslint",
22+
"plugin:prettier/react",
23+
"plugin:sonarjs/recommended",
24+
"airbnb-typescript"
1425
],
1526
"root": true,
1627
"env": {

lerna.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"packages": ["packages/*"],
3+
"version": "0.0.0",
4+
"npmClient": "yarn",
5+
"useWorkspaces": true
6+
}

package.json

+15
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,22 @@
1414
"**/typeorm"
1515
],
1616
"devDependencies": {
17+
"@typescript-eslint/eslint-plugin": "^2.33.0",
18+
"@typescript-eslint/parser": "^2.33.0",
1719
"concurrently": "^5.2.0",
20+
"eslint": "^6.8.0",
21+
"eslint-config-airbnb-typescript": "^7.2.1",
22+
"eslint-config-prettier": "^6.11.0",
23+
"eslint-plugin-import": "^2.20.2",
24+
"eslint-plugin-jsx": "^0.1.0",
25+
"eslint-plugin-jsx-a11y": "^6.2.3",
26+
"eslint-plugin-prettier": "^3.1.3",
27+
"eslint-plugin-react": "^7.20.0",
28+
"eslint-plugin-react-hooks": "^2.5.1",
29+
"eslint-plugin-sonarjs": "^0.5.0",
30+
"lerna": "^3.21.0",
31+
"prettier": "^2.0.5",
32+
"typescript": "^3.9.2",
1833
"wait-on": "^5.0.0"
1934
}
2035
}

packages/client/.eslintignore

-1
This file was deleted.

packages/client/.eslintrc.js

-34
This file was deleted.

packages/client/package.json

+6-20
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,10 @@
2424
"@types/react-router-dom": "^5.1.5",
2525
"@types/webpack": "^4.41.13",
2626
"@types/webpack-dev-server": "^3.10.1",
27-
"@typescript-eslint/eslint-plugin": "^2.33.0",
28-
"@typescript-eslint/parser": "^2.33.0",
2927
"babel-loader": "^8.1.0",
3028
"babel-plugin-import": "^1.13.0",
3129
"cross-env": "^7.0.2",
3230
"css-loader": "^3.5.3",
33-
"eslint": "^7.0.0",
34-
"eslint-config-airbnb-typescript": "^7.2.1",
35-
"eslint-config-prettier": "^6.11.0",
36-
"eslint-plugin-import": "^2.20.2",
37-
"eslint-plugin-jsx": "^0.1.0",
38-
"eslint-plugin-jsx-a11y": "^6.2.3",
39-
"eslint-plugin-prettier": "^3.1.3",
40-
"eslint-plugin-react": "^7.20.0",
41-
"eslint-plugin-react-hooks": "^4.0.2",
4231
"html-webpack-plugin": "^4.3.0",
4332
"path": "^0.12.7",
4433
"prettier": "^2.0.5",
@@ -51,23 +40,20 @@
5140
"webpack-dev-server": "^3.11.0"
5241
},
5342
"dependencies": {
54-
"@ant-design/icons": "^4.1.0",
5543
"@apollo/react-hooks": "^3.1.5",
56-
"@material-ui/core": "^4.9.13",
44+
"@material-ui/core": "^4.9.14",
5745
"@material-ui/icons": "^4.9.1",
58-
"antd": "^4.2.0",
59-
"apollo-boost": "^0.4.8",
60-
"apollo-client": "^2.6.9",
46+
"apollo-boost": "^0.4.9",
47+
"apollo-client": "^2.6.10",
6148
"apollo-utilities": "^1.3.4",
6249
"clsx": "^1.1.0",
63-
"dayjs": "^1.8.26",
6450
"graphql": "^14.0.0",
6551
"html-react-parser": "^0.10.3",
6652
"react": "^16.13.1",
6753
"react-dom": "^16.13.1",
68-
"react-hook-form": "^5.6.3",
54+
"react-hook-form": "^5.7.2",
6955
"react-html-parser": "^2.0.2",
70-
"react-router": "^5.1.2",
71-
"react-router-dom": "^5.1.2"
56+
"react-router": "^5.2.0",
57+
"react-router-dom": "^5.2.0"
7258
}
7359
}

packages/server/.prettierrc

-4
This file was deleted.

packages/server/package.json

+16-24
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
"migration:run": "ts-node -r tsconfig-paths/register node_modules/.bin/typeorm migration:run"
2929
},
3030
"dependencies": {
31-
"@nestjs-query/core": "^0.11.0",
32-
"@nestjs-query/query-graphql": "^0.11.0",
33-
"@nestjs-query/query-typeorm": "^0.11.0",
34-
"@nestjs/common": "^7.0.9",
35-
"@nestjs/config": "^0.4.1",
36-
"@nestjs/core": "^7.0.9",
37-
"@nestjs/graphql": "^7.3.7",
38-
"@nestjs/platform-express": "^7.0.9",
39-
"@nestjs/schedule": "^0.3.1",
40-
"@nestjs/serve-static": "^2.1.0",
31+
"@nestjs-query/core": "^0.11.2",
32+
"@nestjs-query/query-graphql": "^0.11.2",
33+
"@nestjs-query/query-typeorm": "^0.11.2",
34+
"@nestjs/common": "^7.0.11",
35+
"@nestjs/config": "^0.4.2",
36+
"@nestjs/core": "^7.0.11",
37+
"@nestjs/graphql": "^7.3.9",
38+
"@nestjs/platform-express": "^7.0.11",
39+
"@nestjs/schedule": "^0.4.0",
40+
"@nestjs/serve-static": "^2.1.1",
4141
"@nestjs/typeorm": "^7.0.0",
42-
"apollo-server-express": "^2.13.0",
42+
"apollo-server-express": "^2.13.1",
4343
"class-transformer": "^0.2.3",
4444
"class-validator": "^0.12.2",
4545
"dataloader": "^2.0.0",
@@ -48,7 +48,7 @@
4848
"graphql-relay": "^0.6.0",
4949
"graphql-tools": "^5.0.0",
5050
"nestjs-pino": "^1.2.0",
51-
"pg": "^8.1.0",
51+
"pg": "^8.2.0",
5252
"reflect-metadata": "^0.1.13",
5353
"rimraf": "^3.0.2",
5454
"rss-parser": "^3.8.0",
@@ -59,26 +59,18 @@
5959
"devDependencies": {
6060
"@nestjs/cli": "^7.1.5",
6161
"@nestjs/schematics": "^7.0.0",
62-
"@nestjs/testing": "^7.0.9",
62+
"@nestjs/testing": "^7.0.11",
6363
"@types/express": "^4.17.6",
64-
"@types/jest": "25.2.1",
65-
"@types/node": "^13.13.5",
64+
"@types/jest": "25.2.2",
65+
"@types/node": "^14.0.1",
6666
"@types/supertest": "^2.0.9",
67-
"@typescript-eslint/eslint-plugin": "^2.31.0",
68-
"@typescript-eslint/parser": "^2.31.0",
69-
"eslint": "^7.0.0",
70-
"eslint-config-prettier": "^6.11.0",
71-
"eslint-plugin-import": "^2.20.2",
72-
"eslint-plugin-sonarjs": "^0.5.0",
7367
"jest": "^26.0.1",
7468
"pino-pretty": "^4.0.0",
75-
"prettier": "^2.0.5",
7669
"supertest": "^4.0.2",
7770
"ts-jest": "25.5.1",
78-
"ts-loader": "^7.0.3",
7971
"ts-node": "^8.10.1",
8072
"tsconfig-paths": "^3.9.0",
81-
"typescript": "^3.8.3"
73+
"typescript": "^3.9.2"
8274
},
8375
"jest": {
8476
"moduleFileExtensions": [

0 commit comments

Comments
 (0)