Merge pull request strongloop#188 from strongloop/update-eslint

update eslint dependency and drop support for Node.js 6

Author: nabdelgadir

.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
 node_js:
-  - "6"
   - "8"
   - "10"

index.js

@@ -5,14 +5,14 @@
 
 'use strict';
 
-var SG = require('strong-globalize');
+const SG = require('strong-globalize');
 SG.SetRootDir(__dirname);
 
 /**
  * Export the connector
  */
-var loopback = require('loopback');
-var PushConnector = require('./lib/push-connector');
+const loopback = require('loopback');
+const PushConnector = require('./lib/push-connector');
 exports = module.exports = PushConnector;
 
 /**
@@ -24,7 +24,7 @@ exports.Notification = require('./models').Notification;
 exports.createPushModel = function(options) {
   options = options || {};
 
-  var pushDataSource = loopback.createDataSource({
+  const pushDataSource = loopback.createDataSource({
     connector: PushConnector,
     installation: options.installation,
     application: options.application,
@@ -33,7 +33,7 @@ exports.createPushModel = function(options) {
     checkPeriodInSeconds: options.checkPeriodInSeconds,
   });
 
-  var PushModel = pushDataSource.createModel(options.name || 'Push', {},
+  const PushModel = pushDataSource.createModel(options.name || 'Push', {},
     {plural: options.plural || 'push'});
   return PushModel;
 };

lib/payload.js

@@ -5,16 +5,16 @@
 
 'use strict';
 
-var g = require('strong-globalize')();
+const g = require('strong-globalize')();
 
-var serial = 0;
-var __hasProp = {}.hasOwnProperty;
+let serial = 0;
+const __hasProp = {}.hasOwnProperty;
 
 // eslint-disable-next-line camelcase
 Payload.prototype.locale_format = /^[a-z]{2}_[A-Z]{2}$/;
 
 function Payload(data) {
-  var key, prefix, subkey, sum, type, value, _i, _len, _ref, _ref1;
+  let key, prefix, subkey, sum, type, value, _i, _len, _ref;
   if (typeof data !== 'object') {
     throw new Error(g.f('Invalid payload'));
   }
@@ -55,13 +55,12 @@ function Payload(data) {
     }
   }
   sum = 0;
-  _ref1 = ['title', 'msg', 'data'];
+  const _ref1 = ['title', 'msg', 'data'];
   for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
     type = _ref1[_i];
     sum += ((function() {
-      var _ref2, _results;
-      _ref2 = this[type];
-      _results = [];
+      const _ref2 = this[type];
+      const _results = [];
       for (key in _ref2) {
         if (!__hasProp.call(_ref2, key)) continue;
         _results.push(key);
@@ -97,8 +96,8 @@ Payload.prototype.localized = function(type, lang) {
 };
 
 Payload.prototype.compile = function() {
-  var lang, msg, type, _i, _len, _ref, _ref1;
-  _ref = ['title', 'msg'];
+  let lang, msg, type, _i, _len, _ref1;
+  const _ref = ['title', 'msg'];
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     type = _ref[_i];
     _ref1 = this[type];
@@ -112,24 +111,24 @@ Payload.prototype.compile = function() {
 };
 
 Payload.prototype.compileTemplate = function(tmpl) {
-  var _this = this;
+  const _this = this;
   return tmpl.replace(/\$\{(.*?)\}/g, function(match, keyPath) {
     return _this.variable(keyPath);
   });
 };
 
 Payload.prototype.variable = function(keyPath) {
-  var key, prefix, _ref, _ref1, _ref2;
+  let _ref, _ref1;
   if (keyPath === 'event.name') {
     if ((_ref = this.event) != null ? _ref.name : undefined) {
       return (_ref1 = this.event) != null ? _ref1.name : undefined;
     } else {
       throw new Error(g.f('The ${%s} does not exist', keyPath));
     }
   }
-  _ref2 = keyPath.split('.', 2);
-  prefix = _ref2[0];
-  key = _ref2[1];
+  const _ref2 = keyPath.split('.', 2);
+  const prefix = _ref2[0];
+  const key = _ref2[1];
   if (prefix !== 'var' && prefix !== 'data') {
     throw new Error(g.f('Invalid variable type for ${%s}', keyPath));
   }

lib/providers/apns.js

@@ -5,13 +5,13 @@
 
 'use strict';
 
-var g = require('strong-globalize')();
+const g = require('strong-globalize')();
 
-var inherits = require('util').inherits;
-var assert = require('assert');
-var EventEmitter = require('events').EventEmitter;
-var debug = require('debug')('loopback:component:push:provider:apns');
-var apn = require('apn');
+const inherits = require('util').inherits;
+const assert = require('assert');
+const EventEmitter = require('events').EventEmitter;
+const debug = require('debug')('loopback:component:push:provider:apns');
+const apn = require('apn');
 
 /**
  * Provider used to distribute push notifications through Apple Push Notification Service.
@@ -21,8 +21,8 @@ var apn = require('apn');
 function ApnsProvider(pushSettings) {
   pushSettings = pushSettings || {};
 
-  var settings = pushSettings.apns || {};
-  var pushOptions = settings.pushOptions || {};
+  const settings = pushSettings.apns || {};
+  const pushOptions = settings.pushOptions || {};
 
   // is running sandbox / production
   if (typeof settings.production === 'undefined') {
@@ -32,7 +32,7 @@ function ApnsProvider(pushSettings) {
   }
 
   // validate required properties
-  var errors = {
+  const errors = {
     token: 'JWT Token must be defined, property "token" is undefined.',
     bundle: 'Bundle should contain the bundle identifier of the app',
 
@@ -41,7 +41,7 @@ function ApnsProvider(pushSettings) {
     teamId: 'Tokens property "teamId" must be set.',
   };
 
-  var u = 'undefined';
+  const u = 'undefined';
 
   assert.notStrictEqual(typeof settings.token, u, errors.token);
   assert.notStrictEqual(typeof settings.bundle, u, errors.bundle);
@@ -62,7 +62,7 @@ function ApnsProvider(pushSettings) {
    * @type {null}
    * @private
    */
-  var _connection = null;
+  let _connection = null;
 
   /**
    * Sets the stored connection
@@ -102,7 +102,7 @@ exports = module.exports = ApnsProvider;
  * @private
  */
 ApnsProvider.prototype._ensurePushConnection = function(options) {
-  var self = this;
+  const self = this;
 
   debug('Check whether connected', self.getConnected());
 
@@ -130,7 +130,7 @@ ApnsProvider.prototype._ensurePushConnection = function(options) {
    * @param recipient
    */
   function transmissionErrorHandler(code, notification, recipient) {
-    var err = new Error(g.f('Cannot send {{APNS}} notification: %s', code));
+    const err = new Error(g.f('Cannot send {{APNS}} notification: %s', code));
     self.emit(err, notification, recipient);
   }
 
@@ -157,8 +157,8 @@ ApnsProvider.prototype._ensurePushConnection = function(options) {
  * @param deviceToken
  */
 ApnsProvider.prototype.pushNotification = function(notification, deviceToken) {
-  var self = this;
-  var pushOptions = self._pushOptions;
+  const self = this;
+  const pushOptions = self._pushOptions;
 
   // node-apn has a bug rightnow.. after sending the first
   // batch of notifications, the connection goes away
@@ -167,7 +167,7 @@ ApnsProvider.prototype.pushNotification = function(notification, deviceToken) {
 
   // Note parameters are described here:
   //   http://bit.ly/apns-notification-payload
-  var note = _createNotification(notification, pushOptions);
+  const note = _createNotification(notification, pushOptions);
 
   debug('Pushing notification to %j:', deviceToken, note);
 
@@ -192,7 +192,7 @@ ApnsProvider.prototype.pushNotification = function(notification, deviceToken) {
  * @private
  */
 function _createNotification(notification, pushOptions) {
-  var note = new apn.Notification();
+  const note = new apn.Notification();
 
   note.expiry = notification.getTimeToLiveInSecondsFromNow() || note.expiry;
   note.badge = notification.badge;
@@ -221,10 +221,10 @@ function _createNotification(notification, pushOptions) {
  * @private
  */
 function _extractDeviceTokens(failed) {
-  var tokens = [];
+  const tokens = [];
 
   failed.forEach(function(device) {
-    var token = device.device;
+    const token = device.device;
 
     tokens.push(token);
   });

lib/providers/gcm.js

@@ -5,16 +5,16 @@
 
 'use strict';
 
-var g = require('strong-globalize')();
+const g = require('strong-globalize')();
 
-var inherits = require('util').inherits;
-var extend = require('util')._extend;
-var EventEmitter = require('events').EventEmitter;
-var gcm = require('node-gcm');
-var debug = require('debug')('loopback:component:push:provider:gcm');
+const inherits = require('util').inherits;
+const extend = require('util')._extend;
+const EventEmitter = require('events').EventEmitter;
+const gcm = require('node-gcm');
+const debug = require('debug')('loopback:component:push:provider:gcm');
 
 function GcmProvider(pushSettings) {
-  var settings = pushSettings.gcm || {};
+  const settings = pushSettings.gcm || {};
   this._setupPushConnection(settings);
 }
 
@@ -28,18 +28,18 @@ GcmProvider.prototype._setupPushConnection = function(options) {
 };
 
 GcmProvider.prototype.pushNotification = function(notification, deviceToken) {
-  var self = this;
+  const self = this;
 
-  var registrationIds = (typeof deviceToken == 'string') ?
+  const registrationIds = (typeof deviceToken == 'string') ?
     [deviceToken] : deviceToken;
-  var message = this._createMessage(notification);
+  const message = this._createMessage(notification);
 
   debug('Sending message to %j: %j', registrationIds, message);
   this._connection.send(message, registrationIds, 3, function(err, result) {
     if (!err && result && result.failure) {
-      var devicesGoneRegistrationIds = [];
-      var errors = [];
-      var code;
+      const devicesGoneRegistrationIds = [];
+      const errors = [];
+      let code;
       result.results.forEach(function(value, index) {
         code = value && value.error;
         if (code === 'NotRegistered' || code === 'InvalidRegistration') {
@@ -73,13 +73,13 @@ GcmProvider.prototype.pushNotification = function(notification, deviceToken) {
 GcmProvider.prototype._createMessage = function(notification) {
   // Message parameters are documented here:
   //   https://developers.google.com/cloud-messaging/server-ref
-  var message = new gcm.Message({
+  const message = new gcm.Message({
     timeToLive: notification.getTimeToLiveInSecondsFromNow(),
     collapseKey: notification.collapseKey,
     delayWhileIdle: notification.delayWhileIdle,
   });
 
-  var propNames = Object.keys(notification);
+  const propNames = Object.keys(notification);
   // GCM does not have reserved message parameters for alert or badge, adding them as data.
   propNames.push('alert', 'badge');
 

lib/push-connector.js

@@ -5,27 +5,27 @@
 
 'use strict';
 
-var loopback = require('loopback');
-var PushManager = require('./push-manager');
+const loopback = require('loopback');
+const PushManager = require('./push-manager');
 /**
  * Export the initialize method to Loopback DataSource
  * @param {Object} dataSource Loopback dataSource (Memory, etc).
  * @param {Function} callback (unused)
  */
 exports.initialize = function(dataSource, callback) {
-  var settings = dataSource.settings || {};
+  const settings = dataSource.settings || {};
 
   // Create an instance of the APNSManager
-  var connector = new PushManager(settings);
+  const connector = new PushManager(settings);
   dataSource.connector = connector;
   dataSource.connector.dataSource = dataSource;
 
   connector.DataAccessObject = function() {};
-  for (var m in PushManager.prototype) {
-    var method = PushManager.prototype[m];
+  for (const m in PushManager.prototype) {
+    const method = PushManager.prototype[m];
     if ('function' === typeof method) {
       connector.DataAccessObject[m] = method.bind(connector);
-      for (var k in method) {
+      for (const k in method) {
         connector.DataAccessObject[m][k] = method[k];
       }
     }