chore: Upgrade deps and fix lint errors

finom · Oct 4, 2018 · fa77602 · fa77602
1 parent 57a3b27
commit fa77602
Show file tree

Hide file tree

Showing 14 changed files with 6,557 additions and 10,732 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,11 @@
 sudo: true
 language: node_js
 node_js:
-  - '7'
-before_install:
-  - npm install -g npm
+  - '10'
 branches:
   except:
-    - /^v\d+\.\d+\.\d+.*/
+    - /^v\d+\.\d+\.\d+/
+    - /^v\d+\.\d+\.\d+-bundle/
     - gh-pages
 after_success:
   if ([ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]); then

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,8 @@
     "deploy-to-git": "shx rm -rf bundle && deploy-to-git",
     "bundle-browser-test": "BABEL_ENV=test webpack --config test/webpack-test.config.js --mode development",
     "bundle-deploy-script": "npm run bundle && npm run bundle-browser-test",
-    "upgrade": "ncu -a -x semantic-release && npm install"
+    "upgrade": "ncu -a -x semantic-release && npm install",
+    "reinstall": "rm -rf package-lock.json node_modules/ && npm i"
   },
   "repository": {
     "type": "git",
@@ -76,11 +77,11 @@
   "devDependencies": {
     "app-module-path": "^2.2.0",
     "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
-    "babel-eslint": "^8.2.3",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^10.0.1",
     "babel-istanbul": "^0.12.2",
     "babel-istanbul-loader": "^0.1.0",
-    "babel-loader": "^7.1.4",
+    "babel-loader": "^8.0.4",
     "babel-plugin-check-es2015-constants": "^6.22.0",
     "babel-plugin-nofn": "0.0.3",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
@@ -97,43 +98,43 @@
     "babel-plugin-transform-es2015-template-literals": "^6.22.0",
     "babel-plugin-transform-object-spread-inline": "0.0.2",
     "babel-polyfill": "^6.26.0",
-    "commitizen": "^2.9.6",
-    "copy-webpack-plugin": "^4.5.1",
-    "coveralls": "^3.0.0",
+    "commitizen": "^3.0.2",
+    "copy-webpack-plugin": "^4.5.2",
+    "coveralls": "^3.0.2",
     "cz-simple-conventional-changelog": "0.0.1",
     "deploy-to-git": "^0.1.5",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-loader": "^2.0.0",
-    "eslint-plugin-import": "^2.11.0",
+    "eslint": "^5.6.1",
+    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-loader": "^2.1.1",
+    "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-output-todo-comments": "0.0.7",
-    "ghooks": "^2.0.3",
+    "ghooks": "^2.0.4",
     "istanbul": "^1.1.0-alpha.1",
-    "jasmine": "^3.1.0",
-    "jasmine-core": "^3.1.0",
+    "jasmine": "^3.2.0",
+    "jasmine-core": "^3.2.1",
     "jasmine-spec-reporter": "^4.2.1",
-    "jsdom": "^11.8.0",
-    "karma": "^2.0.2",
+    "jsdom": "^12.1.0",
+    "karma": "^3.0.0",
     "karma-babel-preprocessor": "^7.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-commonjs": "1.0.0",
-    "karma-coverage": "^1.1.1",
-    "karma-jasmine": "^1.1.1",
+    "karma-coverage": "^1.1.2",
+    "karma-jasmine": "^1.1.2",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^3.0.0",
+    "karma-webpack": "^3.0.5",
     "karma-webpack-with-fast-source-maps": "^1.10.2",
-    "npm-check-updates": "^2.14.1",
-    "npm-registry-client": "^8.5.1",
+    "npm-check-updates": "^2.14.2",
+    "npm-registry-client": "^8.6.0",
     "optimist": "^0.6.1",
     "semantic-release": "^8.0.3",
-    "shx": "^0.2.2",
-    "twit": "^2.2.9",
-    "uglifyjs-webpack-plugin": "^1.2.5",
+    "shx": "^0.3.2",
+    "twit": "^2.2.11",
+    "uglifyjs-webpack-plugin": "^2.0.1",
     "unminified-webpack-plugin": "^2.0.0",
     "validate-commit-msg": "^2.14.0",
     "webidl-conversions": "^4.0.2",
-    "webpack": "^4.6.0",
-    "webpack-cli": "^2.0.15",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2",
     "webpack-core": "^0.6.9",
     "word-wrap": "^1.2.3"
   },

diff --git a/src/_helpers/matreshkaerror.js b/src/_helpers/matreshkaerror.js
@@ -11,15 +11,13 @@ const getType = (variable) => {
 
     return typeof variable;
 };
-const getTypeError = (variable, variableName, expectedType) =>
-    `${variableName} must have type "${expectedType}" but got "${getType(variable)}" instead.`;
+const getTypeError = (variable, variableName, expectedType) => `${variableName} must have type "${expectedType}" but got "${getType(variable)}" instead.`;
 
 const errors = {
     'common:object_type': ({ object, method }) => `Error in ${method}: `
         + getTypeError(object, 'object', 'object'),
     'common:call_class': () => 'Cannot call a class as a function',
-    'common:use_magic_props': () =>
-        '"sandbox" key (for all objects) and "container" key (for Matreshka.Array instances)'
+    'common:use_magic_props': () => '"sandbox" key (for all objects) and "container" key (for Matreshka.Array instances)'
         + ' are reserved for service use and cannot be used as usual properties',
 
     'binding:node_missing': ({ key, node }) => {
@@ -32,56 +30,38 @@ const errors = {
         return `${bindingErrorPrefix} "${missing}" property of Matreshka instance is missing.`
             + ' It must be an object and must not be reassigned.';
     },
-    'binding:magic_props_nodes_length': () =>
-        `${bindingErrorPrefix} "sandbox" key (for all objects) and "container" key`
+    'binding:magic_props_nodes_length': () => `${bindingErrorPrefix} "sandbox" key (for all objects) and "container" key`
         + ' (for Matreshka.Array instances) cannot have more than one bound node',
 
-    'calc:target_type': ({ target }) =>
-        `${calcErrorPrefix} ${getTypeError(target, 'target key', 'string')}`,
-    'calc:source_key_type': ({ sourceKey }) =>
-        `${calcErrorPrefix} ${getTypeError(sourceKey, 'source key', 'string')}`,
-    'calc:source_object_type': ({ sourceObject }) =>
-        `${calcErrorPrefix} ${getTypeError(sourceObject, 'source object', 'object')}`,
-    'calc:source_type': ({ source }) =>
-        `${calcErrorPrefix} ${getTypeError(source, 'source', 'object')}`,
-
-    'array:model_type': ({ Model }) =>
-        `${arrayErrorPrefix} ${getTypeError(Model, 'Model', 'function')}`,
-    'array:add_render_twice': () =>
-        `${arrayErrorPrefix} one rendered object was inserted twice.`,
-    'array:rendered_number_nodes': ({ length }) =>
-        `${arrayErrorPrefix} renderer returned ${length} nodes instead of one.`
+    'calc:target_type': ({ target }) => `${calcErrorPrefix} ${getTypeError(target, 'target key', 'string')}`,
+    'calc:source_key_type': ({ sourceKey }) => `${calcErrorPrefix} ${getTypeError(sourceKey, 'source key', 'string')}`,
+    'calc:source_object_type': ({ sourceObject }) => `${calcErrorPrefix} ${getTypeError(sourceObject, 'source object', 'object')}`,
+    'calc:source_type': ({ source }) => `${calcErrorPrefix} ${getTypeError(source, 'source', 'object')}`,
+
+    'array:model_type': ({ Model }) => `${arrayErrorPrefix} ${getTypeError(Model, 'Model', 'function')}`,
+    'array:add_render_twice': () => `${arrayErrorPrefix} one rendered object was inserted twice.`,
+    'array:rendered_number_nodes': ({ length }) => `${arrayErrorPrefix} renderer returned ${length} nodes instead of one.`
         + ` ${length > 0 ? 'To fix this wrap these nodes by single node.' : ''}`,
-    'array:renderer_node_missing': ({ selector }) =>
-        `${arrayErrorPrefix} renderer node is missing (given selector is "${selector}")`,
-    'array:nonexistent_method': ({ method }) =>
-        `${arrayErrorPrefix} Array.prototype.${method} doesn't exist.`
+    'array:renderer_node_missing': ({ selector }) => `${arrayErrorPrefix} renderer node is missing (given selector is "${selector}")`,
+    'array:nonexistent_method': ({ method }) => `${arrayErrorPrefix} Array.prototype.${method} doesn't exist.`
             + ' You need to include a polyfill for it (e. g. babel-node)',
-    'array:method_compat_renderer': ({ method }) =>
-        `${arrayErrorPrefix} Not possible to render when ${method} method is called`,
+    'array:method_compat_renderer': ({ method }) => `${arrayErrorPrefix} Not possible to render when ${method} method is called`,
 
-    'pull:to_remove_type': ({ toRemove }) =>
-        `Error in pull: ${getTypeError(toRemove, 'toRemove', 'number')}`,
+    'pull:to_remove_type': ({ toRemove }) => `Error in pull: ${getTypeError(toRemove, 'toRemove', 'number')}`,
 
-    'restore:no_nodes': () =>
-        `${arrayErrorPrefix} cannot find any container to restore an instance using "restore" method`,
+    'restore:no_nodes': () => `${arrayErrorPrefix} cannot find any container to restore an instance using "restore" method`,
 
-    'trigger:names_type': ({ names }) =>
-        `${eventsErrorPrefix} ${getTypeError(names, 'event name', 'string')}`,
+    'trigger:names_type': ({ names }) => `${eventsErrorPrefix} ${getTypeError(names, 'event name', 'string')}`,
 
     'on:names_type': ({ names }) => errors['trigger:names_type']({ names }),
 
-    'removedatakeys:key_type': ({ key }) =>
-        `Error in removeDataKeys: ${getTypeError(key, 'key', 'string')}`,
+    'removedatakeys:key_type': ({ key }) => `Error in removeDataKeys: ${getTypeError(key, 'key', 'string')}`,
 
-    'adddatakeys:key_type': ({ key }) =>
-        `Error in addDataKeys: ${getTypeError(key, 'key', 'string')}`,
+    'adddatakeys:key_type': ({ key }) => `Error in addDataKeys: ${getTypeError(key, 'key', 'string')}`,
 
-    'remove:key_type': ({ key }) =>
-        `Error in remove: ${getTypeError(key, 'key', 'string')}`,
+    'remove:key_type': ({ key }) => `Error in remove: ${getTypeError(key, 'key', 'string')}`,
 
-    'mediate:key_type': ({ key }) =>
-        `Error in mediate: ${getTypeError(key, 'key', 'string')}`
+    'mediate:key_type': ({ key }) => `Error in mediate: ${getTypeError(key, 'key', 'string')}`
 };
 
 export default function matreshkaError(key, data) {

diff --git a/src/array/orderby/_pureorderby.js b/src/array/orderby/_pureorderby.js
@@ -29,7 +29,7 @@ export default function pureOrderBy(arr, givenKeys, orders) {
 
                     if (a[key] > b[key]) {
                         return -order;
-                    } else if (a[key] < b[key]) {
+                    } if (a[key] < b[key]) {
                         return order;
                     }
                 }

diff --git a/src/off/index.js b/src/off/index.js
@@ -26,8 +26,9 @@ export default function off(object, givenNames, callback, context) {
     // allow to pass name-handler object
     // TODO: Name-handler object passed to off method is non-documented feature
     if (givenNames && typeof givenNames === 'object' && !isNamesVarArray) {
-        nofn.forOwn(givenNames, (namesObjCallback, namesObjName) =>
-            off(object, namesObjName, namesObjCallback, callback));
+        nofn.forOwn(givenNames, (namesObjCallback, namesObjName) => off(
+            object, namesObjName, namesObjCallback, callback,
+        ));
         return object;
     }
 

diff --git a/src/on/_adddomlistener.js b/src/on/_adddomlistener.js
@@ -48,10 +48,8 @@ export default function addDomListener(object, key, eventName, selector, callbac
         domEventHandler,
         selector
     });
-    const addBindListenerResult
-        = addListener(object, `bind:${key}`, bindHandler, context, info);
-    const addUnbindListenerResult
-        = addListener(object, `unbind:${key}`, unbindHandler, context, info);
+    const addBindListenerResult = addListener(object, `bind:${key}`, bindHandler, context, info);
+    const addUnbindListenerResult = addListener(object, `unbind:${key}`, unbindHandler, context, info);
 
     // if events are added successfully then run bindHandler for every node immediately
     // TODO: Describe why do we need addBindListenerResult and addUnbindListenerResult

diff --git a/src/on/_addlistener.js b/src/on/_addlistener.js
@@ -4,8 +4,7 @@ import defineProp from '../_core/defineprop';
 import domEventReg from './_domeventregexp';
 
 // property modifier event regexp
-const propModEventReg // eslint-disable-next-line max-len
-    = /^_change:deps:|^_change:bindings:|^_change:delegated:|^_change:common:|^_change:tree:|^change:|^beforechange:/;
+const propModEventReg = /^_change:deps:|^_change:bindings:|^_change:delegated:|^_change:common:|^_change:tree:|^change:|^beforechange:/;
 
 // adds simple event listener
 // used as core of event engine

diff --git a/src/on/index.js b/src/on/index.js
@@ -24,8 +24,9 @@ export default function on(object, givenNames, callback, triggerOnInit, context)
 
     // allow to pass name-handler object
     if (givenNames && typeof givenNames === 'object' && !isNamesVarArray) {
-        nofn.forOwn(givenNames, (namesObjCallback, namesObjName) =>
-            on(object, namesObjName, namesObjCallback, callback, triggerOnInit));
+        nofn.forOwn(givenNames, (namesObjCallback, namesObjName) => on(
+            object, namesObjName, namesObjCallback, callback, triggerOnInit
+        ));
         return object;
     }
 

diff --git a/src/once.js b/src/once.js
@@ -22,8 +22,9 @@ export default function once(object, names, givenCallback, context) {
 
     // allow to pass name-handler object
     if (names && typeof names === 'object' && !isNamesVarArray) {
-        nofn.forOwn(names, (namesObjCallback, namesObjName) =>
-            once(object, namesObjName, namesObjCallback, givenCallback));
+        nofn.forOwn(names, (namesObjCallback, namesObjName) => once(
+            object, namesObjName, namesObjCallback, givenCallback
+        ));
         return object;
     }
 

diff --git a/test/spec/bindings/default_binders_spec.js b/test/spec/bindings/default_binders_spec.js
@@ -22,12 +22,11 @@ describe('Default binders', () => {
             bindersEqual: (util, customEqualityTesters) => ({
                 compare: (actual, expected) => {
                     const result = {};
-                    const pass = result.pass
-                        = util.equals(
-                            actual.on,
-                            expected.on,
-                            customEqualityTesters
-                        )
+                    const pass = result.pass = util.equals(
+                        actual.on,
+                        expected.on,
+                        customEqualityTesters
+                    )
                         && util.equals(
                             `${actual.getValue}`,
                             `${expected.getValue}`,

diff --git a/test/spec/matreshka_array/model_spec.js b/test/spec/matreshka_array/model_spec.js
@@ -51,22 +51,20 @@ describe('Matreshka.Array Model', () => {
     });
 
     it('throws error if Model has wront type', () => {
-        expect(() =>
-            new Class({
-                extends: MatreshkaArray,
-                Model: undefined,
-                constructor() {
-                    this.push({});
-                }
-            })).toThrow();
+        expect(() => new Class({
+            extends: MatreshkaArray,
+            Model: undefined,
+            constructor() {
+                this.push({});
+            }
+        })).toThrow();
 
-        expect(() =>
-            new Class({
-                extends: MatreshkaArray,
-                Model: {},
-                constructor() {
-                    this.push({});
-                }
-            })).toThrow();
+        expect(() => new Class({
+            extends: MatreshkaArray,
+            Model: {},
+            constructor() {
+                this.push({});
+            }
+        })).toThrow();
     });
 });
diff --git a/test/spec/matreshka_array/native_methods_spec.js b/test/spec/matreshka_array/native_methods_spec.js
@@ -72,16 +72,16 @@ describe('Matreshka.Array native methods', () => {
 
     it('supports reduce method', () => {
         const arr = new MatreshkaArray(0, 1, 2, 3, 4);
-        const result = arr.reduce((previousValue, currentValue) =>
-            previousValue + currentValue, 5);
+        const result = arr.reduce((previousValue, currentValue) => previousValue + currentValue, 5);
 
         expect(result).toEqual(15);
     });
 
     it('supports reduceRight method', () => {
         const arr = new MatreshkaArray(0, 1, 2, 3, 4);
-        const result = arr.reduceRight((previousValue, currentValue) =>
-            previousValue + currentValue, 5);
+        const result = arr.reduceRight(
+            (previousValue, currentValue) => previousValue + currentValue, 5
+        );
 
         expect(result).toEqual(15);
     });

diff --git a/test/spec/matreshka_array/renderer_spec.js b/test/spec/matreshka_array/renderer_spec.js
@@ -11,11 +11,10 @@ describe('Matreshka.Array renderer', () => {
     class Model extends MatreshkaObject {
         constructor(obj) {
             super(obj)
-                .on('render', () =>
-                    this.bindNode('x', ':sandbox span', html(), {
-                        debounceGetValue: false,
-                        debounceSetValue: false
-                    }));
+                .on('render', () => this.bindNode('x', ':sandbox span', html(), {
+                    debounceGetValue: false,
+                    debounceSetValue: false
+                }));
         }
     }
 
@@ -408,8 +407,7 @@ describe('Matreshka.Array renderer', () => {
     it('allows to unshift', () => {
         const arr = createArray();
 
-        arr.itemRenderer = createSpy(() =>
-            '<div><span></span></div>');
+        arr.itemRenderer = createSpy(() => '<div><span></span></div>');
 
         for (let i = 0; i < n; i++) {
             arr.unshift({
@@ -431,8 +429,7 @@ describe('Matreshka.Array renderer', () => {
     it('allows to unshift', () => {
         const arr = createArray();
 
-        arr.itemRenderer = createSpy(() =>
-            '<div><span></span></div>');
+        arr.itemRenderer = createSpy(() => '<div><span></span></div>');
 
         for (let i = 0; i < n; i++) {
             arr.unshift({
@@ -529,8 +526,7 @@ describe('Matreshka.Array renderer', () => {
     it('trims itemRenderer', () => {
         const arr = createArray();
 
-        arr.itemRenderer = createSpy(() =>
-            '         <div><span></span></div>            ');
+        arr.itemRenderer = createSpy(() => '         <div><span></span></div>            ');
 
         for (let i = 0; i < n; i++) {
             arr.push({