webpack-dev-server 2.10.0 → 2.11.2

package/client/overlay.js

@@ -3,12 +3,12 @@
 // The error overlay is inspired (and mostly copied) from Create React App (https://github.com/facebookincubator/create-react-app)
 // They, in turn, got inspired by webpack-hot-middleware (https://github.com/glenjamin/webpack-hot-middleware).
 
-const ansiHTML = require('ansi-html');
-const Entities = require('html-entities').AllHtmlEntities;
+var ansiHTML = require('ansi-html');
+var Entities = require('html-entities').AllHtmlEntities;
 
-const entities = new Entities();
+var entities = new Entities();
 
-const colors = {
+var colors = {
   reset: ['transparent', 'transparent'],
   black: '181818',
   red: 'E36049',
@@ -23,7 +23,7 @@ const colors = {
 ansiHTML.setColors(colors);
 
 function createOverlayIframe(onIframeLoad) {
-  const iframe = document.createElement('iframe');
+  var iframe = document.createElement('iframe');
   iframe.id = 'webpack-dev-server-client-overlay';
   iframe.src = 'about:blank';
   iframe.style.position = 'fixed';
@@ -40,7 +40,7 @@ function createOverlayIframe(onIframeLoad) {
 }
 
 function addOverlayDivTo(iframe) {
-  const div = iframe.contentDocument.createElement('div');
+  var div = iframe.contentDocument.createElement('div');
   div.id = 'webpack-dev-server-client-overlay-div';
   div.style.position = 'fixed';
   div.style.boxSizing = 'border-box';
@@ -62,9 +62,9 @@ function addOverlayDivTo(iframe) {
   return div;
 }
 
-let overlayIframe = null;
-let overlayDiv = null;
-let lastOnOverlayDivReady = null;
+var overlayIframe = null;
+var overlayDiv = null;
+var lastOnOverlayDivReady = null;
 
 function ensureOverlayDivExists(onOverlayDivReady) {
   if (overlayDiv) {
@@ -83,7 +83,7 @@ function ensureOverlayDivExists(onOverlayDivReady) {
   }
 
   // Create iframe and, when it is ready, a div inside it.
-  overlayIframe = createOverlayIframe(() => {
+  overlayIframe = createOverlayIframe(function () {
     overlayDiv = addOverlayDivTo(overlayIframe);
     // Now we can talk!
     lastOnOverlayDivReady(overlayDiv);
@@ -96,12 +96,9 @@ function ensureOverlayDivExists(onOverlayDivReady) {
 }
 
 function showMessageOverlay(message) {
-  ensureOverlayDivExists((div) => {
+  ensureOverlayDivExists(function (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));
   });
 }
 
@@ -126,4 +123,4 @@ exports.clear = function handleSuccess() {
 // Compilation with errors (e.g. syntax error or missing modules).
 exports.showMessage = function handleMessage(messages) {
   showMessageOverlay(messages[0]);
-};
+};

package/client/socket.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const SockJS = require('sockjs-client/dist/sockjs');
+var SockJS = require('sockjs-client/dist/sockjs');
 
-let retries = 0;
-let sock = null;
+var retries = 0;
+var sock = null;
 
-const socket = function initSocket(url, handlers) {
+var socket = function initSocket(url, handlers) {
   sock = new SockJS(url);
 
   sock.onopen = function onopen() {
@@ -13,7 +13,9 @@ const socket = function initSocket(url, handlers) {
   };
 
   sock.onclose = function onclose() {
-    if (retries === 0) { handlers.close(); }
+    if (retries === 0) {
+      handlers.close();
+    }
 
     // Try to reconnect.
     sock = null;
@@ -23,10 +25,10 @@ const socket = function initSocket(url, handlers) {
       // Exponentially increase timeout to reconnect.
       // Respectfully copied from the package `got`.
       // eslint-disable-next-line no-mixed-operators, no-restricted-properties
-      const retryInMs = 1000 * Math.pow(2, retries) + Math.random() * 100;
+      var retryInMs = 1000 * Math.pow(2, retries) + Math.random() * 100;
       retries += 1;
 
-      setTimeout(() => {
+      setTimeout(function () {
         socket(url, handlers);
       }, retryInMs);
     }
@@ -34,9 +36,11 @@ const socket = function initSocket(url, handlers) {
 
   sock.onmessage = function onmessage(e) {
     // This assumes that all data sent via the websocket is JSON.
-    const msg = JSON.parse(e.data);
-    if (handlers[msg.type]) { handlers[msg.type](msg.data); }
+    var msg = JSON.parse(e.data);
+    if (handlers[msg.type]) {
+      handlers[msg.type](msg.data);
+    }
   };
 };
 
-module.exports = socket;
+module.exports = socket;

package/lib/util/addDevServerEntrypoints.js

@@ -19,16 +19,22 @@ module.exports = function addDevServerEntrypoints(webpackOptions, devServerOptio
 
     if (devServerOptions.hotOnly) { devClient.push('webpack/hot/only-dev-server'); } else if (devServerOptions.hot) { devClient.push('webpack/hot/dev-server'); }
 
-    [].concat(webpackOptions).forEach((wpOpt) => {
-      if (typeof wpOpt.entry === 'object' && !Array.isArray(wpOpt.entry)) {
-        Object.keys(wpOpt.entry).forEach((key) => {
-          wpOpt.entry[key] = devClient.concat(wpOpt.entry[key]);
+    const prependDevClient = (entry) => {
+      if (typeof entry === 'function') {
+        return () => Promise.resolve(entry()).then(prependDevClient);
+      }
+      if (typeof entry === 'object' && !Array.isArray(entry)) {
+        const entryClone = {};
+        Object.keys(entry).forEach((key) => {
+          entryClone[key] = devClient.concat(entry[key]);
         });
-      } else if (typeof wpOpt.entry === 'function') {
-        wpOpt.entry = wpOpt.entry(devClient);
-      } else {
-        wpOpt.entry = devClient.concat(wpOpt.entry);
+        return entryClone;
       }
+      return devClient.concat(entry);
+    };
+
+    [].concat(webpackOptions).forEach((wpOpt) => {
+      wpOpt.entry = prependDevClient(wpOpt.entry);
     });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "2.10.0",
+  "version": "2.11.2",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "license": "MIT",
   "repository": "webpack/webpack-dev-server",
@@ -22,13 +22,14 @@
     "beautify": "npm run lint -- --fix",
     "ci": "npm run cover -- --report lcovonly && npm run test",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha",
-    "lint": "eslint bin lib test examples client/{index,live,socket,sockjs,overlay,webpack.config}.js",
+    "lint": "eslint bin lib test examples client-src",
     "mocha": "mocha --full-trace --check-leaks",
-    "prepublish": "(rm ssl/*.pem || true) && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
+    "prepublish": "(rm ssl/*.pem || true) && npm run -s transpile:index && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
     "test": "npm run lint && npm run mocha",
-    "build:live": "webpack ./client/live.js client/live.bundle.js --color --config client/webpack.config.js",
-    "build:index": "webpack ./client/index.js client/index.bundle.js --color --config client/webpack.config.js",
-    "build:sockjs": "webpack ./client/sockjs.js client/sockjs.bundle.js --color --config client/webpack.sockjs.config.js",
+    "transpile:index": "babel client-src/default --out-dir client --ignore *.config.js",
+    "build:index": "webpack ./client-src/default/index.js client/index.bundle.js --color --config client-src/default/webpack.config.js",
+    "build:live": "webpack ./client-src/live/index.js client/live.bundle.js --color --config client-src/live/webpack.config.js",
+    "build:sockjs": "webpack ./client-src/sockjs/index.js client/sockjs.bundle.js --color --config client-src/sockjs/webpack.config.js",
     "webpack-dev-server": "cd $INIT_CWD && node ../../../bin/webpack-dev-server.js"
   },
   "files": [
@@ -64,16 +65,18 @@
     "sockjs": "0.3.19",
     "sockjs-client": "1.1.4",
     "spdy": "^3.4.1",
-    "strip-ansi": "^4.0.0",
+    "strip-ansi": "^3.0.0",
     "supports-color": "^5.1.0",
     "webpack-dev-middleware": "1.12.2",
-    "yargs": "^10.0.3"
+    "yargs": "6.6.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.1",
     "codecov.io": "^0.1.6",
+    "copy-webpack-plugin": "^4.3.1",
     "css-loader": "^0.28.5",
     "eslint": "^4.5.0",
     "eslint-config-webpack": "^1.2.5",
@@ -90,6 +93,7 @@
     "mocha-sinon": "^2.0.0",
     "pug": "^2.0.0-beta5",
     "pug-loader": "^2.3.0",
+    "semver": "^5.4.1",
     "should": "^13.2.0",
     "sinon": "^4.1.3",
     "style-loader": "^0.19.1",

package/client/live.js

@@ -1,124 +0,0 @@
-'use strict';
-
-/* eslint import/no-extraneous-dependencies: off, global-require: off */
-
-const $ = require('jquery');
-const stripAnsi = require('strip-ansi');
-const socket = require('./socket');
-require('./style.css');
-
-let hot = false;
-let currentHash = '';
-
-$(() => {
-  $('body').html(require('./page.pug')());
-  const status = $('#status');
-  const okness = $('#okness');
-  const $errors = $('#errors');
-  const iframe = $('#iframe');
-  const header = $('.header');
-
-  const contentPage = window.location.pathname.substr('/webpack-dev-server'.length) + window.location.search;
-
-  status.text('Connecting to sockjs server...');
-  $errors.hide();
-  iframe.hide();
-  header.css({
-    borderColor: '#96b5b4'
-  });
-
-  const onSocketMsg = {
-    hot() {
-      hot = true;
-      iframe.attr('src', contentPage + window.location.hash);
-    },
-    invalid() {
-      okness.text('');
-      status.text('App updated. Recompiling...');
-      header.css({
-        borderColor: '#96b5b4'
-      });
-      $errors.hide();
-      if (!hot) iframe.hide();
-    },
-    hash(hash) {
-      currentHash = hash;
-    },
-    'still-ok': function stillOk() {
-      okness.text('');
-      status.text('App ready.');
-      header.css({
-        borderColor: ''
-      });
-      $errors.hide();
-      if (!hot) iframe.show();
-    },
-    ok() {
-      okness.text('');
-      $errors.hide();
-      reloadApp();
-    },
-    warnings() {
-      okness.text('Warnings while compiling.');
-      $errors.hide();
-      reloadApp();
-    },
-    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`);
-      header.css({
-        borderColor: '#ebcb8b'
-      });
-      $errors.show();
-      iframe.hide();
-    },
-    close() {
-      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');
-      header.css({
-        borderColor: '#ebcb8b'
-      });
-      $errors.show();
-      iframe.hide();
-    }
-  };
-
-  socket('/sockjs-node', onSocketMsg);
-
-  iframe.on('load', () => {
-    status.text('App ready.');
-    header.css({
-      borderColor: ''
-    });
-    iframe.show();
-  });
-
-  function reloadApp() {
-    if (hot) {
-      status.text('App hot update.');
-      try {
-        iframe[0].contentWindow.postMessage(`webpackHotUpdate${currentHash}`, '*');
-      } catch (e) {
-        console.warn(e); // eslint-disable-line
-      }
-      iframe.show();
-    } else {
-      status.text('App updated. Reloading app...');
-      header.css({
-        borderColor: '#96b5b4'
-      });
-      try {
-        let old = `${iframe[0].contentWindow.location}`;
-        if (old.indexOf('about') === 0) old = null;
-        iframe.attr('src', old || (contentPage + window.location.hash));
-        if (old) {
-          iframe[0].contentWindow.location.reload();
-        }
-      } catch (e) {
-        iframe.attr('src', contentPage + window.location.hash);
-      }
-    }
-  }
-});

package/client/page.pug

@@ -1,7 +0,0 @@
-.header
-	span#okness
-	= " "
-	span#status
-pre#errors
-#warnings
-iframe#iframe(src="javascript:;" allowfullscreen)

package/client/sockjs.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('sockjs-client');

package/client/style.css

@@ -1,58 +0,0 @@
-*,
-*:before,
-*:after {
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-
-body,
-html {
-	margin: 0;
-	padding: 0;
-	height: 100%;
-	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.header {
-	width: 100%;
-	height: 30px;
-	padding: 0 10px;
-	border-left: 10px solid #a3be8c;
-	font-size: 12px;
-	line-height: 30px;
-	color: #eff1f5;
-	background: #343d46;
-	overflow: hidden;
-}
-
-#iframe {
-	position: absolute;
-	top: 30px;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	height: -webkit-calc(100% - 30px);
-	height: -moz-calc(100% - 30px);
-	height: -ms-calc(100% - 30px);
-	height: -o-calc(100% - 30px);
-	height: calc(100% - 30px);
-	border: 0;
-}
-
-#errors {
-	width: 100%;
-	margin: 0;
-	padding: 10px;
-	font-family: monospace;
-	font-size: 14px;
-	line-height: 1.4;
-	color: #eff1f5;
-	background: #bf616a;
-	overflow: auto;
-}
-
-#okness {
-	font-weight: bold;
-}

package/client/web_modules/jquery/index.js

@@ -1,2 +0,0 @@
-require("./jquery-1.8.1");
-module.exports = jQuery;