Skip to content

Serve sockjs.js from sockjs-client dependency, don't use default from CDN #493

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

Merged
merged 1 commit into from
Sep 16, 2016

Conversation

Volune
Copy link
Contributor

@Volune Volune commented May 27, 2016

Fixes #474 "Incompatibile SockJS" (appears when using iframe mode)

@marie-hughes
Copy link

@sokra, could we get some movement on this? This issue makes the hotloader unusable.

@SpaceK33z
Copy link
Member

SpaceK33z commented Aug 31, 2016

I don't exactly get why this should be in a separate bundle. sockjs-client is already included in the client/index.bundle.js?

@elyscape
Copy link

@SpaceK33z I'm not sure if this is still the case but, at the time this pull request and issue #474 were opened, sockjs-client wasn't included in client/index.bundle.js.

@@ -52,7 +52,10 @@
"ssl/"
],
"scripts": {
"prepublish": "webpack ./client/live.js client/live.bundle.js --color --config client/webpack.config.js -p && webpack ./client/index.js client/index.bundle.js --color --config client/webpack.config.js -p",
"prepublish": "npm run webpack-live && npm run webpack-index && npm run webpack-sockjs",
"webpack-live": "webpack ./client/live.js client/live.bundle.js --color --config client/webpack.config.js -p",
Copy link
Member

@SpaceK33z SpaceK33z Sep 7, 2016

Choose a reason for hiding this comment

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

Can you change webpack- to client- here (and the other scripts)? webpack doesn't tell me anything in this case.

Copy link
Member

@SpaceK33z SpaceK33z left a comment

Choose a reason for hiding this comment

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

See comments in code above. If you update that, and fix the merge conflicts, I'll merge this in :).

@Volune Volune force-pushed the serve-sockjs-client branch from 590bbb2 to 9f1210e Compare September 16, 2016 13:18
@SpaceK33z SpaceK33z merged commit bd976f2 into webpack:master Sep 16, 2016
@SpaceK33z
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants