smart merge package.json

[kellyselden]

Closes#68.

• resolve Object key order chbrown/rfc6902#22
• resolve includeFiles options joliss/node-fixturify#8
• add workaround for smart merge package.json #108 (comment) if the above isn't fixed
• merge use fixturify to return tag folders kellyselden/git-diff-apply#68
• merge extract hard coded keys to a reusable array bantic/three-way-merger#12
• merge assert current change overwriting behavior bantic/three-way-merger#15
• merge add minVersion function npm/node-semver#208
• resolve replace \n with EOL jprichardson/node-jsonfile#87
• merge use native EOL when saving package.json tomdale/ember-cli-addon-tests#153
• decide if we want this default or opt in behavior (via --auto-merge-package-json)
• update README
• fix merging from smart merge package.json #108 (comment)
• stage package.json after merge

cc @rwjblue@seawatts@san650@kategengler

[kellyselden]

I don't think merge is correct, this just happened:

[kellyselden]

package.json needs to be staged after merge.

[kellyselden]

If symlinks are broken in node_modules (npm link ember-cli, then delete globally), you get this error

 ember-cli-update Error: ENOENT: no such file or directory, stat './node_modules/.bin/ember'
ember-cli-update at Object.fs.statSync (fs.js:968:11)
ember-cli-update at Object.statSync (/Users/kelly.selden/code/ember-cli-update/node_modules/graceful-fs/polyfills.js:297:22)
ember-cli-update at readSync (/Users/kelly.selden/code/ember-cli-update/node_modules/fixturify/index.js:10:20)
ember-cli-update at readSync (/Users/kelly.selden/code/ember-cli-update/node_modules/fixturify/index.js:14:20)
ember-cli-update at Object.readSync (/Users/kelly.selden/code/ember-cli-update/node_modules/fixturify/index.js:14:20)
ember-cli-update at convertToObj (/Users/kelly.selden/code/ember-cli-update/node_modules/git-diff-apply/src/index.js:98:23)
ember-cli-update at ncp.then (/Users/kelly.selden/code/ember-cli-update/node_modules/git-diff-apply/src/index.js:56:16) +0ms

fixturify is trying to crawl it and failing. All the more reason to get joliss/node-fixturify#8 done. This is probably only an issue in global mode, because it won't run as an addon if ember-cli can't be resolved.

[kellyselden]

This has been working so well for me that I don't think an opt-in option would be worth it, so it will just be default.

[kellyselden]

Woohoo!

[kellyselden]

Released in v0.7.0

[rwjblue]

👏🙌😻