Skip to content

Commit

Permalink
fix(pollinate): fix package.json merging
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards1211 committed Feb 20, 2017
1 parent 4c630b2 commit 8707b64
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions complete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ set -e

git remote rename origin skeleton
npm i lodash.merge
./merge-json.js package.json PROJECT-package.json > package.json
./merge-package-json.js
npm rm lodash.merge
rm merge-json.js PROJECT-package.json complete.sh
rm merge-package-json.js PROJECT-package.json complete.sh
git add --all .
git commit -n -m 'pollinate project'"
7 changes: 0 additions & 7 deletions merge-json.js

This file was deleted.

7 changes: 7 additions & 0 deletions merge-package-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env node

var merge = require('lodash.merge')
var fs = require('fs')
var merged = merge(require('./package.json'), require('./PROJECT-package.json'))
fs.writeFileSync('./package.json', JSON.stringify(merged, null, 2), 'utf8')

0 comments on commit 8707b64

Please sign in to comment.