refactor(package): migrate to schema-utils (dependencies) (#1464)

webpack · Aug 29, 2018 · 4740224 · 4740224
1 parent 2e1e23a
commit 4740224
Show file tree

Hide file tree

Showing 8 changed files with 1,332 additions and 2,035 deletions.
diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js
@@ -354,9 +354,7 @@ function startDevServer(config, options) {
   try {
     server = new Server(compiler, options, log);
   } catch (err) {
-    const OptionsValidationError = require('../lib/OptionsValidationError');
-
-    if (err instanceof OptionsValidationError) {
+    if (err.name === 'ValidationError') {
       log.error(colors.error(options.stats.colors, err.message));
       // eslint-disable-next-line no-process-exit
       process.exit(1);

diff --git a/lib/OptionsValidationError.js b/lib/OptionsValidationError.js
diff --git a/lib/Server.js b/lib/Server.js
@@ -36,8 +36,8 @@ const webpackDevMiddleware = require('webpack-dev-middleware');
 const createLogger = require('./utils/createLogger');
 const createCertificate = require('./utils/createCertificate');
 
-const OptionsValidationError = require('./OptionsValidationError');
-const optionsSchema = require('./optionsSchema.json');
+const validateOptions = require('schema-utils');
+const schema = require('./options.json');
 
 const STATS = {
   all: false,
@@ -51,10 +51,7 @@ const STATS = {
 function Server (compiler, options = {}, _log) {
   this.log = _log || createLogger(options);
 
-  const validationErrors = webpack.validateSchema(optionsSchema, options);
-  if (validationErrors.length) {
-    throw new OptionsValidationError(validationErrors);
-  }
+  validateOptions(schema, options, 'webpack Dev Server');
 
   if (options.lazy && !options.filename) {
     throw new Error("'filename' option must be set in lazy mode.");