Update steal to 1.x #45
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
imaustink
force-pushed
the
11-update-steal-to-1.x
branch
3 times, most recently
from
c5e70e3 to
f41dc6f
Compare
imaustink
force-pushed
the
11-update-steal-to-1.x
branch
from
f41dc6f to
88146e5
Compare
The main goal of this PR is to upgrade steal. Testing these changes on our bit-docs generated sites exposed the need for a package override feature. - Upgraded steal to 1.x - Cleaned up tests - Added package override feature This branch was based on `minor`, and rebased on `master`. Closes #11
imaustink
force-pushed
the
11-update-steal-to-1.x
branch
from
88146e5 to
91bc024
Compare
| @@ -113,6 +113,8 @@ function addPackages(siteConfig, buildFolder) { | |||
| return readFile(path.join(fullBuildFolderPath, "package.json")).then(function(packageContents){ | |||
| var json = JSON.parse(packageContents); | |||
|
|
|||
| json = _.merge(json || {}, siteConfig.html.package); | |||
There was a problem hiding this comment.
not sure where ... but it would be good to document that .dependencies overwrites .package.
justinbmeyer
approved these changes
Aug 16, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upgrade bit-docs to steal 1.x
The main goal of this PR is to upgrade steal. Testing these changes on our bit-docs generated sites exposed the need for a package override feature.
This branch was based on
minor, and rebased onmaster.Closes #11