feat: upgrade all deps (#33)

BREAKING CHANGE: requires node 10, updated semantic-release pipeline

.babelrc

@@ -1,12 +1,19 @@
 {
   "plugins": [
-    "transform-strict-mode",
-    "transform-class-properties",
-    ["transform-object-rest-spread", { "useBuiltIns": true }]
+    "@babel/plugin-transform-strict-mode",
+    "@babel/plugin-proposal-class-properties",
+    [
+      "@babel/plugin-proposal-object-rest-spread",
+      {
+        "useBuiltIns": true
+      }
+    ]
   ],
   "env": {
     "test": {
-      "plugins": [ "istanbul" ]
+      "plugins": [
+        "istanbul"
+      ]
     }
   }
 }

.eslintrc

@@ -1,5 +1,6 @@
 {
   "extends": "makeomatic",
+  "parser": "babel-eslint",
   "plugins": [
     "json"
   ]

.mdeprc

@@ -1,3 +1,3 @@
 {
-  "node": "9.4.0"
+  "node": "10.11.0"
 }

.releaserc.json

@@ -1,6 +1,21 @@
 {
   "branch": "master",
-  "verifyConditions": ["@semantic-release/npm", "@semantic-release/github"],
+  "verifyConditions": [
+    "@semantic-release/changelog",
+    "@semantic-release/git",
+    "@semantic-release/github"
+  ],
+  "prepare": [
+    { "path": "@semantic-release/exec", "cmd": "yarn doc" },
+    "@semantic-release/changelog",
+    "@semantic-release/npm",
+    { "path": "@semantic-release/exec", "cmd": "yarn docker-release" },
+    "@semantic-release/git"
+  ],
+  "publish": [
+    "@semantic-release/npm",
+    "@semantic-release/github"
+  ],
   "analyzeCommits": {
     "preset": "angular",
     "releaseRules": [

Dockerfile

@@ -14,7 +14,8 @@ RUN \
     curl \
   && apk add openssl ca-certificates \
   && update-ca-certificates \
-  && yarn --production \
+  && yarn --production --frozen-lockfile \
+  && yarn cache clean \
   && apk del \
     .buildDeps \
     wget \

bin/register.js

@@ -2,13 +2,15 @@
 
 // accepts conf through .env file
 // suitable for configuring this in the docker env
-const Social = require('../src');
-const service = new Social(require('ms-conf').get('/'));
+const conf = require('ms-conf').get('/');
 const AMQPTransport = require('@microfleet/transport-amqp');
 const yargs = require('yargs');
 const debug = require('debug')('mservice:social:register');
 
+const Social = require('../src');
+
 // merged configuration
+const service = new Social(conf);
 const { config } = service;
 const { argv } = yargs
   .coerce({

package.json

@@ -8,68 +8,73 @@
     "prepublishOnly": "yarn lint && yarn compile",
     "test:e2e": "mdep test run",
     "test": "yarn lint && yarn test:e2e",
-    "doc": "cd schemas && apidoc -i ./../src/actions -v -o ./../docs",
+    "doc": "cd schemas && apidoc -i ../src/actions -v -o ../docs",
     "docker-release": "mdep docker release",
     "lint": "eslint . --ext .json --ext .js",
     "semantic-release": "semantic-release",
-    "release": "yarn --freze-lockfile && yarn semantic-release && yarn docker-release && yarn doc",
-    "start": "node ./bin/mservice.js | bunyan -o short"
+    "release": "yarn --freze-lockfile && yarn semantic-release",
+    "start": "mfleet",
+    "commitmsg": "commitlint -e $GIT_PARAMS",
+    "preparecommitmsg": "./node_modules/@makeomatic/deploy/git-hooks/prepare-commit-msg $GIT_PARAMS"
   },
   "dependencies": {
-    "@microfleet/core": "^10.2.4",
-    "@microfleet/transport-amqp": "^13.0.1",
-    "bluebird": "^3.5.1",
+    "@microfleet/core": "^10.11.0",
+    "@microfleet/transport-amqp": "^13.1.2",
+    "bluebird": "^3.5.2",
     "bn.js": "^4.11.6",
-    "boom": "^7.1.1",
+    "boom": "^7.2.0",
     "bunyan": "^1.8.8",
     "bunyan-sentry-stream": "^1.1.0",
     "common-errors": "^1.0.5",
-    "debug": "^3.1.0",
-    "glob": "^7.1.1",
-    "hapi": "17.2.0",
+    "debug": "^4.0.1",
+    "glob": "^7.1.3",
+    "hapi": "17.6.0",
     "is": "^3.2.1",
-    "knex": "^0.14.2",
-    "lodash": "^4.17.4",
-    "moment": "^2.20.1",
-    "ms-conf": "^3.1.2",
-    "ms-validation": "^7.0.0",
-    "pg": "^7.4.1",
-    "raven": "^2.4.0",
-    "request": "^2.83.0",
+    "knex": "^0.15.2",
+    "lodash": "^4.17.11",
+    "moment": "^2.22.2",
+    "ms-conf": "^3.3.0",
+    "ms-validation": "^7.2.0",
+    "pg": "^7.5.0",
+    "raven": "^2.6.4",
+    "request": "^2.88.0",
     "request-promise": "^4.2.2",
-    "retry": "^0.10.1",
+    "retry": "^0.12.0",
     "server-destroy": "^1.0.1",
-    "stdout-stream": "^1.4.0",
+    "stdout-stream": "^1.4.1",
     "twitter": "^1.7.0",
-    "yargs": "^11.0.0"
+    "yargs": "^12.0.2"
   },
   "devDependencies": {
-    "@makeomatic/deploy": "^5.0.2",
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+    "@babel/plugin-transform-strict-mode": "^7.0.0",
+    "@babel/register": "^7.0.0",
+    "@makeomatic/deploy": "^7.0.1",
+    "@semantic-release/changelog": "^3.0.0",
+    "@semantic-release/exec": "^3.1.3",
+    "@semantic-release/git": "^7.0.4",
     "apidoc": "^0.17.5",
     "apidoc-plugin-schema": "^0.1.8",
-    "babel-cli": "^6.24.0",
-    "babel-core": "^6.24.0",
-    "babel-eslint": "^8.2.1",
-    "babel-plugin-istanbul": "^4.1.5",
-    "babel-plugin-transform-class-properties": "^6.23.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-strict-mode": "^6.22.0",
-    "babel-register": "^6.24.0",
-    "chance": "^1.0.13",
-    "codecov": "^3.0.0",
-    "cross-env": "^5.1.3",
-    "dotenv": "^4.0.0",
-    "eslint": "^4.16.0",
-    "eslint-config-makeomatic": "^2.0.1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-json": "^1.2.0",
-    "eslint-plugin-mocha": "^4.8.0",
-    "eslint-plugin-promise": "^3.6.0",
+    "babel-eslint": "^10.0.1",
+    "babel-plugin-istanbul": "^5.0.1",
+    "chance": "^1.0.16",
+    "codecov": "^3.1.0",
+    "cross-env": "^5.2.0",
+    "dotenv": "^6.0.0",
+    "eslint": "^5.6.1",
+    "eslint-config-makeomatic": "^3.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-json": "^1.2.1",
+    "eslint-plugin-mocha": "^5.2.0",
+    "eslint-plugin-promise": "^4.0.1",
     "json": "^9.0.6",
-    "mocha": "^5.0.0",
-    "nyc": "^11.4.1",
+    "mocha": "^5.2.0",
+    "nyc": "^13.0.1",
     "rimraf": "^2.6.1",
-    "sinon": "^4.2.1"
+    "sinon": "^6.3.5"
   },
   "license": "MIT",
   "repository": {
@@ -88,7 +93,7 @@
       "src/**/*.spec.js"
     ],
     "require": [
-      "babel-register"
+      "@babel/register"
     ],
     "sourceMap": false,
     "instrument": false,

src/services/facebook.js

@@ -1,9 +1,9 @@
-const Media = require('./facebook/media');
 const omit = require('lodash/omit');
-const proofGenerator = require('./facebook/proof-generator');
 const Promise = require('bluebird');
 const request = require('request-promise');
 const retry = require('retry');
+const proofGenerator = require('./facebook/proof-generator');
+const Media = require('./facebook/media');
 const Subscription = require('./facebook/subscription');
 
 class Facebook {

src/services/facebook/links-extractor.js

@@ -12,7 +12,7 @@ function getUrlParam(link, param) {
 function extractLink(link) {
   if (/fbcdn\.net\/safe_image\.php/.test(link)) {
     return getUrlParam(link, 'url');
-  } else if (/facebook\.com\/l.php/.test(link)) {
+  } if (/facebook\.com\/l.php/.test(link)) {
     return getUrlParam(link, 'u');
   }
 

src/services/facebook/media.js

@@ -17,8 +17,7 @@ class Media {
       .feeds()
       .list({ filter: { network: 'facebook' } })
       .map(feed => Promise.join(feed, this.getLast(feed.network_id)))
-      .map(([feed, lastMedia]) =>
-        this.syncPageHistory(feed.network_id, feed.meta.token, lastMedia));
+      .map(([feed, lastMedia]) => this.syncPageHistory(feed.network_id, feed.meta.token, lastMedia));
   }
 
   syncPageHistory(id, accessToken, lastMedia) {

src/services/feed/register.js

@@ -1,5 +1,5 @@
-const getRegisterStrategy = require('./register/strategies');
 const Promise = require('bluebird');
+const getRegisterStrategy = require('./register/strategies');
 
 function saveFeed(internal, network, params) {
   const { logger } = this;

src/services/instagram/media.js

@@ -1,7 +1,7 @@
-const getListUrl = require('./media/get-list-url');
-const getMediaUrl = require('./media/get-url');
 const Promise = require('bluebird');
 const request = require('request-promise');
+const getListUrl = require('./media/get-list-url');
+const getMediaUrl = require('./media/get-url');
 const syncAccountHistory = require('./media/sync-account-history');
 
 class Media {

src/social.js

@@ -1,13 +1,13 @@
-const addUpsert = require('./utils/knex/upsert');
-const Facebook = require('./services/facebook');
-const Feed = require('./services/feed');
 const { globFiles } = require('ms-conf/lib/load-config');
-const Instagram = require('./services/instagram');
 const merge = require('lodash/merge');
 const MService = require('@microfleet/core');
 const { NotFoundError } = require('common-errors');
 const path = require('path');
 const Promise = require('bluebird');
+const Instagram = require('./services/instagram');
+const Feed = require('./services/feed');
+const Facebook = require('./services/facebook');
+const addUpsert = require('./utils/knex/upsert');
 const Storage = require('./services/storage');
 const Twitter = require('./services/twitter');
 
@@ -82,10 +82,9 @@ class Social extends MService {
     const facebook = new Facebook(config.facebook, storage, feed, log);
 
     if (config.facebook.subscribeOnStart) {
-      this.addConnector(ConnectorsTypes.application, () =>
-        Promise
-          .delay(60000)
-          .then(() => facebook.subscription.subscribe()));
+      this.addConnector(ConnectorsTypes.application, () => Promise
+        .delay(60000)
+        .then(() => facebook.subscription.subscribe()));
     }
 
     if (config.facebook.syncMediaOnStart) {

test/docker-compose.yml

@@ -18,15 +18,15 @@ services:
   postgres:
     expose:
       - "5432"
-    image: postgres:9.5.4
+    image: postgres:10
     container_name: pg
     hostname: pg
 
   ms-users:
     links:
       - redis
       - rabbitmq
-    image: makeomatic/ms-users:7.7.2
+    image: makeomatic/ms-users:10.9.0-9.4.4
     hostname: ms-users
     container_name: ms-users
     volumes:
@@ -40,7 +40,7 @@ services:
 
   tester:
     container_name: tester
-    image: makeomatic/node:9.4.0-tester
+    image: makeomatic/node:10.11.0-tester
     links:
       - postgres
       - rabbitmq

test/fixtures/instagram/create-feed.js

@@ -7,16 +7,16 @@ module.exports = {
       json: true,
     },
     second: {
-      url: 'https://api.instagram.com/v1/users/555/media/recent?access_token=555.1&' +
-        'count=200&max_id=1385552885716996590_555',
+      url: 'https://api.instagram.com/v1/users/555/media/recent?access_token=555.1&'
+        + 'count=200&max_id=1385552885716996590_555',
       json: true,
     },
   },
   response: {
     first: Promise.resolve({
       pagination: {
-        next_url: 'https://api.instagram.com/v1/users/555/media/recent?access_token=555.1&' +
-          'count=200&max_id=1385552885716996590_555',
+        next_url: 'https://api.instagram.com/v1/users/555/media/recent?access_token=555.1&'
+          + 'count=200&max_id=1385552885716996590_555',
         next_max_id: '1385552885716996590_555',
       },
       meta: {

test/fixtures/instagram/sync-on-reconnect.js

@@ -7,8 +7,8 @@ module.exports = {
   },
   response: Promise.resolve({
     pagination: {
-      next_url: 'https://api.instagram.com/v1/users/555/media/recent?access_token=555.1&' +
-        'count=200&max_id=1385552885716996590_555',
+      next_url: 'https://api.instagram.com/v1/users/555/media/recent?access_token=555.1&'
+        + 'count=200&max_id=1385552885716996590_555',
       next_max_id: '1385552885716996590_555',
     },
     meta: {

test/mocha.opts

@@ -1,4 +1,4 @@
---require babel-register
+--require @babel/register
 --require ./test/configs/config.js
 --bail
 --timeout 75000

test/suites/facebook.webhook.js

@@ -70,8 +70,8 @@ describe('facebook.webhook', function testSuite() {
 
     return http({ qs: params }).then((response) => {
       assert.equal(response.statusCode, 403);
-      assert.equal(response.body.message, 'An attempt was made to perform an operation that' +
-        ' is not permitted: Verify token invalid-verify-token is invalid');
+      assert.equal(response.body.message, 'An attempt was made to perform an operation that'
+        + ' is not permitted: Verify token invalid-verify-token is invalid');
       return null;
     });
   });