Merge pull request #299 from gurgeous/prettier_tslint

wingrunr21 · web-flow · commit 0df353f6eed0 · 2018-03-31T14:15:13.000-06:00
Add tslint/prettier for linting/formatting.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "useTabs": true
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+	"recommendations": ["esbenp.prettier-vscode", "eg2.tslint"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,5 +4,11 @@
 	"files.trimTrailingWhitespace": true,
 	"eslint.enable": false,
 	"editor.insertSpaces": false,
+	"[javascript]": {
+		"editor.formatOnSave": true
+	},
+	"[typescript]": {
+		"editor.formatOnSave": true
+	},
 	"typescript.tsdk": "node_modules/typescript/lib"
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,11 @@
     "gulp-typescript": "^2.12.0",
     "gulp-util": "^3.0.5",
     "mocha": "^2.4.5",
+    "prettier": "^1.11.1",
     "run-sequence": "*",
+    "tslint": "^5.9.1",
+    "tslint-config-prettier": "^1.10.0",
+    "tslint-microsoft-contrib": "^5.0.3",
     "typescript": "^2.1.5",
     "vscode": "^1.1.4",
     "vscode-debugadapter-testsupport": "^1.19.0"
diff --git a/tslint.json b/tslint.json
@@ -0,0 +1,12 @@
+{
+	"defaultSeverity": "warning",
+	"extends": ["tslint-microsoft-contrib", "tslint-config-prettier"],
+	"jsRules": {},
+	"rules": {
+		"missing-jsdoc": false,
+		"no-backbone-get-outside-model": false,
+		"no-backbone-get-set-outside-model": false,
+		"no-relative-imports": false
+	},
+	"rulesDirectory": []
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "recommendations": ["esbenp.prettier-vscode", "eg2.tslint"]`
	`3`	`+}`