Skip to content

Commit

Permalink
Merge: Update dependencies and expand ci test versions (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
sttk authored Sep 21, 2020
2 parents 69ef436 + e89907f commit 196fc9e
Show file tree
Hide file tree
Showing 11 changed files with 95 additions and 38 deletions.
14 changes: 13 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ sudo: false
language: node_js

node_js:
- '14'
- '13'
- '12'
- '11'
- '10'
- '9'
- '8'
Expand All @@ -13,7 +17,15 @@ node_js:
- '0.12'
- '0.10'

after_success: 'npm run coveralls'
before_install:
- if [ $(echo "${TRAVIS_NODE_VERSION}" | cut -d'.' -f1) -eq 5 ]; then
npm i -g npm@4;
fi

after_success:
- if [ $(echo "${TRAVIS_NODE_VERSION}" | cut -d'.' -f1) -ge 6 ]; then
npm run coveralls;
fi

os:
- linux
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 Takayuki Sato
Copyright (c) 2016-2020 Takayuki Sato

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ If *converter* is given, it is able to convert the terminal values.

## License

Copyright (C) 2016-2018 Takayuki Sato
Copyright (C) 2016-2020 Takayuki Sato

This program is free software under [MIT][mit-url] License.
See the file LICENSE in this distribution for more details.
Expand Down
7 changes: 6 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
environment:
matrix:
# node.js
- nodejs_version: "14"
- nodejs_version: "13"
- nodejs_version: "12"
- nodejs_version: "11"
- nodejs_version: "10"
- nodejs_version: "9"
- nodejs_version: "8"
Expand All @@ -16,7 +20,8 @@ environment:

install:
- ps: Install-Product node $env:nodejs_version
- npm install
- ps: if ($env:nodejs_version -eq '5') { npm i -g npm@4 }
- cmd: npm install

test_script:
- node --version
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var eachProps = require('each-props');
var isPlainObject = require('is-plain-object');
var isPlainObject = require('is-plain-object').isPlainObject;

module.exports = function(src, dst, fromto, converter, reverse) {

Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
},
"homepage": "https://github.com/sttk/copy-props#readme",
"dependencies": {
"each-props": "^1.3.0",
"is-plain-object": "^2.0.1"
"each-props": "^1.3.2",
"is-plain-object": "^5.0.0"
},
"devDependencies": {
"browserify": "^16.2.2",
"browserify": "^16.5.2",
"chai": "^3.5.0",
"coveralls": "^3.0.1",
"eslint": "^4.19.1",
"mocha": "^3.2.0",
"nyc": "^11.7.2",
"uglify-js": "^3.3.24"
"coveralls": "^3.1.0",
"eslint": "^7.9.0",
"mocha": "^3.5.3",
"nyc": "^15.1.0",
"uglify-js": "^3.10.4"
}
}
2 changes: 1 addition & 1 deletion test/copy-props-proc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var copyProps = require('..');
var chai = require('chai');
var expect = chai.expect;

/* eslint max-statements: "off", branch-style: "off" */
/* eslint max-statements: "off" */

describe('Processing', function() {

Expand Down
2 changes: 1 addition & 1 deletion test/web/copy-props-proc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

var expect = chai.expect;

/* eslint max-statements: "off", branch-style: "off" */
/* eslint max-statements: "off" */

describe('Processing', function() {

Expand Down
82 changes: 61 additions & 21 deletions web/copy-props.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'use strict';

var eachProps = require('each-props');
var isPlainObject = require('is-plain-object');
var isPlainObject = require('is-plain-object').isPlainObject;

module.exports = function(src, dst, fromto, converter, reverse) {

Expand Down Expand Up @@ -226,7 +226,7 @@ function isObject(v) {
return Object.prototype.toString.call(v) === '[object Object]';
}

},{"each-props":4,"is-plain-object":7}],2:[function(require,module,exports){
},{"each-props":4,"is-plain-object":8}],2:[function(require,module,exports){
/*!
* array-each <https://github.com/jonschlinkert/array-each>
*
Expand Down Expand Up @@ -368,7 +368,46 @@ function isObject(v) {
}


},{"is-plain-object":7,"object.defaults/immutable":9}],5:[function(require,module,exports){
},{"is-plain-object":5,"object.defaults/immutable":10}],5:[function(require,module,exports){
/*!
* is-plain-object <https://github.com/jonschlinkert/is-plain-object>
*
* Copyright (c) 2014-2017, Jon Schlinkert.
* Released under the MIT License.
*/

'use strict';

var isObject = require('isobject');

function isObjectObject(o) {
return isObject(o) === true
&& Object.prototype.toString.call(o) === '[object Object]';
}

module.exports = function isPlainObject(o) {
var ctor,prot;

if (isObjectObject(o) === false) return false;

// If has modified constructor
ctor = o.constructor;
if (typeof ctor !== 'function') return false;

// If has modified prototype
prot = ctor.prototype;
if (isObjectObject(prot) === false) return false;

// If constructor does not have an Object-specific method
if (prot.hasOwnProperty('isPrototypeOf') === false) {
return false;
}

// Most likely a plain Object
return true;
};

},{"isobject":9}],6:[function(require,module,exports){
/*!
* for-in <https://github.com/jonschlinkert/for-in>
*
Expand All @@ -386,7 +425,7 @@ module.exports = function forIn(obj, fn, thisArg) {
}
};

},{}],6:[function(require,module,exports){
},{}],7:[function(require,module,exports){
/*!
* for-own <https://github.com/jonschlinkert/for-own>
*
Expand All @@ -407,35 +446,34 @@ module.exports = function forOwn(obj, fn, thisArg) {
});
};

},{"for-in":5}],7:[function(require,module,exports){
},{"for-in":6}],8:[function(require,module,exports){
'use strict';

Object.defineProperty(exports, '__esModule', { value: true });

/*!
* is-plain-object <https://github.com/jonschlinkert/is-plain-object>
*
* Copyright (c) 2014-2017, Jon Schlinkert.
* Released under the MIT License.
*/

'use strict';

var isObject = require('isobject');

function isObjectObject(o) {
return isObject(o) === true
&& Object.prototype.toString.call(o) === '[object Object]';
function isObject(o) {
return Object.prototype.toString.call(o) === '[object Object]';
}

module.exports = function isPlainObject(o) {
function isPlainObject(o) {
var ctor,prot;

if (isObjectObject(o) === false) return false;
if (isObject(o) === false) return false;

// If has modified constructor
ctor = o.constructor;
if (typeof ctor !== 'function') return false;
if (ctor === undefined) return true;

// If has modified prototype
prot = ctor.prototype;
if (isObjectObject(prot) === false) return false;
if (isObject(prot) === false) return false;

// If constructor does not have an Object-specific method
if (prot.hasOwnProperty('isPrototypeOf') === false) {
Expand All @@ -444,9 +482,11 @@ module.exports = function isPlainObject(o) {

// Most likely a plain Object
return true;
};
}

},{"isobject":8}],8:[function(require,module,exports){
exports.isPlainObject = isPlainObject;

},{}],9:[function(require,module,exports){
/*!
* isobject <https://github.com/jonschlinkert/isobject>
*
Expand All @@ -460,7 +500,7 @@ module.exports = function isObject(val) {
return val != null && typeof val === 'object' && Array.isArray(val) === false;
};

},{}],9:[function(require,module,exports){
},{}],10:[function(require,module,exports){
'use strict';

var slice = require('array-slice');
Expand All @@ -482,7 +522,7 @@ module.exports = function immutableDefaults() {
return defaults.apply(null, [{}].concat(args));
};

},{"./mutable":10,"array-slice":3}],10:[function(require,module,exports){
},{"./mutable":11,"array-slice":3}],11:[function(require,module,exports){
'use strict';

var each = require('array-each');
Expand Down Expand Up @@ -519,5 +559,5 @@ module.exports = function defaults(target, objects) {
return target;
};

},{"array-each":2,"array-slice":3,"for-own":6,"isobject":8}]},{},[1])(1)
},{"array-each":2,"array-slice":3,"for-own":7,"isobject":9}]},{},[1])(1)
});
2 changes: 1 addition & 1 deletion web/copy-props.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 196fc9e

Please # to comment.