webpack-dev-server 3.1.3 → 3.1.7

package/lib/options.json

@@ -0,0 +1,354 @@
+{
+  "type": "object",
+  "properties": {
+    "hot": {
+      "type": "boolean"
+    },
+    "hotOnly": {
+      "type": "boolean"
+    },
+    "lazy": {
+      "type": "boolean"
+    },
+    "bonjour": {
+      "type": "boolean"
+    },
+    "host": {
+      "type": "string"
+    },
+    "allowedHosts": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "filename": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "RegExp"
+        },
+        {
+          "instanceof": "Function"
+        }
+      ]
+    },
+    "publicPath": {
+      "type": "string"
+    },
+    "port": {
+      "anyOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "socket": {
+      "type": "string"
+    },
+    "watchOptions": {
+      "type": "object"
+    },
+    "headers": {
+      "type": "object"
+    },
+    "logLevel": {
+      "enum": [
+        "info",
+        "warn",
+        "error",
+        "debug",
+        "trace",
+        "silent"
+      ]
+    },
+    "clientLogLevel": {
+      "enum": [
+        "none",
+        "info",
+        "error",
+        "warning"
+      ]
+    },
+    "overlay": {
+      "anyOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "errors": {
+              "type": "boolean"
+            },
+            "warnings": {
+              "type": "boolean"
+            }
+          }
+        }
+      ]
+    },
+    "progress": {
+      "type": "boolean"
+    },
+    "key": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Buffer"
+        }
+      ]
+    },
+    "cert": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Buffer"
+        }
+      ]
+    },
+    "ca": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Buffer"
+        }
+      ]
+    },
+    "pfx": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Buffer"
+        }
+      ]
+    },
+    "pfxPassphrase": {
+      "type": "string"
+    },
+    "requestCert": {
+      "type": "boolean"
+    },
+    "inline": {
+      "type": "boolean"
+    },
+    "disableHostCheck": {
+      "type": "boolean"
+    },
+    "public": {
+      "type": "string"
+    },
+    "https": {
+      "anyOf": [
+        {
+          "type": "object"
+        },
+        {
+          "type": "boolean"
+        }
+      ]
+    },
+    "contentBase": {
+      "anyOf": [
+        {
+          "enum": [
+            false
+          ]
+        },
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "minItems": 1
+        }
+      ]
+    },
+    "watchContentBase": {
+      "type": "boolean"
+    },
+    "open": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "boolean"
+        }
+      ]
+    },
+    "useLocalIp": {
+      "type": "boolean"
+    },
+    "openPage": {
+      "type": "string"
+    },
+    "features": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "compress": {
+      "type": "boolean"
+    },
+    "proxy": {
+      "anyOf": [
+        {
+          "type": "object"
+        },
+        {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "type": "object"
+              },
+              {
+                "instanceof": "Function"
+              }
+            ]
+          },
+          "minItems": 1
+        }
+      ]
+    },
+    "historyApiFallback": {
+      "anyOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "object"
+        }
+      ]
+    },
+    "staticOptions": {
+      "type": "object"
+    },
+    "setup": {
+      "instanceof": "Function"
+    },
+    "before": {
+      "instanceof": "Function"
+    },
+    "after": {
+      "instanceof": "Function"
+    },
+    "stats": {
+      "anyOf": [
+        {
+          "type": "object"
+        },
+        {
+          "type": "boolean"
+        },
+        {
+          "enum": [
+            "none",
+            "errors-only",
+            "minimal",
+            "normal",
+            "verbose"
+          ]
+        }
+      ]
+    },
+    "reporter": {
+      "instanceof": "Function"
+    },
+    "logTime": {
+      "type": "boolean"
+    },
+    "noInfo": {
+      "type": "boolean"
+    },
+    "quiet": {
+      "type": "boolean"
+    },
+    "serverSideRender": {
+      "type": "boolean"
+    },
+    "index": {
+      "type": "string"
+    },
+    "log": {
+      "instanceof": "Function"
+    },
+    "warn": {
+      "instanceof": "Function"
+    }
+  },
+  "errorMessage": {
+    "properties": {
+      "hot": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-hot)",
+      "hotOnly": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-hotonly)",
+      "lazy": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-lazy-)",
+      "bonjour": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-bonjour)",
+      "publicPath": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-publicpath-)",
+      "host": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-host)",
+      "allowedHosts": "should be {Array} (https://webpack.js.org/configuration/dev-server/#devserver-allowedhosts)",
+      "logLevel": "should be {String} and equal to one of the allowed values\n\n [ 'trace', 'debug', 'info', 'warn', 'error', 'silent' ]\n\n(https://webpack.js.org/configuration/dev-server/#devserver-loglevel)",
+      "filename": "should be {String|RegExp|Function} (https://webpack.js.org/configuration/dev-server/#devserver-filename-)",
+      "port": "should be {String|Number} (https://webpack.js.org/configuration/dev-server/#devserver-port)",
+      "socket": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-socket)",
+      "watchOptions": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserver-watchoptions)",
+      "headers": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserver-headers-)",
+      "clientLogLevel": "should be {String} and equal to one of the allowed values\n\n [ 'trace', 'debug', 'info', 'warn', 'error', 'silent' ]\n\n(https://webpack.js.org/configuration/dev-server/#devserver-clientloglevel)",
+      "overlay": "should be {Object|Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-overlay)",
+      "progress": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-progress-cli-only)",
+      "key": "should be {String|Buffer} (https://webpack.js.org/configuration/dev-server/#devserver-key)",
+      "cert": "should be {String|Buffer} (https://webpack.js.org/configuration/dev-server/#devserver-cert)",
+      "ca": "should be {String|Buffer} (https://webpack.js.org/configuration/dev-server/#devserver-ca)",
+      "pfx": "should be {String|Buffer} (https://webpack.js.org/configuration/dev-server/#devserver-pfx)",
+      "pfxPassphrase": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-pfxpassphrase)",
+      "requestCert": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-requestcert)",
+      "inline": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-inline)",
+      "disableHostCheck": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-disablehostcheck)",
+      "public": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-public)",
+      "https": "should be {Object|Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-https)",
+      "contentBase": "should be {Array} (https://webpack.js.org/configuration/dev-server/#devserver-contentbase)",
+      "watchContentBase": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-watchcontentbase)",
+      "open": "should be {String|Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-open)",
+      "useLocalIp": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-uselocalip)",
+      "openPage": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-openpage)",
+      "features": "should be {Array} (https://webpack.js.org/configuration/dev-server/#devserver-features)",
+      "compress": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-compress)",
+      "proxy": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-hot)",
+      "historyApiFallback": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-historyapifallback)",
+      "staticOptions": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-staticOptions)",
+      "setup": "should be {Function} (https://webpack.js.org/configuration/dev-server/#devserver-setup)",
+      "before": "should be {Function} (https://webpack.js.org/configuration/dev-server/#devserver-before)",
+      "after": "should be {Function} (https://webpack.js.org/configuration/dev-server/#devserver-after)",
+      "stats": "should be {Boolean|Object|String} (https://webpack.js.org/configuration/dev-server/#devserver-stats-)",
+      "reporter": "should be {Function} (https://webpack.js.org/configuration/dev-server/#devserver-reporter)",
+      "logTime": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-logtime)",
+      "noInfo": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-noinfo-)",
+      "quiet": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-quiet-)",
+      "serverSideRender": "should be {Boolean} (https://webpack.js.org/configuration/dev-server/#devserver-serversiderender)",
+      "index": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-index)",
+      "log": "should be {Function} (https://webpack.js.org/configuration/dev-server/#devserver-log)",
+      "warn": "should be {Function} (https://webpack.js.org/configuration/dev-server/#devserver-warn)"
+    }
+  },
+  "additionalProperties": false
+}

package/lib/utils/addEntries.js

@@ -0,0 +1,55 @@
+'use strict';
+
+/* eslint-disable
+  no-shadow,
+  no-param-reassign,
+  array-bracket-spacing,
+  space-before-function-paren
+*/
+const createDomain = require('./createDomain');
+
+function addEntries (config, options, server) {
+  if (options.inline !== false) {
+    // we're stubbing the app in this method as it's static and doesn't require
+    // a server to be supplied. createDomain requires an app with the
+    // address() signature.
+    const app = server || {
+      address() {
+        return { port: options.port };
+      }
+    };
+
+    const domain = createDomain(options, app);
+    const entries = [ `${require.resolve('../../client/')}?${domain}` ];
+
+    if (options.hotOnly) {
+      entries.push(require.resolve('webpack/hot/only-dev-server'));
+    } else if (options.hot) {
+      entries.push(require.resolve('webpack/hot/dev-server'));
+    }
+
+    const prependEntry = (entry) => {
+      if (typeof entry === 'function') {
+        return () => Promise.resolve(entry()).then(prependEntry);
+      }
+
+      if (typeof entry === 'object' && !Array.isArray(entry)) {
+        const clone = {};
+
+        Object.keys(entry).forEach((key) => {
+          clone[key] = entries.concat(entry[key]);
+        });
+
+        return clone;
+      }
+
+      return entries.concat(entry);
+    };
+
+    [].concat(config).forEach((config) => {
+      config.entry = prependEntry(config.entry || './src');
+    });
+  }
+}
+
+module.exports = addEntries;

package/lib/utils/createCertificate.js

@@ -0,0 +1,65 @@
+'use strict';
+
+/* eslint-disable
+  space-before-function-paren
+*/
+const selfsigned = require('selfsigned');
+
+function createCertificate (attrs) {
+  return selfsigned.generate(attrs, {
+    algorithm: 'sha256',
+    days: 30,
+    keySize: 2048,
+    extensions: [
+      {
+        name: 'basicConstraints',
+        cA: true
+      },
+      {
+        name: 'keyUsage',
+        keyCertSign: true,
+        digitalSignature: true,
+        nonRepudiation: true,
+        keyEncipherment: true,
+        dataEncipherment: true
+      },
+      {
+        name: 'subjectAltName',
+        altNames: [
+          {
+            // type 2 is DNS
+            type: 2,
+            value: 'localhost'
+          },
+          {
+            type: 2,
+            value: 'localhost.localdomain'
+          },
+          {
+            type: 2,
+            value: 'lvh.me'
+          },
+          {
+            type: 2,
+            value: '*.lvh.me'
+          },
+          {
+            type: 2,
+            value: '[::1]'
+          },
+          {
+            // type 7 is IP
+            type: 7,
+            ip: '127.0.0.1'
+          },
+          {
+            type: 7,
+            ip: 'fe80::1'
+          }
+        ]
+      }
+    ]
+  });
+}
+
+module.exports = createCertificate;

package/lib/utils/createDomain.js

@@ -0,0 +1,35 @@
+'use strict';
+
+/* eslint-disable
+  no-nested-ternary,
+  multiline-ternary,
+  space-before-function-paren
+*/
+const url = require('url');
+const ip = require('internal-ip');
+
+function createDomain (options, server) {
+  const protocol = options.https ? 'https' : 'http';
+  const hostname = options.useLocalIp ? ip.v4.sync() || 'localhost' : options.host;
+
+  const port = options.socket
+    ? 0
+    : server
+      ? server.address().port
+      : 0;
+  // 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 url.format({
+    protocol,
+    hostname,
+    port
+  });
+}
+
+module.exports = createDomain;

package/lib/utils/createLogger.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/* eslint-disable
+  space-before-function-paren
+*/
+const log = require('webpack-log');
+
+function createLogger (options) {
+  let level = options.logLevel || 'info';
+
+  if (options.quiet === true) {
+    level = 'silent';
+  }
+
+  if (options.noInfo === true) {
+    level = 'warn';
+  }
+
+  return log({
+    name: 'wds',
+    level,
+    timestamp: options.logTime
+  });
+}
+
+module.exports = createLogger;

package/package.json

@@ -1,49 +1,31 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.1.3",
+  "version": "3.1.7",
   "description": "Serves a webpack app. Updates the browser on changes.",
-  "license": "MIT",
-  "repository": "webpack/webpack-dev-server",
-  "author": "Tobias Koppers @sokra",
-  "homepage": "https://github.com/webpack/webpack-dev-server",
-  "maintainers": [
-    {
-      "name": "Andrew Powell",
-      "email": "andrew@shellscape.org",
-      "url": "shellscape.org"
-    }
-  ],
-  "main": "lib/Server.js",
   "bin": "bin/webpack-dev-server.js",
+  "main": "lib/Server.js",
+  "files": [
+    "bin",
+    "lib",
+    "ssl",
+    "client"
+  ],
   "engines": {
-    "node": ">=6.11.5"
+    "node": ">= 6.11.5"
   },
   "scripts": {
-    "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-src",
-    "mocha": "mocha --full-trace --check-leaks",
-    "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",
+    "test": "nyc --reporter lcovonly mocha --full-trace --check-leaks --exit",
+    "prepare": "(rm ssl/*.pem || true) && npm run -s transpile:index && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
     "transpile:index": "babel client-src/default --out-dir client --ignore *.config.js",
     "build:index": "webpack ./client-src/default/index.js -o client/index.bundle.js --color --config client-src/default/webpack.config.js",
     "build:live": "webpack ./client-src/live/index.js -o client/live.bundle.js --color --config client-src/live/webpack.config.js",
     "build:sockjs": "webpack ./client-src/sockjs/index.js -o 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": [
-    "lib/",
-    "bin",
-    "client/",
-    "ssl/"
-  ],
-  "peerDependencies": {
-    "webpack": "^4.0.0-beta.1"
+    "webpack-dev-server": "cd $INIT_CWD && node ../../../bin/webpack-dev-server.js",
+    "release": "standard-version"
   },
   "dependencies": {
     "ansi-html": "0.0.7",
-    "array-includes": "^3.0.3",
     "bonjour": "^3.5.0",
     "chokidar": "^2.0.0",
     "compression": "^1.5.2",
@@ -54,53 +36,61 @@
     "html-entities": "^1.2.0",
     "http-proxy-middleware": "~0.18.0",
     "import-local": "^1.0.0",
-    "internal-ip": "1.2.0",
+    "internal-ip": "^3.0.1",
     "ip": "^1.1.5",
     "killable": "^1.0.0",
     "loglevel": "^1.4.1",
     "opn": "^5.1.0",
     "portfinder": "^1.0.9",
+    "schema-utils": "^1.0.0",
     "selfsigned": "^1.9.1",
     "serve-index": "^1.7.2",
     "sockjs": "0.3.19",
-    "sockjs-client": "1.1.4",
+    "sockjs-client": "1.1.5",
     "spdy": "^3.4.1",
     "strip-ansi": "^3.0.0",
     "supports-color": "^5.1.0",
-    "webpack-dev-middleware": "3.1.2",
-    "webpack-log": "^1.1.2",
-    "yargs": "11.0.0"
+    "webpack-dev-middleware": "3.2.0",
+    "webpack-log": "^2.0.0",
+    "yargs": "12.0.1"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.4",
     "babel-preset-env": "^1.6.1",
-    "codecov.io": "^0.1.6",
     "copy-webpack-plugin": "^4.5.1",
-    "css-loader": "^0.28.10",
-    "eslint": "^4.18.2",
+    "css-loader": "^1.0.0",
+    "eslint": "^5.4.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.9.0",
-    "execa": "^0.9.0",
-    "file-loader": "^1.1.11",
+    "execa": "^0.11.0",
+    "file-loader": "^2.0.0",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.0.6",
-    "istanbul": "^0.4.5",
     "jquery": "^3.2.1",
-    "less": "^3.0.1",
+    "less": "^3.7.1",
     "less-loader": "^4.1.0",
-    "marked": "^0.3.17",
-    "mocha": "^3.5.3",
+    "marked": "^0.5.0",
+    "mocha": "^5.2.0",
     "mocha-sinon": "^2.0.0",
-    "semver": "^5.4.1",
+    "nyc": "^12.0.2",
     "should": "^13.2.0",
-    "sinon": "^4.4.2",
-    "style-loader": "^0.20.3",
+    "sinon": "^6.1.5",
+    "standard-version": "^4.4.0",
+    "style-loader": "^0.22.1",
     "supertest": "^3.0.0",
-    "url-loader": "^0.6.2",
-    "webpack": "^4.1.1",
-    "webpack-cli": "^2.0.14",
-    "ws": "^4.1.0"
-  }
+    "url-loader": "^1.1.1",
+    "webpack": "^4.17.1",
+    "webpack-cli": "^3.1.0",
+    "ws": "^6.0.0"
+  },
+  "peerDependencies": {
+    "webpack": "^4.0.0"
+  },
+  "author": "Tobias Koppers @sokra",
+  "bugs": "https://github.com/webpack/webpack-dev-server/issues",
+  "homepage": "https://github.com/webpack/webpack-dev-server#readme",
+  "repository": "https://github.com/webpack/webpack-dev-server.git",
+  "license": "MIT"
 }