Merge branch 'master' into https-fix

Author: hiroppy

client-src/default/utils/createSocketUrl.js

@@ -46,6 +46,7 @@ function createSocketUrl(resourceQuery) {
   // because the browser doesn't accept non-secure websockets.
   if (
     hostname &&
+    hostname !== '127.0.0.1' &&
     (self.location.protocol === 'https:' || urlParts.hostname === '0.0.0.0')
   ) {
     protocol = self.location.protocol;

package-lock.json

@@ -99,7 +99,7 @@
     "less-loader": "^5.0.0",
     "lint-staged": "^9.4.3",
     "marked": "^0.7.0",
-    "memfs": "^2.16.1",
+    "memfs": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.1",
     "puppeteer": "^1.20.0",

package.json

@@ -4,6 +4,8 @@ exports[`createSocketUrl should return the url when __resourceQuery is ?test 1`]
 
 exports[`createSocketUrl should return the url when __resourceQuery is http://0.0.0.0 1`] = `"http://localhost/sockjs-node"`;
 
+exports[`createSocketUrl should return the url when __resourceQuery is http://127.0.0.1 1`] = `"http://127.0.0.1/sockjs-node"`;
+
 exports[`createSocketUrl should return the url when __resourceQuery is http://user:pass@[::]:8080 1`] = `"http://user:pass@localhost:8080/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when __resourceQuery is http://user:password@localhost/ 1`] = `"http://user:password@localhost/sockjs-node"`;
@@ -22,6 +24,8 @@ exports[`createSocketUrl should return the url when the current script source is
 
 exports[`createSocketUrl should return the url when the current script source is http://0.0.0.0 1`] = `"http://localhost/sockjs-node"`;
 
+exports[`createSocketUrl should return the url when the current script source is http://127.0.0.1 1`] = `"http://127.0.0.1/sockjs-node"`;
+
 exports[`createSocketUrl should return the url when the current script source is http://user:pass@[::]:8080 1`] = `"http://user:pass@localhost:8080/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when the current script source is http://user:password@localhost/ 1`] = `"http://user:password@localhost/sockjs-node"`;

test/client/utils/__snapshots__/createSocketUrl.test.js.snap

@@ -10,6 +10,7 @@ describe('createSocketUrl', () => {
     'http://0.0.0.0',
     'https://localhost:123',
     'http://user:pass@[::]:8080',
+    'http://127.0.0.1',
     // TODO: comment out after the major release
     // https://github.com/webpack/webpack-dev-server/pull/1954#issuecomment-498043376
     // 'file://filename',