Fix: default to localhost when no host option (#1750)

webpack · Apr 3, 2019 · 732e6c5 · 732e6c5
1 parent 9f899ff
commit 732e6c5
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 33 deletions.
diff --git a/examples/api/middleware/webpack.config.js b/examples/api/middleware/webpack.config.js
@@ -6,7 +6,7 @@ const { setup } = require('../../util');
 
 module.exports = setup({
   context: __dirname,
-  entry: ['./app.js', '../../../client/index.js?http://localhost:8080/'],
+  entry: './app.js',
   output: {
     filename: 'bundle.js',
   },

diff --git a/examples/api/simple/webpack.config.js b/examples/api/simple/webpack.config.js
@@ -6,7 +6,7 @@ const { setup } = require('../../util');
 
 module.exports = setup({
   context: __dirname,
-  entry: ['./app.js', '../../../client/index.js?http://localhost:8080/'],
+  entry: './app.js',
   output: {
     filename: 'bundle.js',
   },

diff --git a/lib/utils/createDomain.js b/lib/utils/createDomain.js
@@ -7,7 +7,7 @@ function createDomain(options, server) {
   const protocol = options.https ? 'https' : 'http';
   const hostname = options.useLocalIp
     ? ip.v4.sync() || 'localhost'
-    : options.host;
+    : options.host || 'localhost';
 
   // eslint-disable-next-line no-nested-ternary
   const port = options.socket ? 0 : server ? server.address().port : 0;

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/Client.test.js b/test/Client.test.js
@@ -71,3 +71,41 @@ describe('Client code', () => {
     });
   });
 });
+
+describe('Client complex inline script path', () => {
+  beforeAll((done) => {
+    const options = {
+      port: 9000,
+      host: '0.0.0.0',
+      inline: true,
+      watchOptions: {
+        poll: true,
+      },
+      public: 'myhost.test',
+      sockPath: '/foo/test/bar/',
+    };
+    helper.startAwaitingCompilation(config, options, done);
+  });
+
+  afterAll(helper.close);
+
+  describe('browser client', () => {
+    jest.setTimeout(30000);
+
+    it('uses the correct public hostname and sockPath', (done) => {
+      runBrowser().then(({ page, browser }) => {
+        page
+          .waitForRequest((requestObj) =>
+            requestObj.url().match(/foo\/test\/bar/)
+          )
+          .then((requestObj) => {
+            expect(requestObj.url()).toMatch(
+              /^http:\/\/myhost\.test:9000\/foo\/test\/bar/
+            );
+            browser.close().then(done);
+          });
+        page.goto('http://localhost:9000/main');
+      });
+    });
+  });
+});
diff --git a/test/Util.test.js b/test/Util.test.js
@@ -32,6 +32,13 @@ describe('check utility functions', () => {
       },
       expected: 'http://localhost:8080',
     },
+    {
+      name: 'no host option',
+      options: {
+        port: 8080,
+      },
+      expected: 'http://localhost:8080',
+    },
     {
       name: 'https',
       options: {