webpack · alexander-akait · Jan 30, 2019 · Jan 22, 2018 · Jan 22, 2018 · Jan 22, 2018
@@ -2,7 +2,7 @@
 
 /* global __resourceQuery WorkerGlobalScope self */
 /* eslint prefer-destructuring: off */
-
+const querystring = require('querystring');
-const querystring = require('querystring');
+const qs = require('querystring');
-const querystring = require('querystring');
+const qs = require('querystring');
 const url = require('url');
 const stripAnsi = require('strip-ansi');
 const log = require('loglevel').getLogger('webpack-dev-server');
@@ -196,7 +196,7 @@ const socketUrl = url.format({
   auth: urlParts.auth,
   hostname,
   port: urlParts.port,
-  pathname: urlParts.path == null || urlParts.path === '/' ? '/sockjs-node' : urlParts.path
+  pathname: urlParts.path == null || urlParts.path === '/' ? '/sockjs-node' : (querystring.parse(urlParts.path).sockPath || urlParts.path)
 });
 
 socket(socketUrl, onSocketMsg);

diff --git a/examples/node-api-sock-path/README.md b/examples/node-api-sock-path/README.md
@@ -0,0 +1,15 @@
+# Node.js API - Simple
+
+```shell
+node server.js
+```
+
+Starts a simple webpack-dev-server setup via the Node API. Open `http://localhost:8080/` to go the app.
+
+## What should happen
+
+In the app you should see "It's working."
+
+In `app.js`, uncomment the code that results in an error and save. This error should be visible in the CLI and devtools.
+
+Then, in `app.js`, uncomment the code that results in a warning. This warning should be visible in the CLI and devtools.
diff --git a/examples/node-api-sock-path/app.js b/examples/node-api-sock-path/app.js
@@ -0,0 +1,3 @@
+'use strict';
+
+document.write('It\'s working under a subapp');
diff --git a/examples/node-api-sock-path/index.html b/examples/node-api-sock-path/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<script src="/subapp/bundle.js" type="text/javascript" charset="utf-8"></script>
+	</head>
+	<body>
+		<h1>Example: Node.js API - Simple</h1>
+	</body>
+</html>
diff --git a/examples/node-api-sock-path/server.js b/examples/node-api-sock-path/server.js
@@ -0,0 +1,25 @@
+'use strict';
+
+const path = require('path');
+const Webpack = require('webpack');
+const WebpackDevServer = require('../../lib/Server');
+const webpackConfig = require('./webpack.config');
+
+const compiler = Webpack(webpackConfig);
+const server = new WebpackDevServer(compiler, {
+  stats: {
+    colors: true
+  },
+  contentBase: path.resolve(__dirname),
+  watchContentBase: true,
+  sockPath: '/subapp/sockjs-node',
+  publicPath: '/subapp/',
+  historyApiFallback: {
+    disableDotRule: true,
+    index: '/subapp/'
+  }
+});
+
+server.listen(8080, '127.0.0.1', () => {
+  console.log('Starting server on http://localhost:8080');
+});
diff --git a/examples/node-api-sock-path/webpack.config.js b/examples/node-api-sock-path/webpack.config.js
@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = {
+  context: __dirname,
+  entry: ['./app.js', '../../client/index.js?http://localhost:8080/&sockPath=subapp/sockjs-node'],
+  output: {
+    filename: 'bundle.js',
+    publicPath: '/subapp/'
+  }
+};
@@ -85,6 +85,7 @@ function Server (compiler, options = {}, _log) {
 
   this.watchOptions = options.watchOptions || {};
   this.contentBaseWatchers = [];
+  this.sockPath = `/${options.sockPath ? options.sockPath.replace(/^\/|\/$/, '') : 'sockjs-node'}`;
 
   // Listening for events
   const invalidPlugin = () => {
@@ -763,7 +764,7 @@ Server.prototype.listen = function (port, hostname, fn) {
     });
 
     socket.installHandlers(this.listeningApp, {
-      prefix: '/sockjs-node'
+      prefix: this.sockPath
     });
 
     if (fn) {

@@ -51,6 +51,9 @@
     "socket": {
       "type": "string"
     },
+    "sockPath": {
+      "type": "string"
+    },
     "watchOptions": {
       "type": "object"
     },
@@ -321,6 +324,7 @@
       "filename": "should be {String|RegExp|Function} (https://webpack.js.org/configuration/dev-server/#devserver-filename-)",
       "port": "should be {String|Number} (https://webpack.js.org/configuration/dev-server/#devserver-port)",
       "socket": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-socket)",
+      "sockPath": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-sockPath)",
       "watchOptions": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserver-watchoptions)",
       "writeToDisk": "should be {Boolean|Function} (https://github.com/webpack/webpack-dev-middleware#writetodisk)",
       "headers": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserver-headers-)",

@@ -20,7 +20,8 @@ function addEntries (config, options, server) {
     };
 
     const domain = createDomain(options, app);
-    const entries = [ `${require.resolve('../../client/')}?${domain}` ];
+    const sockPath = options.sockPath ? `&sockPath=${options.sockPath}` : '';
+    const entries = [ `${require.resolve('../../client/')}?${domain}${sockPath}` ];
 
     if (options.hotOnly) {
       entries.push(require.resolve('webpack/hot/only-dev-server'));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use strict';

		document.write('It\'s working under a subapp');