webpack-dev-server 4.0.0-rc.1 → 4.0.0

package/client/index.js

@@ -1,4 +1,4 @@
-/* global __resourceQuery */
+/* global __resourceQuery, __webpack_hash__ */
 import webpackHotLog from "webpack/hot/log.js";
 import stripAnsi from "./modules/strip-ansi/index.js";
 import parseURL from "./utils/parseURL.js";
@@ -10,12 +10,14 @@ import reloadApp from "./utils/reloadApp.js";
 import createSocketURL from "./utils/createSocketURL.js";
 var status = {
   isUnloading: false,
-  currentHash: ""
-};
+  // TODO Workaround for webpack v4, `__webpack_hash__` is not replaced without HotModuleReplacement
+  // eslint-disable-next-line camelcase
+  currentHash: typeof __webpack_hash__ !== "undefined" ? __webpack_hash__ : ""
+}; // console.log(__webpack_hash__);
+
 var options = {
   hot: false,
   liveReload: false,
-  initial: true,
   progress: false,
   overlay: false
 };
@@ -101,10 +103,6 @@ var onSocketMessage = {
       hide();
     }
 
-    if (options.initial) {
-      return options.initial = false;
-    }
-
     reloadApp(options, status);
   },
   // TODO: remove in v5 in favor of 'static-changed'
@@ -135,10 +133,6 @@ var onSocketMessage = {
       show(_warnings, "warnings");
     }
 
-    if (options.initial) {
-      return options.initial = false;
-    }
-
     reloadApp(options, status);
   },
   errors: function errors(_errors) {
@@ -159,8 +153,6 @@ var onSocketMessage = {
     if (needShowOverlay) {
       show(_errors, "errors");
     }
-
-    options.initial = false;
   },
   error: function error(_error) {
     log.error(_error);

package/client/utils/createSocketURL.js

@@ -13,7 +13,7 @@ function createSocketURL(parsedURL) {
     hostname = self.location.hostname;
   }
 
-  var socketURLProtocol = parsedURL.protocol || "ws:"; // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
+  var socketURLProtocol = parsedURL.protocol || self.location.protocol; // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
 
   if (socketURLProtocol === "auto:" || hostname && isInAddrAny && self.location.protocol === "https:") {
     socketURLProtocol = self.location.protocol;

package/client/utils/reloadApp.js

@@ -1,13 +1,28 @@
+/* global __webpack_hash__ */
 import hotEmitter from "webpack/hot/emitter.js";
 import { log } from "./log.js";
 
-function reloadApp(_ref, _ref2) {
+function reloadApp(_ref, status) {
   var hot = _ref.hot,
       liveReload = _ref.liveReload;
-  var isUnloading = _ref2.isUnloading,
-      currentHash = _ref2.currentHash;
 
-  if (isUnloading) {
+  if (status.isUnloading) {
+    return;
+  } // TODO Workaround for webpack v4, `__webpack_hash__` is not replaced without HotModuleReplacement plugin
+
+
+  var webpackHash = // eslint-disable-next-line camelcase
+  typeof __webpack_hash__ !== "undefined" ? // eslint-disable-next-line camelcase
+  __webpack_hash__ : status.previousHash || "";
+  var isInitial = status.currentHash.indexOf(webpackHash) === 0;
+
+  if (isInitial) {
+    var isLegacyInitial = webpackHash === "" && hot === false && liveReload === true;
+
+    if (isLegacyInitial) {
+      status.previousHash = status.currentHash;
+    }
+
     return;
   }
 
@@ -23,11 +38,11 @@ function reloadApp(_ref, _ref2) {
 
   if (hot && allowToHot) {
     log.info("App hot update...");
-    hotEmitter.emit("webpackHotUpdate", currentHash);
+    hotEmitter.emit("webpackHotUpdate", status.currentHash);
 
     if (typeof self !== "undefined" && self.window) {
       // broadcast update to window
-      self.postMessage("webpackHotUpdate".concat(currentHash), "*");
+      self.postMessage("webpackHotUpdate".concat(status.currentHash), "*");
     }
   } // allow refreshing the page only if liveReload isn't disabled
   else if (liveReload && allowToLiveReload) {

package/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",