Merge pull request #5329 from jhcao23/master

to avoid conflict of grabbing websocket port
jhipster · Mar 1, 2017 · 11d2adb · 11d2adb
2 parents b62c112 + f2cac55
commit 11d2adb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/generators/client/templates/angular/webpack/_webpack.dev.js b/generators/client/templates/angular/webpack/_webpack.dev.js
@@ -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
         }),