Skip to content

Commit 2a23ee3

Browse files
committed
(GH-642) Configure prettier with eslint
1 parent 222933e commit 2a23ee3

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

.eslintrc.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@ Happy linting! 💖
1515
"env": { "browser": true, "es6": true, "node": true },
1616
"parser": "@typescript-eslint/parser",
1717
"parserOptions": { "sourceType": "module" },
18-
"plugins": ["@typescript-eslint"],
18+
"plugins": ["@typescript-eslint", "prettier"],
1919
"extends": [
2020
"eslint:recommended",
2121
"plugin:@typescript-eslint/eslint-recommended",
2222
"plugin:@typescript-eslint/recommended",
23-
"prettier",
24-
"prettier/@typescript-eslint"
23+
"plugin:prettier/recommended",
24+
"prettier"
2525
],
2626
"rules": {
27-
"dot-location": "error",
2827
"no-return-await": "error",
2928
"block-scoped-var": "error",
3029
"default-case": "error",

package-lock.json

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@
552552
"watch": "npm run build && tsc -watch -p ./",
553553
"pretest": "npm run compile",
554554
"test": "node ./out/test/runtest.js",
555-
"format": "prettier --write '**/**/*.{ts,js,json}'",
555+
"format": "prettier --write ./**/*.{ts,js,json}",
556556
"lint": "eslint --ext .ts src",
557557
"fix": "eslint --fix --ext .ts src"
558558
},
@@ -566,6 +566,7 @@
566566
"cytoscape": "^3.14.0",
567567
"eslint": "^7.0.0",
568568
"eslint-config-prettier": "^6.11.0",
569+
"eslint-plugin-prettier": "^3.1.3",
569570
"glob": "^7.1.4",
570571
"mocha": "^6.2.2",
571572
"prettier": "^2.0.5",

0 commit comments

Comments
 (0)