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

resolve merge conflict for PR #151 #187

Merged
merged 13 commits into from
May 7, 2017

Conversation

faceyspacey
Copy link
Contributor

This PR resolves: #151

@iMoses 's original code worked fine, but just needed to be updated with other changes that occurred in the webpack-dev-middleware package over the last few months. All tests are passing. I also made the primary code more readable, i.e. the code to determine the publicPath and outputPath.

In addition, I've personally used it in both a multi-compiler app and a non-multi-compiler app, and it works just fine. It doesn't do that much. It shouldn't be a problem. Hopefully we can get this merged soon.

@jsf-clabot
Copy link

jsf-clabot commented Apr 20, 2017

CLA assistant check
All committers have signed the CLA.

@shellscape
Copy link
Contributor

thanks @faceyspacey, will have a look tomorrow

@shellscape
Copy link
Contributor

@rainercedric23 @Xonar @rfloriano please give this branch a try and let us know how it works for you

@faceyspacey
Copy link
Contributor Author

any word on merging on this? Today I'm releasing another package that depends on this and will need to create an unnecessary package to depend on to make documentation straightforward.

@shellscape
Copy link
Contributor

I'd like to wait for the folks mentioned to test this on their implementations. I completely understand that there's some urgency on your end, but I feel patience on this PR is prudent.

@faceyspacey
Copy link
Contributor Author

Anyone had a chance to check this out?

@faceyspacey
Copy link
Contributor Author

Anyone get a chance to look at this? I think what happened last time is it didn't get merged, and other commits came in, and this had to be updated. That seems to be what will happen again if nobody takes a look at this. @shellscape I don't suppose you can check it out?

@shellscape
Copy link
Contributor

@faceyspacey kill that yarn.lock file in the commit and I'll merge it

@faceyspacey
Copy link
Contributor Author

done.

README.md Outdated
@@ -13,6 +13,8 @@
<h1>webpack Dev Middleware</h1>
</div>

**NOTE: This is a temporary package that adds support for multiple compilers with a pending PR that likely will be merged soon: https://github.com/webpack/webpack-dev-middleware/pull/187 ...don't sweat it.**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this snuck in on you

package.json Outdated
"name": "webpack-dev-middleware",
"version": "1.10.1",
"name": "webpack-dev-middleware-multi-compiler",
"version": "1.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and this change in package.json too

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, sorry about that.

@shellscape
Copy link
Contributor

Thanks very much for putting the time into this. I'll get with the NPM owners and try to get this published timely.

@faceyspacey
Copy link
Contributor Author

any chance this can get published to NPM soon?

@shellscape
Copy link
Contributor

I've pinged @SpaceK33z

@7rulnik
Copy link

7rulnik commented Jun 15, 2017

@SpaceK33z sorry for disturbing, but can you release it?

@shellscape
Copy link
Contributor

I've been given the ability to publish now 🎉 but I won't be able to roll this one out until tomorrow.

@7rulnik
Copy link

7rulnik commented Jun 15, 2017

It's fine. Can you ping me after release?

@eudaimos
Copy link

eudaimos commented Jun 22, 2017

@shellscape was this published?
Haha - you literally tagged it half an hour ago - sorry for the comment.

Seeing if it's published yet now

@shellscape
Copy link
Contributor

yes, it's published. and no worries

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.

6 participants