fix: improve https CLI output (#3673)

webpack · Aug 18, 2021 · f2d87fb · f2d87fb
1 parent 0277c5e
commit f2d87fb
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 19 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -329,7 +329,7 @@ class Server {
             const del = require("del");
 
             this.logger.info(
-              "SSL Certificate is more than 30 days old. Removing."
+              "SSL Certificate is more than 30 days old. Removing..."
             );
 
             del.sync([certificatePath], { force: true });
@@ -339,7 +339,7 @@ class Server {
         }
 
         if (!certificateExists) {
-          this.logger.info("Generating SSL Certificate");
+          this.logger.info("Generating SSL Certificate...");
 
           const selfsigned = require("selfsigned");
           const attributes = [{ name: "commonName", value: "localhost" }];
@@ -348,10 +348,10 @@ class Server {
             days: 30,
             keySize: 2048,
             extensions: [
-              // {
-              //   name: 'basicConstraints',
-              //   cA: true,
-              // },
+              {
+                name: "basicConstraints",
+                cA: true,
+              },
               {
                 name: "keyUsage",
                 keyCertSign: true,
@@ -412,6 +412,8 @@ class Server {
         }
 
         fakeCert = fs.readFileSync(certificatePath);
+
+        this.logger.info(`SSL certificate: ${certificatePath}`);
       }
 
       options.https.key = options.https.key || fakeCert;

diff --git a/test/cli/__snapshots__/bonjour-option.test.js.snap.webpack4 b/test/cli/__snapshots__/bonjour-option.test.js.snap.webpack4
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`"bonjour" CLI option should work using "--bonjour and --https" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/

diff --git a/test/cli/__snapshots__/bonjour-option.test.js.snap.webpack5 b/test/cli/__snapshots__/bonjour-option.test.js.snap.webpack5
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`"bonjour" CLI option should work using "--bonjour and --https" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/

diff --git a/test/cli/__snapshots__/http2-option.test.js.snap.webpack4 b/test/cli/__snapshots__/http2-option.test.js.snap.webpack4
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`"http2" CLI option should work using "--http2" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/

diff --git a/test/cli/__snapshots__/http2-option.test.js.snap.webpack5 b/test/cli/__snapshots__/http2-option.test.js.snap.webpack5
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`"http2" CLI option should work using "--http2" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/

diff --git a/test/cli/__snapshots__/https-option.test.js.snap.webpack4 b/test/cli/__snapshots__/https-option.test.js.snap.webpack4
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`"https" CLI option should work using "--https" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/
@@ -25,7 +27,9 @@ exports[`"https" CLI option should work using "--https-key <path> --https-pfx <p
 `;
 
 exports[`"https" CLI option should work using "--https-request-cert" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/
@@ -41,7 +45,9 @@ exports[`"https" CLI option should work using "--no-https" 1`] = `
 `;
 
 exports[`"https" CLI option should work using "--no-https-request-cert" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/

diff --git a/test/cli/__snapshots__/https-option.test.js.snap.webpack5 b/test/cli/__snapshots__/https-option.test.js.snap.webpack5
@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`"https" CLI option should work using "--https" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/
@@ -25,7 +27,9 @@ exports[`"https" CLI option should work using "--https-key <path> --https-pfx <p
 `;
 
 exports[`"https" CLI option should work using "--https-request-cert" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/
@@ -41,7 +45,9 @@ exports[`"https" CLI option should work using "--no-https" 1`] = `
 `;
 
 exports[`"https" CLI option should work using "--no-https-request-cert" 1`] = `
-"<i> [webpack-dev-server] Project is running at:
+"<i> [webpack-dev-server] Generating SSL Certificate...
+<i> [webpack-dev-server] SSL certificate: <cwd>/node_modules/.cache/webpack-dev-server/server.pem
+<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: https://localhost:<port>/
 <i> [webpack-dev-server] On Your Network (IPv4): https://<ip-v4>:<port>/
 <i> [webpack-dev-server] On Your Network (IPv6): https://[<ip-v6>]:<port>/

diff --git a/test/cli/bonjour-option.test.js b/test/cli/bonjour-option.test.js
@@ -1,9 +1,17 @@
 "use strict";
 
+const del = require("del");
+const Server = require("../../lib/Server");
 const { testBin, normalizeStderr } = require("../helpers/test-bin");
 const port = require("../ports-map")["cli-bonjour"];
 
+const defaultCertificateDir = Server.findCacheDir();
+
 describe('"bonjour" CLI option', () => {
+  beforeEach(async () => {
+    await del([defaultCertificateDir]);
+  });
+
   it('should work using "--bonjour"', async () => {
     const { exitCode, stderr } = await testBin(["--port", port, "--bonjour"]);
 

diff --git a/test/cli/http2-option.test.js b/test/cli/http2-option.test.js
@@ -1,9 +1,17 @@
 "use strict";
 
+const del = require("del");
+const Server = require("../../lib/Server");
 const { testBin, normalizeStderr } = require("../helpers/test-bin");
 const port = require("../ports-map")["cli-http2"];
 
+const defaultCertificateDir = Server.findCacheDir();
+
 describe('"http2" CLI option', () => {
+  beforeEach(async () => {
+    await del([defaultCertificateDir]);
+  });
+
   it('should work using "--http2"', async () => {
     const { exitCode, stderr } = await testBin(["--port", port, "--http2"]);
 

diff --git a/test/cli/https-option.test.js b/test/cli/https-option.test.js
@@ -1,6 +1,8 @@
 "use strict";
 
 const path = require("path");
+const del = require("del");
+const Server = require("../../lib/Server");
 const { testBin, normalizeStderr } = require("../helpers/test-bin");
 const port = require("../ports-map")["cli-https"];
 
@@ -9,7 +11,13 @@ const httpsCertificateDirectory = path.resolve(
   "../fixtures/https-certificate"
 );
 
+const defaultCertificateDir = Server.findCacheDir();
+
 describe('"https" CLI option', () => {
+  beforeEach(async () => {
+    await del([defaultCertificateDir]);
+  });
+
   it('should work using "--https"', async () => {
     const { exitCode, stderr } = await testBin(["--port", port, "--https"]);
 

diff --git a/test/helpers/test-bin.js b/test/helpers/test-bin.js
@@ -90,9 +90,6 @@ const normalizeStderr = (stderr, options = {}) => {
   if (options.https) {
     // We have deprecation warning on windows in some cases
     normalizedStderr = normalizedStderr.split("\n");
-    normalizedStderr = normalizedStderr.filter(
-      (item) => !/Generating SSL Certificate/g.test(item)
-    );
     normalizedStderr = normalizedStderr.filter(
       (item) =>
         !/DeprecationWarning: The legacy HTTP parser is deprecated/g.test(item)