webpack-dev-server 2.8.1 → 2.9.2

package/client/live.js

@@ -10,7 +10,7 @@ require('./style.css');
 let hot = false;
 let currentHash = '';
 
-$(() => {
+$(function ready() {
   $('body').html(require('./page.pug')());
   const status = $('#status');
   const okness = $('#okness');
@@ -28,11 +28,11 @@ $(() => {
   });
 
   const onSocketMsg = {
-    hot() {
+    hot: function msgHot() {
       hot = true;
       iframe.attr('src', contentPage + window.location.hash);
     },
-    invalid() {
+    invalid: function msgInvalid() {
       okness.text('');
       status.text('App updated. Recompiling...');
       header.css({
@@ -41,7 +41,7 @@ $(() => {
       $errors.hide();
       if (!hot) iframe.hide();
     },
-    hash(hash) {
+    hash: function msgHash(hash) {
       currentHash = hash;
     },
     'still-ok': function stillOk() {
@@ -53,27 +53,27 @@ $(() => {
       $errors.hide();
       if (!hot) iframe.show();
     },
-    ok() {
+    ok: function msgOk() {
       okness.text('');
       $errors.hide();
       reloadApp();
     },
-    warnings() {
+    warnings: function msgWarnings() {
       okness.text('Warnings while compiling.');
       $errors.hide();
       reloadApp();
     },
-    errors(errors) {
+    errors: function msgErrors(errors) {
       status.text('App updated with errors. No reload!');
       okness.text('Errors while compiling.');
-      $errors.text(`\n${stripAnsi(errors.join('\n\n\n'))}\n\n`);
+      $errors.text('\n' + stripAnsi(errors.join('\n\n\n')) + '\n\n');
       header.css({
         borderColor: '#ebcb8b'
       });
       $errors.show();
       iframe.hide();
     },
-    close() {
+    close: function msgClose() {
       status.text('');
       okness.text('Disconnected.');
       $errors.text('\n\n\n  Lost connection to webpack-dev-server.\n  Please restart the server to reestablish connection...\n\n\n\n');
@@ -87,7 +87,7 @@ $(() => {
 
   socket('/sockjs-node', onSocketMsg);
 
-  iframe.on('load', () => {
+  iframe.on('load', function load() {
     status.text('App ready.');
     header.css({
       borderColor: ''
@@ -99,7 +99,7 @@ $(() => {
     if (hot) {
       status.text('App hot update.');
       try {
-        iframe[0].contentWindow.postMessage(`webpackHotUpdate${currentHash}`, '*');
+        iframe[0].contentWindow.postMessage('webpackHotUpdate' + currentHash, '*');
       } catch (e) {
         console.warn(e); // eslint-disable-line
       }
@@ -110,7 +110,7 @@ $(() => {
         borderColor: '#96b5b4'
       });
       try {
-        let old = `${iframe[0].contentWindow.location}`;
+        let old = iframe[0].contentWindow.location + '';
         if (old.indexOf('about') === 0) old = null;
         iframe.attr('src', old || (contentPage + window.location.hash));
         if (old) {

package/client/overlay.js

@@ -50,7 +50,7 @@ function addOverlayDivTo(iframe) {
   div.style.bottom = 0;
   div.style.width = '100vw';
   div.style.height = '100vh';
-  div.style.backgroundColor = 'black';
+  div.style.backgroundColor = 'rgba(0, 0, 0, 0.85)';
   div.style.color = '#E8E8E8';
   div.style.fontFamily = 'Menlo, Consolas, monospace';
   div.style.fontSize = 'large';
@@ -83,7 +83,7 @@ function ensureOverlayDivExists(onOverlayDivReady) {
   }
 
   // Create iframe and, when it is ready, a div inside it.
-  overlayIframe = createOverlayIframe(() => {
+  overlayIframe = createOverlayIframe(function cb() {
     overlayDiv = addOverlayDivTo(overlayIframe);
     // Now we can talk!
     lastOnOverlayDivReady(overlayDiv);
@@ -96,13 +96,11 @@ function ensureOverlayDivExists(onOverlayDivReady) {
 }
 
 function showMessageOverlay(message) {
-  ensureOverlayDivExists((div) => {
+  ensureOverlayDivExists(function cb(div) {
     // Make it look similar to our terminal.
-    div.innerHTML =
-   `<span style="color: #${
-     colors.red
-   }">Failed to compile.</span><br><br>${
-     ansiHTML(entities.encode(message))}`;
+    div.innerHTML = '<span style="color: #' + colors.red +
+                    '">Failed to compile.</span><br><br>' +
+                    ansiHTML(entities.encode(message));
   });
 }
 

package/client/socket.js

@@ -26,7 +26,7 @@ function socket(url, handlers) {
       const retryInMs = 1000 * Math.pow(2, retries) + Math.random() * 100;
       retries += 1;
 
-      setTimeout(() => {
+      setTimeout(function cb() {
         socket(url, handlers);
       }, retryInMs);
     }

package/lib/Server.js

@@ -103,14 +103,13 @@ function Server(compiler, options) {
 
   app.get('/webpack-dev-server', (req, res) => {
     res.setHeader('Content-Type', 'text/html');
-    /* eslint-disable quotes */
     res.write('<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>');
-    const outputPath = this.middleware.getFilenameFromUrl(options.publicPath || "/");
+    const outputPath = this.middleware.getFilenameFromUrl(options.publicPath || '/');
     const filesystem = this.middleware.fileSystem;
 
     function writeDirectory(baseUrl, basePath) {
       const content = filesystem.readdirSync(basePath);
-      res.write("<ul>");
+      res.write('<ul>');
       content.forEach((item) => {
         const p = `${basePath}/${item}`;
         if (filesystem.statSync(p).isFile()) {
@@ -139,9 +138,8 @@ function Server(compiler, options) {
           res.write('</li>');
         }
       });
-      res.write("</ul>");
+      res.write('</ul>');
     }
-    /* eslint-enable quotes */
     writeDirectory(options.publicPath || '/', outputPath);
     res.end('</body></html>');
   });
@@ -323,11 +321,19 @@ function Server(compiler, options) {
       }
     },
 
+    before: () => {
+      if (typeof options.before === 'function') { options.before(app, this); }
+    },
+
     middleware: () => {
       // include our middleware to ensure it is able to handle '/index.html' request after redirect
       app.use(this.middleware);
     },
 
+    after: () => {
+      if (typeof options.after === 'function') { options.after(app, this); }
+    },
+
     headers: () => {
       app.all('*', this.setContentHeaders.bind(this));
     },
@@ -337,11 +343,14 @@ function Server(compiler, options) {
     },
 
     setup: () => {
-      if (typeof options.setup === 'function') { options.setup(app, this); }
+      if (typeof options.setup === 'function') {
+        log('The `setup` option is deprecated and will be removed in v3. Please update your config to use `before`');
+        options.setup(app, this);
+      }
     }
   };
 
-  const defaultFeatures = ['setup', 'headers', 'middleware'];
+  const defaultFeatures = ['before', 'setup', 'headers', 'middleware'];
   if (options.proxy) { defaultFeatures.push('proxy', 'middleware'); }
   if (contentBase !== false) { defaultFeatures.push('contentBaseFiles'); }
   if (options.watchContentBase) { defaultFeatures.push('watchContentBase'); }
@@ -353,6 +362,7 @@ function Server(compiler, options) {
   if (contentBase !== false) { defaultFeatures.push('contentBaseIndex'); }
   // compress is placed last and uses unshift so that it will be the first middleware used
   if (options.compress) { defaultFeatures.unshift('compress'); }
+  if (options.after) { defaultFeatures.push('after'); }
 
   (options.features || defaultFeatures).forEach((feature) => {
     features[feature]();
@@ -624,13 +634,11 @@ Server.prototype.serveMagicHtml = function (req, res, next) {
   try {
     if (!this.middleware.fileSystem.statSync(this.middleware.getFilenameFromUrl(`${_path}.js`)).isFile()) { return next(); }
     // Serve a page that executes the javascript
-    /* eslint-disable quotes */
     res.write('<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body><script type="text/javascript" charset="utf-8" src="');
     res.write(_path);
     res.write('.js');
-    res.write(req._parsedUrl.search || "");
+    res.write(req._parsedUrl.search || '');
     res.end('"></script></body></html>');
-    /* eslint-enable quotes */
   } catch (e) {
     return next();
   }

package/lib/optionsSchema.json

@@ -64,9 +64,6 @@
     },
     "headers": {
       "description": "Response headers that are added to each response.",
-      "additionalProperties": {
-        "type": "string"
-      },
       "type": "object"
     },
     "clientLogLevel": {
@@ -274,6 +271,14 @@
       "description": "Exposes the Express server to add custom middleware or routes.",
       "instanceof": "Function"
     },
+    "before": {
+      "description": "Exposes the Express server to add custom middleware or routes before webpack-dev-middleware will be added.",
+      "instanceof": "Function"
+    },
+    "after": {
+      "description": "Exposes the Express server to add custom middleware or routes after webpack-dev-middleware got added.",
+      "instanceof": "Function"
+    },
     "stats": {
       "description": "Decides what bundle information is displayed.",
       "anyOf": [

package/lib/polyfills.js

@@ -1,9 +1,8 @@
 'use strict';
 
 /* polyfills for Node 4.8.x users */
-/* eslint no-extend-native: off, global-require: off */
 
 // internal-ip@2.x uses [].includes
-if (!Array.prototype.includes) {
-  Array.prototype.includes = require('array-includes');
-}
+const includes = require('array-includes');
+
+includes.shim();

package/lib/util/createDomain.js

@@ -10,8 +10,12 @@ module.exports = function createDomain(options, listeningApp) {
   const port = options.socket ? 0 : appPort;
   const hostname = options.useLocalIp ? internalIp.v4() : options.host;
 
+  // use explicitly defined public url (prefix with protocol if not explicitly given)
+  if (options.public) {
+    return /^[a-zA-Z]+:\/\//.test(options.public) ? `${options.public}` : `${protocol}://${options.public}`;
+  }
   // the formatted domain (url without path) of the webpack server
-  return options.public ? `${protocol}://${options.public}` : url.format({
+  return url.format({
     protocol,
     hostname,
     port

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "2.8.1",
+  "version": "2.9.2",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "license": "MIT",
   "repository": "webpack/webpack-dev-server",
@@ -50,7 +50,7 @@
     "express": "^4.13.3",
     "html-entities": "^1.2.0",
     "http-proxy-middleware": "~0.17.4",
-    "internal-ip": "^2.0.2",
+    "internal-ip": "1.2.0",
     "ip": "^1.1.5",
     "loglevel": "^1.4.1",
     "opn": "^5.1.0",
@@ -60,10 +60,10 @@
     "sockjs": "0.3.18",
     "sockjs-client": "1.1.4",
     "spdy": "^3.4.1",
-    "strip-ansi": "^4.0.0",
+    "strip-ansi": "^3.0.1",
     "supports-color": "^4.2.1",
     "webpack-dev-middleware": "^1.11.0",
-    "yargs": "^8.0.2"
+    "yargs": "^6.6.0"
   },
   "devDependencies": {
     "codecov.io": "^0.1.6",

package/ssl/server.pem

@@ -0,0 +1,46 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAtoS4CpKBMmqAuoOv0P+RNWctGnwjxLmB/LSNy4rGHiF+f+t/
+qr5OWSeZbns/Qn6XMRaC4PaZkE0Y8Gpp8ZzbQPSaOaTeK8N8ZvnfwEcjJApOgW/k
+ZJwBx6GfqeRy6ecXpMWZjkiKLT+cz0g9wZDFQBWEOzOjWTk9Oy8ptF9babi2Rbd9
+WGFMGEVZI8OI4grP/KDHs0xu20fkeefnJ6CIPjVdmcCF3JhF5Cbh856RID8MunST
+lArTY9kWWCtTyI4PFik3xUrTZ48CFduwb+xOYrBysQJcrZxZlbHMfMrIdVdmGhz9
+WM8OdgfcT3tsqnSS5HyISpt1YtGFcG7HQAF1fwIDAQABAoIBACPyx/ztFh1D9M7H
+mR1k+Mi35Z5NzQ22K/AF79ejIZpVpoCzdZW/ndbZgdLM24zROh4k/OoqJ9zQEpVn
+oC5CYrzMcIPiARBFlH8DwBoy6Kz0irnbu/RE9eTH5JaltCx1o6aEdNYdW3nGCbCZ
+3e/9/5u7oSu34/hy2aiKhYBNN8f+j23Sm8DIm8p8Gf42t5JjIuIlI15CUklYilPr
+Ygja3xzMWyuFhhkTANDjsCRqaFHr8OEELTPZ9c2LyvIsXeclOo9j11CgHTBIkEPv
+I5HSpbm8lFu4LqZhFMewsCXE2IiuxVMsVez7qlSwZUECz2OoY0A/jLZZEEvNTu2O
+PI+F1kECgYEA+v/ZhV3YHQZejDcREnRa/4Ps52y19kzFjoe3sOssCrhCKMeG+CL0
+c13K6ig9N8e4miMUUK0OptzCQEy2dPwWlbAHTxMeQ3m686EaVnDPcnguyzvdOUEJ
+R8Z7LUyLfF9EflwHxpUNcPM+MGgUMdmKlT3xLPEJ6WGu+pQEGIeEjYcCgYEAuiea
+B8cLCWfl6xqJQSz6hMO/vuO1UdmURVtYyld9I1SyPDOMvUWi/dds2ExSQvfQ4jDH
+0rpq905+q5BZV0/GsROpCOUdnLGAlvloboYrOhLrXD8H5dAPegjbja/e3WPAmXvj
+X1sWbu/QN6gYmup2gc2E/cgKeUPmRr0O2t94lkkCgYBwhK87ZSVTZZ6O1sS1dCmy
+764M1KQBpMrPKTIEgng82fr2kvODWxAgg4RKUf2XetXbayxZOiseTEpcTsdgS/3H
+3qB4J0bi0rgnLSpEY8/rLcs0WkLCvs/tOCHR3cWN3Js01ga6U+kxoClZw96Btla0
+ro7mKavazmqFdEMdx+p5EwKBgAVdmNn6ib3mqcDiDey8ACiNf9xfsd0/GT/6hw+l
+/+xhx5Vmovrdo/oPGIsPgBuACxxJ7aiMSQMB1zLYwUp7+S0ndOrVt8nJb/xqCfGN
+mnddDj2lb3PXUGrjEHkABbt54ZZK9N3NwVLHRMgl5zen5GyPYPLzriGarGuDjYcP
+g+lJAoGBAJwxpSW/R5NPMYT3tu9SFJMmAy7noMW5AA4GGE8lhvRAYOWOsZXAek4c
+n+8IFJCOe+gwGyqWw6CqOuM+3siAFT4gkA+AKTp/CRBK251dHXdFsGw13xuWXS3O
+gG0VbpK/3Z/Ma/+HWygSzJwigIKWgzJLPUiI0Rx1Vd7sTyftK2ur
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDJjCCAg6gAwIBAgIJcBBuut3aIvmUMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMTCWxvY2FsaG9zdDAeFw0xNzEwMDEyMTU3MjNaFw0xNzEwMzEyMTU3MjNaMBQx
+EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALaEuAqSgTJqgLqDr9D/kTVnLRp8I8S5gfy0jcuKxh4hfn/rf6q+TlknmW57
+P0J+lzEWguD2mZBNGPBqafGc20D0mjmk3ivDfGb538BHIyQKToFv5GScAcehn6nk
+cunnF6TFmY5Iii0/nM9IPcGQxUAVhDszo1k5PTsvKbRfW2m4tkW3fVhhTBhFWSPD
+iOIKz/ygx7NMbttH5Hnn5yegiD41XZnAhdyYReQm4fOekSA/DLp0k5QK02PZFlgr
+U8iODxYpN8VK02ePAhXbsG/sTmKwcrECXK2cWZWxzHzKyHVXZhoc/VjPDnYH3E97
+bKp0kuR8iEqbdWLRhXBux0ABdX8CAwEAAaN7MHkwDAYDVR0TBAUwAwEB/zALBgNV
+HQ8EBAMCAvQwXAYDVR0RBFUwU4IJbG9jYWxob3N0ghVsb2NhbGhvc3QubG9jYWxk
+b21haW6CBmx2aC5tZYIIKi5sdmgubWWCBVs6OjFdhwR/AAABhxD+gAAAAAAAAAAA
+AAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQABcNBUVzSJXbNGZ4mR8jDX+098nI6n
+noEyQ/kcMRLqP7X2eXS9ks4jcNrFztpKxSheEqU5rB7AVDaerNiOKMlkw9NYKmer
+RmlY3SpqtN2h1lJLX1dXRmfUaKwLm+hRGLOjrPPQyFihauzf2t6CeYBZFToqLv0M
+BSsvNrrEHJCzM37kcfu7e4fKHPF+hzaxx8acOk7dD2FffgeGzsir0V1mTpoRq6St
+LHwOvslK82P3OyDRCWfE6R+YwIz8x2IPFvrRdglZyFfWDKpqDZOf6TKm11dGmulI
+5VnO4SHNk52113QMybBn8ReiKYE+mIUkQ0G7uVyCj5+lGKP6NvP83Nsx
+-----END CERTIFICATE-----