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.

Sign up for GitHub

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

Jump to bottom

to avoid conflict of grabbing websocket port #5329

Merged
merged 2 commits into from Mar 1, 2017
Merged

to avoid conflict of grabbing websocket port #5329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11ec9af
to avoid conflict of grabbing websocket port
jhcao23 Feb 28, 2017
f2cac55
reformat
jhcao23 Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion generators/client/templates/angular/webpack/_webpack.dev.js
View file
Open in desktop
Expand Up @@ -56,7 +56,10 @@ module.exports = webpackMerge(commonConfig({ env: ENV }), {
new BrowserSyncPlugin({
host: 'localhost',
port: 9000,
proxy: 'http://localhost:9060'
proxy: {
target: 'http://localhost:9060'<% if (websocket === 'spring-websocket') { %>,
ws: true<% } %>
}
}, {
reload: false
}),
Expand Down