Skip to content

Commit f975bf5

Browse files
committed
keep config in sync
1 parent 2a259ef commit f975bf5

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
"import-fresh": "^3.3.0",
6464
"isomorphic-style-loader": "^5.3.2",
6565
"jest": "^26.6.3",
66+
"node-loader": "^2.0.0",
6667
"pkg-up": "^3.1.0",
6768
"raw-loader": "^4.0.2",
6869
"regenerator-runtime": "^0.13.9",
6970
"resolve": "^1.22.0",
7071
"sass": "^1.49.7",
7172
"sass-loader": "^11.1.1",
72-
"node-loader": "^2.0.0",
7373
"serverless-webpack": "^5.6.1",
7474
"source-map-support": "^0.5.21",
7575
"ts-jest": "^26.5.6",
@@ -87,7 +87,7 @@
8787
"is-ci": "^3.0.1",
8888
"lerna-changelog": "^1.0.1",
8989
"lint-staged": "^10.5.4",
90-
"prettier": "^2.5.1",
90+
"prettier": "^2.8.0",
9191
"reflect-metadata": "^0.1.13",
9292
"serverless": "^2.72.2"
9393
},

src/ts.eslintrc.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
22
"parser": "@typescript-eslint/parser",
3-
"plugins": ["@typescript-eslint"],
3+
"plugins": ["@typescript-eslint", "prettier"],
44
"parserOptions": {
55
"ecmaVersion": 2017,
66
"sourceType": "module"
77
},
88
"extends": [
99
"eslint:recommended",
1010
"plugin:@typescript-eslint/eslint-recommended",
11-
"plugin:@typescript-eslint/recommended"
11+
"plugin:@typescript-eslint/recommended",
12+
"prettier"
1213
],
13-
"rules": {
14-
"semi": "off"
15-
}
14+
"rules": {}
1615
}

0 commit comments

Comments
 (0)