Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pr 194 into master #195

Merged
merged 7 commits into from
Nov 15, 2016
Merged

Merge pr 194 into master #195

merged 7 commits into from
Nov 15, 2016

Conversation

justin808
Copy link
Member

@justin808 justin808 commented Oct 30, 2016

This change is Reviewable

@justin808
Copy link
Member Author

@navarroaxel We cannot merge your change into master.

Please sync up and try it out. Both production and dev versions of your examples crash on startup.

CC: @Judahmeek

@justin808
Copy link
Member Author

Relates to #194 and #193.

@navarroaxel
Copy link
Contributor

@justin808 I will try.

@Judahmeek
Copy link
Contributor

Here's my crack at fixing the issues: https://github.com/judahmeek/bootstrap-loader/tree/merge-pr-194-into-master I didn't actually check the resulting webpages, but I got webpack to run without crashing or producing config errors.

@justin808
Copy link
Member Author

@Judahmeek and @navarroaxel Please collaborate!

navarroaxel and others added 4 commits November 14, 2016 18:41
* fix config as global var and example with multiple entries
* updated README and CONTRIBUTING with new example
* travis build on nodejs 6.x
0.25 crashes: #191

0.24 works, but now with the multiple-examples
* fix config
* fixed lint issues and multiple-enties package.json
@Judahmeek
Copy link
Contributor

The reason that Travis is currently failing is because webpack just got a beta.26 version, which is outside the acceptable Peer Dependency set in our package.json, but the our current .travis.yml commands just attempts to install the latest beta version, which fails.

https://github.com/shakacode/bootstrap-loader/blob/merge-pr-194-into-master/.travis.yml#L10 needs to match https://github.com/shakacode/bootstrap-loader/blob/merge-pr-194-into-master/package.json#L44

@justin808
Copy link
Member Author

Reviewed 21 of 28 files at r1, 4 of 9 files at r2, 8 of 8 files at r3, 1 of 1 files at r4, 1 of 1 files at r5.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@justin808 justin808 merged commit c8dcffe into master Nov 15, 2016
@justin808 justin808 deleted the merge-pr-194-into-master branch November 15, 2016 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants