Skip to content

Commit 58d6283

Browse files
committed
keep config in sync
1 parent 684ad90 commit 58d6283

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
@@ -62,13 +62,13 @@
6262
"import-fresh": "^3.3.0",
6363
"isomorphic-style-loader": "^5.3.2",
6464
"jest": "^26.6.3",
65+
"node-loader": "^2.0.0",
6566
"pkg-up": "^3.1.0",
6667
"raw-loader": "^4.0.2",
6768
"regenerator-runtime": "^0.13.9",
6869
"resolve": "^1.22.0",
6970
"sass": "^1.49.7",
7071
"sass-loader": "^11.1.1",
71-
"node-loader": "^2.0.0",
7272
"serverless-webpack": "^5.6.1",
7373
"source-map-support": "^0.5.21",
7474
"ts-jest": "^26.5.6",
@@ -86,7 +86,7 @@
8686
"is-ci": "^3.0.1",
8787
"lerna-changelog": "^1.0.1",
8888
"lint-staged": "^10.5.4",
89-
"prettier": "^2.5.1",
89+
"prettier": "^2.8.0",
9090
"reflect-metadata": "^0.1.13",
9191
"serverless": "^2.72.2"
9292
},

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)