Merge pull request #75 from magopian/34-add-eslint

Add eslint

Author: rehandalal

.circleci/config.yml

@@ -39,9 +39,6 @@ jobs:
       # run tests!
       - run: yarn test
 
-      # run build!
-      - run: yarn run build
-
       - deploy:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then

lint_problems.sh

@@ -3,9 +3,9 @@ set -eo pipefail
 
 prelude() {
   echo "
-You have prettier linting errors!
+You have prettier-eslint linting errors!
 ----------------------------------
-The following files would turn out different if you process them with prettier.
+The following files would turn out different if you process them with prettier-eslint.
 
 "
 }
@@ -16,9 +16,9 @@ while read line
 do
   $first && prelude
   echo "To fix:"
-  echo "    prettier --write ${line}"
+  echo "    prettier-eslint --write ${line}"
   echo "To see:"
-  echo "    prettier ${line} | diff ${line} -"
+  echo "    prettier-eslint ${line} | diff ${line} -"
   echo ""
   # echo "$line"
   any=true
@@ -29,7 +29,7 @@ done < "${1:-/dev/stdin}"
 $any && echo "
 If you're not interested in how they're different, consider running:
 
-  yarn run lint:prettierfix
+  yarn run lint:prettier-eslintfix
 "
 
 $any && exit 1 || exit 0

package.json

@@ -32,9 +32,9 @@
     "eject": "react-scripts eject",
     "lint:flow": "flow",
     "lint:less": "stylelint 'src/**/*.less' --config .stylelintrc",
-    "lint:prettier": "prettier --list-different 'src/**/*.js' | ./lint_problems.sh",
-    "lint:prettierfix": "prettier 'src/**/*.js' --write",
-    "lint": "yarn run lint:flow && yarn run lint:prettier && yarn run lint:less"
+    "lint:prettier-eslint": "prettier-eslint --list-different 'src/**/*.js' | ./lint_problems.sh",
+    "lint:prettier-eslintfix": "prettier-eslint --write 'src/**/*.js'",
+    "lint": "yarn run lint:flow && yarn run lint:prettier-eslint && yarn run lint:less"
   },
   "devDependencies": {
     "babel-plugin-import": "^1.6.5",
@@ -43,6 +43,8 @@
     "flow-bin": "^0.66.0",
     "pre-commit": "^1.2.2",
     "prettier": "^1.11.1",
+    "prettier-eslint": "^8.8.1",
+    "prettier-eslint-cli": "^4.7.1",
     "react-app-rewire-less": "^2.1.0",
     "react-app-rewired": "^1.4.1",
     "stylelint": "^9.1.1",

src/normandy/state/app/session/actions.js

@@ -60,10 +60,10 @@ export function saveSession() {
 }
 
 export function addSessionView(category, caption, identicon) {
-  return async (dispatch, getState) => {
+  return async (dispatch, getState) =>
     // #todo;
-    return null;
-    /*
+    null;
+  /*
       const { router } = getState();
       let url = router.pathname;
 
@@ -83,5 +83,4 @@ export function addSessionView(category, caption, identicon) {
       // Automatically save the session when views are added.
       return dispatch(saveSession());
     */
-  };
 }

src/normandy/tests/utils/test_handleError.js

@@ -50,7 +50,9 @@ describe('handleError util', () => {
       it('should handle a "not logged in" 403 error', () => {
         const err = new APIClient.APIError(
           'Authentication credentials were not provided',
-          { status: 403 },
+          {
+            status: 403,
+          },
         );
 
         const { context, message, reason } = handleError('Test.', err);