Skip to content

Commit 8707b64

Browse files
committed
fix(pollinate): fix package.json merging
1 parent 4c630b2 commit 8707b64

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

complete.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set -e
33

44
git remote rename origin skeleton
55
npm i lodash.merge
6-
./merge-json.js package.json PROJECT-package.json > package.json
6+
./merge-package-json.js
77
npm rm lodash.merge
8-
rm merge-json.js PROJECT-package.json complete.sh
8+
rm merge-package-json.js PROJECT-package.json complete.sh
99
git add --all .
1010
git commit -n -m 'pollinate project'"
1111

merge-json.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

merge-package-json.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env node
2+
3+
var merge = require('lodash.merge')
4+
var fs = require('fs')
5+
var merged = merge(require('./package.json'), require('./PROJECT-package.json'))
6+
fs.writeFileSync('./package.json', JSON.stringify(merged, null, 2), 'utf8')
7+

0 commit comments

Comments
 (0)