Skip to content

Commit

Permalink
Seems there's nothing to merge now
Browse files Browse the repository at this point in the history
  • Loading branch information
egoist committed Nov 29, 2018
1 parent 6dfb441 commit ceb14cd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
6 changes: 2 additions & 4 deletions lib/update-pkg.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const merge = require('lodash.merge')

const when = (condition, value, fallback) => (condition ? value : fallback)
const commands = cmds => cmds.filter(Boolean).join(' && ') || undefined

Expand All @@ -21,7 +19,7 @@ module.exports = (
const useXo = eslint === 'xo'
const useStandard = eslint === 'standard'

return merge(data, {
return {
name,
version: '0.0.0',
description,
Expand Down Expand Up @@ -85,5 +83,5 @@ module.exports = (
'git add'
]
}
})
}
}
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
},
"dependencies": {
"camelcase": "^4.0.0",
"lodash.merge": "^4.6.1",
"superb": "^1.3.0"
},
"devDependencies": {
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3641,11 +3641,6 @@ lodash.kebabcase@^4.0.1:
resolved "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=

lodash.merge@^4.6.1:
version "4.6.1"
resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==

lodash.mergewith@^4.6.1:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
Expand Down

0 comments on commit ceb14cd

Please sign in to comment.