Merge branch 'master' into universal-inline

.gitignore

@@ -9,3 +9,4 @@ client
 coverage
 ssl/*.pem
 node_modules
+.vscode

client-src/default/index.js

@@ -221,12 +221,14 @@ if (
 ) {
   protocol = self.location.protocol;
 }
-
 const socketUrl = url.format({
   protocol,
   auth: urlParts.auth,
   hostname,
-  port,
+  port:
+    urlParts.path == null || urlParts.path === '/'
+      ? port
+      : querystring.parse(urlParts.path).sockPort || port,
   // If sockPath is provided it'll be passed in via the __resourceQuery as a
   // query param so it has to be parsed out of the querystring in order for the
   // client to open the socket to the correct location.

lib/options.json

@@ -67,6 +67,19 @@
     "sockPath": {
       "type": "string"
     },
+    "sockPort": {
+      "anyOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "watchOptions": {
       "type": "object"
     },

lib/utils/addEntries.js

@@ -17,9 +17,10 @@ function addEntries(config, options, server) {
 
     const domain = createDomain(options, app);
     const sockPath = options.sockPath ? `&sockPath=${options.sockPath}` : '';
+    const sockPort = options.sockPort ? `&sockPort=${options.sockPort}` : '';
     const clientEntry = `${require.resolve(
       '../../client/'
-    )}?${domain}${sockPath}`;
+    )}?${domain}${sockPath}${sockPort}`;
     let hotEntry;
 
     if (options.hotOnly) {

lib/utils/createConfig.js

@@ -30,6 +30,10 @@ function createConfig(config, argv, { port }) {
     options.socket = argv.socket;
   }
 
+  if (argv.sockPort) {
+    options.sockPort = argv.sockPort;
+  }
+
   if (argv.progress) {
     options.progress = argv.progress;
   }