From a0563bf15ed02b08ad70a6d50f84dc690f724fa9 Mon Sep 17 00:00:00 2001 From: Resi Respati Date: Wed, 1 Aug 2018 11:47:51 +0700 Subject: [PATCH] add prettier config + vscode formatter --- .prettierrc | 7 +++++++ .vscode/extensions.json | 3 +++ .vscode/settings.json | 1 + package.json | 3 +++ tslint.json | 4 +++- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .prettierrc create mode 100644 .vscode/extensions.json diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..64bfb29 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,7 @@ +{ + "semi": true, + "tabWidth": 2, + "printWidth": 120, + "singleQuote": false, + "trailingComma": "es5" +} diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..b98e704 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["eg2.tslint", "EditorConfig.EditorConfig", "esbenp.prettier-vscode"] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 7ef1cfb..6d3582f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "editor.renderWhitespace": "boundary", + "editor.formatOnSave": true, "files.encoding": "utf8", "files.trimTrailingWhitespace": true, "files.insertFinalNewline": true, diff --git a/package.json b/package.json index b535b42..f8c535f 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "devDependencies": { "@types/lodash": "^3.10.1", "@types/screeps": "^2.4.0", + "prettier": "^1.14.0", "rollup": "^0.57.1", "rollup-plugin-clear": "^2.0.7", "rollup-plugin-commonjs": "^9.1.4", @@ -35,6 +36,8 @@ "rollup-plugin-screeps": "^0.1.2", "rollup-plugin-typescript2": "^0.16.1", "tslint": "^5.9.1", + "tslint-config-prettier": "^1.14.0", + "tslint-plugin-prettier": "^1.3.0", "typescript": "^2.9.2" }, "dependencies": { diff --git a/tslint.json b/tslint.json index 4f1b5bc..e92553c 100644 --- a/tslint.json +++ b/tslint.json @@ -1,6 +1,8 @@ { + "rulesDirectory": "tslint-plugin-prettier", "extends" : [ - "tslint:recommended" + "tslint:recommended", + "tslint-config-prettier" ], "rules": { "forin": false,