Merge pull request #31 from FormidableLabs/feature/trailing-commas

Update prettier and eslint rules to enforce trailing comma

Author: kadikraman

.eslintrc

@@ -1,6 +1,7 @@
 ---
 extends:
   - formidable
+  - prettier
 plugins:
   - jest
 env:
@@ -16,3 +17,6 @@ rules:
     - off
   arrow-parens:
     - off
+  comma-dangle:
+    - 2
+    - always-multiline

.prettierrc

@@ -1,4 +1,5 @@
 {
   "printWidth": 100,
-  "singleQuote": true
+  "singleQuote": true,
+  "semi": true
 }

index.js

@@ -61,9 +61,9 @@ export default class AppAuth {
     return await fetch(openidConfig.revocation_endpoint, {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
+        'Content-Type': 'application/x-www-form-urlencoded',
       },
-      body: `token=${tokenToRevoke}${sendClientId ? `&client_id=${this.config.clientId}` : ''}`
+      body: `token=${tokenToRevoke}${sendClientId ? `&client_id=${this.config.clientId}` : ''}`,
     }).catch(error => {
       throw new Error('Failed to revoke token', error);
     });

index.spec.js

@@ -4,9 +4,9 @@ jest.mock('react-native', () => ({
   NativeModules: {
     RNAppAuth: {
       authorize: jest.fn(),
-      refresh: jest.fn()
-    }
-  }
+      refresh: jest.fn(),
+    },
+  },
 }));
 
 describe('AppAuth', () => {
@@ -16,7 +16,7 @@ describe('AppAuth', () => {
   const config = {
     issuer: 'test-issuer',
     redirectUrl: 'test-redirectUrl',
-    clientId: 'test-clientId'
+    clientId: 'test-clientId',
   };
 
   beforeAll(() => {

package.json

@@ -5,7 +5,14 @@
   "main": "index.js",
   "scripts": {
     "test": "jest",
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "precommit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.js": [
+      "eslint --fix",
+      "git add"
+    ]
   },
   "files": [
     "package.json",
@@ -44,11 +51,14 @@
     "babel-preset-env": "^1.6.1",
     "eslint": "2.10.2",
     "eslint-config-formidable": "^3.0.0",
+    "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jest": "^21.3.2",
+    "husky": "^0.14.3",
     "invariant": "^2.2.2",
     "jest": "^21.2.1",
+    "lint-staged": "^6.1.0",
     "react": "^16.1.1",
     "react-native": "^0.50.3"
   },