Merge pull request #518 from blackflux/dev

[Gally]: master <- dev

.eslintrc.json

@@ -33,7 +33,8 @@
         }
       }
     ],
-    "@blackflux/rules/prevent-typeof-object": 1
+    "@blackflux/rules/prevent-typeof-object": 1,
+    "@blackflux/rules/enforce-optimal-require": 1
   },
   "env": {"es6": true, "node": true, "jasmine": true, "mocha": true},
   "globals": {"logger": true, "log4js": true},

package.json

@@ -12,12 +12,12 @@
     "coveralls": "node ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info",
     "semantic-release": "npm run build-clean && npx semantic-release",
     "gardener": "node gardener",
-    "docker": "docker run -u`id -u`:`id -g` -v $(pwd):/user/project -v ~/.aws:/user/.aws -v ~/.npmrc:/user/.npmrc -w /user/project -it --entrypoint /bin/bash",
-    "yu": "yarn upgrade --latest --force",
-    "yi": "yarn install --frozen-lockfile",
+    "docker": "docker run --net host -u`id -u`:`id -g` -v $(pwd):/user/project -v ~/.aws:/user/.aws -v ~/.npmrc:/user/.npmrc -w /user/project -it --entrypoint /bin/bash",
     "t": "yarn test",
     "ts": "yarn run test-simple",
-    "tsv": "yarn run test-simple --verbose"
+    "tsv": "yarn run test-simple --verbose",
+    "u": "yarn upgrade --latest --force",
+    "i": "yarn install --frozen-lockfile"
   },
   "repository": {
     "type": "git",
@@ -41,12 +41,15 @@
     "@babel/core": "7.5.5",
     "@babel/plugin-proposal-object-rest-spread": "7.5.5",
     "@babel/register": "7.5.5",
-    "@blackflux/eslint-plugin-rules": "1.1.4",
-    "@blackflux/robo-config-plugin": "2.4.6",
+    "@blackflux/eslint-plugin-rules": "1.3.0",
+    "@blackflux/robo-config-plugin": "2.5.2",
     "babel-eslint": "10.0.2",
     "chai": "4.2.0",
     "coveralls": "3.0.6",
-    "eslint": "6.1.0",
+    "eslint": "6.2.0",
+    "eslint-config-airbnb-base": "14.0.0",
+    "eslint-plugin-import": "2.18.2",
+    "eslint-plugin-mocha": "6.0.0",
     "js-gardener": "2.0.66",
     "nyc": "14.1.1",
     "semantic-release": "15.13.21"

test/templates/aws-cloud-watch.spec.js

@@ -1,6 +1,6 @@
 const expect = require('chai').expect;
 
-const template = require('./../../src/templates/aws-cloud-watch');
+const template = require('../../src/templates/aws-cloud-watch');
 
 describe('Testing AWS Cloud Watch Template', () => {
   it('Test Invalid GZip', () => {

test/util/ensure-string.spec.js

@@ -1,5 +1,5 @@
 const expect = require('chai').expect;
-const ensureString = require('./../../src/util/ensure-string');
+const ensureString = require('../../src/util/ensure-string');
 
 describe('Testing ensureString', () => {
   it('Testing String', () => {