Skip to content

Commit 196fc9e

Browse files
authored
Merge: Update dependencies and expand ci test versions (#5)
2 parents 69ef436 + e89907f commit 196fc9e

11 files changed

+95
-38
lines changed

.travis.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ sudo: false
33
language: node_js
44

55
node_js:
6+
- '14'
7+
- '13'
8+
- '12'
9+
- '11'
610
- '10'
711
- '9'
812
- '8'
@@ -13,7 +17,15 @@ node_js:
1317
- '0.12'
1418
- '0.10'
1519

16-
after_success: 'npm run coveralls'
20+
before_install:
21+
- if [ $(echo "${TRAVIS_NODE_VERSION}" | cut -d'.' -f1) -eq 5 ]; then
22+
npm i -g npm@4;
23+
fi
24+
25+
after_success:
26+
- if [ $(echo "${TRAVIS_NODE_VERSION}" | cut -d'.' -f1) -ge 6 ]; then
27+
npm run coveralls;
28+
fi
1729

1830
os:
1931
- linux

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 Takayuki Sato
3+
Copyright (c) 2016-2020 Takayuki Sato
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ If *converter* is given, it is able to convert the terminal values.
209209

210210
## License
211211

212-
Copyright (C) 2016-2018 Takayuki Sato
212+
Copyright (C) 2016-2020 Takayuki Sato
213213

214214
This program is free software under [MIT][mit-url] License.
215215
See the file LICENSE in this distribution for more details.

appveyor.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
environment:
55
matrix:
66
# node.js
7+
- nodejs_version: "14"
8+
- nodejs_version: "13"
9+
- nodejs_version: "12"
10+
- nodejs_version: "11"
711
- nodejs_version: "10"
812
- nodejs_version: "9"
913
- nodejs_version: "8"
@@ -16,7 +20,8 @@ environment:
1620

1721
install:
1822
- ps: Install-Product node $env:nodejs_version
19-
- npm install
23+
- ps: if ($env:nodejs_version -eq '5') { npm i -g npm@4 }
24+
- cmd: npm install
2025

2126
test_script:
2227
- node --version

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

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

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

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
},
3636
"homepage": "https://github.com/sttk/copy-props#readme",
3737
"dependencies": {
38-
"each-props": "^1.3.0",
39-
"is-plain-object": "^2.0.1"
38+
"each-props": "^1.3.2",
39+
"is-plain-object": "^5.0.0"
4040
},
4141
"devDependencies": {
42-
"browserify": "^16.2.2",
42+
"browserify": "^16.5.2",
4343
"chai": "^3.5.0",
44-
"coveralls": "^3.0.1",
45-
"eslint": "^4.19.1",
46-
"mocha": "^3.2.0",
47-
"nyc": "^11.7.2",
48-
"uglify-js": "^3.3.24"
44+
"coveralls": "^3.1.0",
45+
"eslint": "^7.9.0",
46+
"mocha": "^3.5.3",
47+
"nyc": "^15.1.0",
48+
"uglify-js": "^3.10.4"
4949
}
5050
}

test/copy-props-proc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var copyProps = require('..');
44
var chai = require('chai');
55
var expect = chai.expect;
66

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

99
describe('Processing', function() {
1010

test/web/copy-props-proc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
var expect = chai.expect;
66

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

99
describe('Processing', function() {
1010

web/copy-props.js

+61-21
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

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

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

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

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

370370

371-
},{"is-plain-object":7,"object.defaults/immutable":9}],5:[function(require,module,exports){
371+
},{"is-plain-object":5,"object.defaults/immutable":10}],5:[function(require,module,exports){
372+
/*!
373+
* is-plain-object <https://github.com/jonschlinkert/is-plain-object>
374+
*
375+
* Copyright (c) 2014-2017, Jon Schlinkert.
376+
* Released under the MIT License.
377+
*/
378+
379+
'use strict';
380+
381+
var isObject = require('isobject');
382+
383+
function isObjectObject(o) {
384+
return isObject(o) === true
385+
&& Object.prototype.toString.call(o) === '[object Object]';
386+
}
387+
388+
module.exports = function isPlainObject(o) {
389+
var ctor,prot;
390+
391+
if (isObjectObject(o) === false) return false;
392+
393+
// If has modified constructor
394+
ctor = o.constructor;
395+
if (typeof ctor !== 'function') return false;
396+
397+
// If has modified prototype
398+
prot = ctor.prototype;
399+
if (isObjectObject(prot) === false) return false;
400+
401+
// If constructor does not have an Object-specific method
402+
if (prot.hasOwnProperty('isPrototypeOf') === false) {
403+
return false;
404+
}
405+
406+
// Most likely a plain Object
407+
return true;
408+
};
409+
410+
},{"isobject":9}],6:[function(require,module,exports){
372411
/*!
373412
* for-in <https://github.com/jonschlinkert/for-in>
374413
*
@@ -386,7 +425,7 @@ module.exports = function forIn(obj, fn, thisArg) {
386425
}
387426
};
388427

389-
},{}],6:[function(require,module,exports){
428+
},{}],7:[function(require,module,exports){
390429
/*!
391430
* for-own <https://github.com/jonschlinkert/for-own>
392431
*
@@ -407,35 +446,34 @@ module.exports = function forOwn(obj, fn, thisArg) {
407446
});
408447
};
409448

410-
},{"for-in":5}],7:[function(require,module,exports){
449+
},{"for-in":6}],8:[function(require,module,exports){
450+
'use strict';
451+
452+
Object.defineProperty(exports, '__esModule', { value: true });
453+
411454
/*!
412455
* is-plain-object <https://github.com/jonschlinkert/is-plain-object>
413456
*
414457
* Copyright (c) 2014-2017, Jon Schlinkert.
415458
* Released under the MIT License.
416459
*/
417460

418-
'use strict';
419-
420-
var isObject = require('isobject');
421-
422-
function isObjectObject(o) {
423-
return isObject(o) === true
424-
&& Object.prototype.toString.call(o) === '[object Object]';
461+
function isObject(o) {
462+
return Object.prototype.toString.call(o) === '[object Object]';
425463
}
426464

427-
module.exports = function isPlainObject(o) {
465+
function isPlainObject(o) {
428466
var ctor,prot;
429467

430-
if (isObjectObject(o) === false) return false;
468+
if (isObject(o) === false) return false;
431469

432470
// If has modified constructor
433471
ctor = o.constructor;
434-
if (typeof ctor !== 'function') return false;
472+
if (ctor === undefined) return true;
435473

436474
// If has modified prototype
437475
prot = ctor.prototype;
438-
if (isObjectObject(prot) === false) return false;
476+
if (isObject(prot) === false) return false;
439477

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

445483
// Most likely a plain Object
446484
return true;
447-
};
485+
}
448486

449-
},{"isobject":8}],8:[function(require,module,exports){
487+
exports.isPlainObject = isPlainObject;
488+
489+
},{}],9:[function(require,module,exports){
450490
/*!
451491
* isobject <https://github.com/jonschlinkert/isobject>
452492
*
@@ -460,7 +500,7 @@ module.exports = function isObject(val) {
460500
return val != null && typeof val === 'object' && Array.isArray(val) === false;
461501
};
462502

463-
},{}],9:[function(require,module,exports){
503+
},{}],10:[function(require,module,exports){
464504
'use strict';
465505

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

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

488528
var each = require('array-each');
@@ -519,5 +559,5 @@ module.exports = function defaults(target, objects) {
519559
return target;
520560
};
521561

522-
},{"array-each":2,"array-slice":3,"for-own":6,"isobject":8}]},{},[1])(1)
562+
},{"array-each":2,"array-slice":3,"for-own":7,"isobject":9}]},{},[1])(1)
523563
});

web/copy-props.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)