Merge pull request stemmlerjs#6 from stemmlerjs/prettier

stemmlerjs · web-flow · commit 4035f7287faf · 2020-03-10T17:52:08.000-04:00
Add prettier config.
diff --git a/.eslintrc b/.eslintrc
@@ -2,14 +2,17 @@
   "root": true,
   "parser": "@typescript-eslint/parser",
   "plugins": [
-    "@typescript-eslint"
+    "@typescript-eslint",
+    "prettier"
   ],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
   ],
   "rules": {
-    "no-console": 1
+    "no-console": 1,
+    "prettier/prettier": 2
   }
 }
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "semi": true,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 80
+}
diff --git a/.prettierrc.js b/.prettierrc.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,9 @@
     "build": "rimraf ./build && tsc",
     "start:dev": "nodemon",
     "start": "npm run build && node build/index.js",
-    "lint": "eslint . --ext .ts"
+    "lint": "eslint . --ext .ts",
+    "prettier-format": "prettier --config .prettierrc 'src/**/*.ts' --write",
+    "prettier-watch": "onchange 'src/**/*.ts' -- prettier --write {{changed}}"
   },
   "keywords": [],
   "author": "",
@@ -17,7 +19,11 @@
     "@typescript-eslint/eslint-plugin": "^2.21.0",
     "@typescript-eslint/parser": "^2.21.0",
     "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.0",
+    "eslint-plugin-prettier": "^3.1.2",
     "nodemon": "^1.19.1",
+    "onchange": "^6.1.0",
+    "prettier": "^1.19.1",
     "rimraf": "^3.0.0",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.2"
diff --git a/src/index.ts b/src/index.ts
@@ -1,2 +1 @@
-
-console.log('Hello world!')
+console.log('Hello world!');

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-`
`2`		`-console.log('Hello world!')`
	`1`	`+console.log('Hello world!');`