Merge branch 'develop' into feature/bulk-milestone-updates

Author: maxceem

.circleci/config.yml

@@ -32,7 +32,7 @@ deploy_steps: &deploy_steps
         ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
         source buildenvvar
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
-        
+
          echo "======= Running Masterscript - deploy projects-api-consumers ==========="
         if [ -e ${LOGICAL_ENV}-${APPNAME}-appvar.json ]; then  sudo rm -vf ${LOGICAL_ENV}-${APPNAME}-appvar.json; fi
         ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumers-deployvar
@@ -42,7 +42,7 @@ deploy_steps: &deploy_steps
 jobs:
   test:
     docker:
-      - image: circleci/node:8.9.4
+      - image: circleci/node:12.16.1
       - image: circleci/postgres:9.6.2-alpine
         environment:
         - POSTGRES_USER: circle_test

.eslintrc

@@ -10,18 +10,15 @@
   "rules": {
     "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.js", "**/*.spec.js", "src/tests/*.js"]}],
     "max-len": ["error", { "ignoreComments": true, "code": 120 }],
-    "valid-jsdoc": ["error", {
-      "requireReturn": true,
-      "requireReturnType": true,
-      "requireParamDescription": true,
-      "requireReturnDescription": true
-    }],
     "require-jsdoc": ["error", {
-        "require": {
-            "FunctionDeclaration": true,
-            "MethodDefinition": true,
-            "ClassDeclaration": true
-        }
-    }]
+      "require": {
+        "FunctionDeclaration": true,
+        "MethodDefinition": true,
+        "ClassDeclaration": true
+      }
+    }],
+    "indent": 0,
+    "no-multi-spaces": 0,
+    "valid-jsdoc": 0
   }
 }

.nvmrc

@@ -1 +1 @@
-v8.9.4
+12.16.1

README.md

@@ -26,7 +26,7 @@ Local setup should work good on **Linux** and **macOS**. But **Windows** is not
 ### Requirements
 
 * [docker-compose](https://docs.docker.com/compose/install/) - We use docker-compose for running dependencies locally.
-* Nodejs 8.9.4 - consider using [nvm](https://github.com/creationix/nvm) or equivalent to manage your node version
+* Nodejs 12.16.1 - consider using [nvm](https://github.com/creationix/nvm) or equivalent to manage your node version
 * Install [libpg](https://www.npmjs.com/package/pg-native)
 
 ### Steps to run locally