2.7.0 rollback (#1023)

* Revert "Sockjs prefix config (#911)" This reverts commit ccd113a. * Revert "2.7.0 (#1020)" This reverts commit c8b9a0f.
webpack · Aug 8, 2017 · cab5da5 · cab5da5
1 parent c8b9a0f
commit cab5da5
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 81 deletions.
diff --git a/client/index.js b/client/index.js
@@ -170,20 +170,12 @@ if(hostname && (self.location.protocol === "https:" || urlParts.hostname === "0.
 	protocol = self.location.protocol;
 }
 
-var rootPathName = url.parse(__webpack_public_path__).pathname || ""; // eslint-disable-line no-undef
-
-if(rootPathName.length > 1) {
-	rootPathName = rootPathName.replace(/\/+$/, "");
-}
-
-var sockjsPath = rootPathName + "/sockjs-node";
-
 var socketUrl = url.format({
 	protocol: protocol,
 	auth: urlParts.auth,
 	hostname: hostname,
 	port: (urlParts.port === "0") ? self.location.port : urlParts.port,
-	pathname: urlParts.path == null || urlParts.path === "/" ? sockjsPath : urlParts.path
+	pathname: urlParts.path == null || urlParts.path === "/" ? "/sockjs-node" : urlParts.path
 });
 
 socket(socketUrl, onSocketMsg);

diff --git a/examples/node-api-sockjs-prefix/README.md b/examples/node-api-sockjs-prefix/README.md
diff --git a/examples/node-api-sockjs-prefix/app.js b/examples/node-api-sockjs-prefix/app.js
diff --git a/examples/node-api-sockjs-prefix/index.html b/examples/node-api-sockjs-prefix/index.html
diff --git a/examples/node-api-sockjs-prefix/server.js b/examples/node-api-sockjs-prefix/server.js
diff --git a/examples/node-api-sockjs-prefix/webpack.config.js b/examples/node-api-sockjs-prefix/webpack.config.js
diff --git a/lib/Server.js b/lib/Server.js
@@ -42,7 +42,6 @@ function Server(compiler, options) {
 	this.disableHostCheck = !!options.disableHostCheck;
 	this.publicHost = options.public;
 	this.allowedHosts = options.allowedHosts;
-	this.sockjsPrefix = options.sockjsPrefix || ""
 	this.sockets = [];
 	this.contentBaseWatchers = [];
 
@@ -521,7 +520,7 @@ Server.prototype.listen = function(port, hostname) {
 	});
 
 	sockServer.installHandlers(this.listeningApp, {
-		prefix: `${this.sockjsPrefix}/sockjs-node`
+		prefix: "/sockjs-node"
 	});
 	return returnValue;
 }

diff --git a/lib/optionsSchema.json b/lib/optionsSchema.json
@@ -54,10 +54,6 @@
         }
       ]
     },
-    "sockjsPrefix": {
-      "description": "Optional prefix for the sockjs handler to be mounted to.",
-      "type": "string"
-    },
     "socket": {
       "description": "The Unix socket to listen to (instead of on a host).",
       "type": "string"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "2.7.0",
+  "version": "2.6.1",
   "author": "Tobias Koppers @sokra",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "peerDependencies": {

diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -48,7 +48,7 @@ describe("Validation", function() {
 		config: { asdf: true },
 		message: [
 			" - configuration has an unknown property 'asdf'. These properties are valid:",
-			"   object { hot?, hotOnly?, lazy?, bonjour?, host?, allowedHosts?, filename?, publicPath?, port?, sockjsPrefix?, socket?, " +
+			"   object { hot?, hotOnly?, lazy?, bonjour?, host?, allowedHosts?, filename?, publicPath?, port?, socket?, " +
 			"watchOptions?, headers?, clientLogLevel?, overlay?, key?, cert?, ca?, pfx?, pfxPassphrase?, " +
 			"inline?, disableHostCheck?, public?, https?, contentBase?, watchContentBase?, open?, useLocalIp?, openPage?, features?, " +
 			"compress?, proxy?, historyApiFallback?, staticOptions?, setup?, stats?, reporter?, " +