Skip to content

Commit

Permalink
Bump dependencies, switch from tap to tape
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Duff committed Jun 14, 2019
1 parent df5431d commit 5333b57
Show file tree
Hide file tree
Showing 8 changed files with 281 additions and 3,886 deletions.
4,133 changes: 262 additions & 3,871 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,22 @@
},
"scripts": {
"build": "rollup -c",
"test": "npm run build && tap test/*.js && jsmd readme.md && npm run test:typescript",
"test": "npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript",
"test:typescript": "tsc --noEmit test/typescript.ts && ts-node test/typescript.ts",
"size": "npm run build && uglifyjs --compress --mangle -- ./dist/umd.js | gzip -c | wc -c"
},
"devDependencies": {
"@types/node": "^8.10.49",
"is-mergeable-object": "1.1.0",
"is-plain-object": "^2.0.4",
"jsmd": "0.3.1",
"rollup": "0.49.3",
"rollup-plugin-commonjs": "8.2.1",
"rollup-plugin-node-resolve": "3.0.0",
"tap": "12.0.1",
"jsmd": "^1.0.1",
"rollup": "^1.15.5",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.2",
"tape": "^4.10.2",
"ts-node": "7.0.1",
"typescript": "=2.2.2",
"uglify-js": "^3.3.12"
"uglify-js": "^3.6.0"
},
"license": "MIT",
"dependencies": {}
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Merges the enumerable attributes of two or more objects deeply.

> UMD bundle is 593B minified+gzipped
> UMD bundle is 587B minified+gzipped

### Migration from 1.x to 2+
Expand Down
7 changes: 5 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ const pkg = require(`./package.json`)

export default {
input: `index.js`,
name: `deepmerge`,
plugins: [
commonjs(),
resolve(),
],
output: [
{ file: pkg.main, format: `umd` },
{
name: 'deepmerge',
file: pkg.main,
format: `umd`
},
],
}
2 changes: 1 addition & 1 deletion test/custom-array-merge.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var merge = require('../')
var test = require('tap').test
var test = require('tape')

test('custom merge array', function(t) {
var mergeFunctionCalled = false
Expand Down
2 changes: 1 addition & 1 deletion test/custom-is-mergeable-object.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var merge = require('../')
var test = require('tap').test
var test = require('tape')

test('isMergeableObject function copying object over object', function(t) {
var src = { key: { isMergeable: false }, baz: 'yes' }
Expand Down
2 changes: 1 addition & 1 deletion test/merge-all.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var merge = require('../')
var test = require('tap').test
var test = require('tape')

test('throw error if first argument is not an array', function(t) {
t.throws(merge.all.bind(null, { example: true }, { another: '2' }), Error)
Expand Down
4 changes: 2 additions & 2 deletions test/merge.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var merge = require('../')
var test = require('tap').test
var test = require('tape')

test('add keys in target that do not exist at the root', function(t) {
var src = { key1: 'value1', key2: 'value2' }
Expand Down Expand Up @@ -449,7 +449,7 @@ test('should overwrite values when property is initialised but undefined', funct

function hasUndefinedProperty(o) {
t.ok(o.hasOwnProperty('value'))
t.type(o.value, 'undefined')
t.equal(typeof o.value, 'undefined')
}

hasUndefinedProperty(merge(target1, src))
Expand Down

0 comments on commit 5333b57

Please sign in to comment.