Rename schemas; Make imports less verbose

DantrazTrev · Nov 12, 2017 · cdd593b · cdd593b
1 parent d73ad04
commit cdd593b
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 28 deletions.
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
@@ -9,7 +9,7 @@ const ConcatSource = require("webpack-sources").ConcatSource;
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
 const validateOptions = require("schema-utils");
-const bannerPluginSchema = require("../schemas/plugins/bannerPluginSchema.json");
+const schema = require("../schemas/plugins/BannerPlugin.json");
 
 const wrapComment = (str) => {
 	if(!str.includes("\n")) return `/*! ${str} */`;
@@ -21,7 +21,7 @@ class BannerPlugin {
 		if(arguments.length > 1)
 			throw new Error("BannerPlugin only takes one argument (pass an options object)");
 
-		validateOptions(bannerPluginSchema, options, "Banner Plugin");
+		validateOptions(schema, options, "Banner Plugin");
 
 		if(typeof options === "string")
 			options = {

diff --git a/lib/DllPlugin.js b/lib/DllPlugin.js
@@ -9,11 +9,11 @@ const LibManifestPlugin = require("./LibManifestPlugin");
 const FlagInitialModulesAsUsedPlugin = require("./FlagInitialModulesAsUsedPlugin");
 
 const validateOptions = require("schema-utils");
-const dllPluginSchema = require("../schemas/plugins/dllPluginSchema.json");
+const schema = require("../schemas/plugins/DllPlugin.json");
 
 class DllPlugin {
 	constructor(options) {
-		validateOptions(dllPluginSchema, options, "Dll Plugin");
+		validateOptions(schema, options, "Dll Plugin");
 		this.options = options;
 	}
 

diff --git a/lib/DllReferencePlugin.js b/lib/DllReferencePlugin.js
@@ -11,11 +11,11 @@ const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDepen
 const NullFactory = require("./NullFactory");
 
 const validateOptions = require("schema-utils");
-const dllReferencePluginSchema = require("../schemas/plugins/dllReferencePluginSchema.json");
+const schema = require("../schemas/plugins/DllReferencePlugin.json");
 
 class DllReferencePlugin {
 	constructor(options) {
-		validateOptions(dllReferencePluginSchema, options, "Dll Reference Plugin");
+		validateOptions(schema, options, "Dll Reference Plugin");
 		this.options = options;
 	}
 

diff --git a/lib/HashedModuleIdsPlugin.js b/lib/HashedModuleIdsPlugin.js
@@ -6,11 +6,11 @@
 const createHash = require("crypto").createHash;
 
 const validateOptions = require("schema-utils");
-const hashedModuleIdsPluginSchema = require("../schemas/plugins/hashedModuleIdsPluginSchema.json");
+const schema = require("../schemas/plugins/HashedModuleIdsPlugin.json");
 
 class HashedModuleIdsPlugin {
 	constructor(options) {
-		validateOptions(hashedModuleIdsPluginSchema, options || {}, "Hashed Module Ids Plugin");
+		validateOptions(schema, options || {}, "Hashed Module Ids Plugin");
 
 		this.options = Object.assign({
 			hashFunction: "md5",

diff --git a/lib/LoaderOptionsPlugin.js b/lib/LoaderOptionsPlugin.js
@@ -7,11 +7,11 @@
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
 const validateOptions = require("schema-utils");
-const loaderOptionsPluginSchema = require("../schemas/plugins/loaderOptionsPluginSchema.json");
+const schema = require("../schemas/plugins/LoaderOptionsPlugin.json");
 
 class LoaderOptionsPlugin {
 	constructor(options) {
-		validateOptions(loaderOptionsPluginSchema, options || {}, "Loader Options Plugin");
+		validateOptions(schema, options || {}, "Loader Options Plugin");
 
 		if(typeof options !== "object") options = {};
 		if(!options.test) options.test = {

diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -13,7 +13,7 @@ const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
 
 const validateOptions = require("schema-utils");
-const sourceMapDevToolPluginSchema = require("../schemas/plugins/sourceMapDevToolPluginSchema.json");
+const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
 
 const basename = (name) => {
 	if(name.indexOf("/") < 0) return name;
@@ -57,7 +57,7 @@ class SourceMapDevToolPlugin {
 		if(arguments.length > 1)
 			throw new Error("SourceMapDevToolPlugin only takes one argument (pass an options object)");
 
-		validateOptions(sourceMapDevToolPluginSchema, options || {}, "Source Map Dev Tool Plugin");
+		validateOptions(schema, options || {}, "SourceMap DevTool Plugin");
 
 		if(!options) options = {};
 		this.sourceMapFilename = options.filename;

diff --git a/lib/WatchIgnorePlugin.js b/lib/WatchIgnorePlugin.js
@@ -5,11 +5,11 @@
 "use strict";
 
 const validateOptions = require("schema-utils");
-const watchIgnorePluginSchema = require("../schemas/plugins/watchIgnorePluginSchema.json");
+const schema = require("../schemas/plugins/WatchIgnorePlugin.json");
 
 class WatchIgnorePlugin {
 	constructor(paths) {
-		validateOptions(watchIgnorePluginSchema, paths, "Watch Ignore Plugin");
+		validateOptions(schema, paths, "Watch Ignore Plugin");
 		this.paths = paths;
 	}
 

diff --git a/lib/WebpackOptionsValidationError.js b/lib/WebpackOptionsValidationError.js
@@ -5,7 +5,7 @@
 "use strict";
 
 const WebpackError = require("./WebpackError");
-const webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
+const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
 
 const getSchemaPart = (path, parents, additionalPath) => {
 	parents = parents || 0;

diff --git a/lib/optimize/AggressiveSplittingPlugin.js b/lib/optimize/AggressiveSplittingPlugin.js
@@ -7,7 +7,7 @@
 const identifierUtils = require("../util/identifier");
 
 const validateOptions = require("schema-utils");
-const aggressiveSplittingPluginSchema = require("../../schemas/plugins/optimize/aggressiveSplittingPluginSchema.json");
+const schema = require("../../schemas/plugins/optimize/AggressiveSplittingPlugin.json");
 
 function moveModuleBetween(oldChunk, newChunk) {
 	return function(module) {
@@ -33,7 +33,7 @@ function copyWithReason(obj) {
 
 class AggressiveSplittingPlugin {
 	constructor(options) {
-		validateOptions(aggressiveSplittingPluginSchema, options || {}, "Aggressive Splitting Plugin");
+		validateOptions(schema, options || {}, "Aggressive Splitting Plugin");
 
 		this.options = options || {};
 		if(typeof this.options.minSize !== "number") this.options.minSize = 30 * 1024;

diff --git a/lib/optimize/CommonsChunkPlugin.js b/lib/optimize/CommonsChunkPlugin.js
@@ -6,7 +6,7 @@
 let nextIdent = 0;
 
 const validateOptions = require("schema-utils");
-const commonsChunkPluginSchema = require("../../schemas/plugins/optimize/commonsChunkPluginSchema.json");
+const schema = require("../../schemas/plugins/optimize/CommonsChunkPlugin.json");
 
 class CommonsChunkPlugin {
 	constructor(options) {
@@ -28,7 +28,7 @@ The available options are:
 	minSize: number`);
 		}
 
-		validateOptions(commonsChunkPluginSchema, options, "Commons Chunk Plugin");
+		validateOptions(schema, options, "Commons Chunk Plugin");
 
 		const normalizedOptions = this.normalizeOptions(options);
 

diff --git a/lib/optimize/LimitChunkCountPlugin.js b/lib/optimize/LimitChunkCountPlugin.js
@@ -5,11 +5,11 @@
 "use strict";
 
 const validateOptions = require("schema-utils");
-const limitChunkCountPluginSchema = require("../../schemas/plugins/optimize/limitChunkCountPluginSchema.json");
+const schema = require("../../schemas/plugins/optimize/LimitChunkCountPlugin.json");
 
 class LimitChunkCountPlugin {
 	constructor(options) {
-		validateOptions(limitChunkCountPluginSchema, options || {}, "Limit Chunk Count Plugin");
+		validateOptions(schema, options || {}, "Limit Chunk Count Plugin");
 		this.options = options || {};
 	}
 	apply(compiler) {

diff --git a/lib/optimize/MinChunkSizePlugin.js b/lib/optimize/MinChunkSizePlugin.js
@@ -5,11 +5,11 @@
 "use strict";
 
 const validateOptions = require("schema-utils");
-const minChunkSizePluginSchema = require("../../schemas/plugins/optimize/minChunkSizePluginSchema.json");
+const schema = require("../../schemas/plugins/optimize/MinChunkSizePlugin.json");
 
 class MinChunkSizePlugin {
 	constructor(options) {
-		validateOptions(minChunkSizePluginSchema, options, "Min Chunk Size Plugin");
+		validateOptions(schema, options, "Min Chunk Size Plugin");
 		this.options = options;
 	}
 

diff --git a/lib/webpack.js b/lib/webpack.js
@@ -11,7 +11,7 @@ const WebpackOptionsApply = require("./WebpackOptionsApply");
 const WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
 const validateSchema = require("./validateSchema");
 const WebpackOptionsValidationError = require("./WebpackOptionsValidationError");
-const webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
+const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
 
 function webpack(options, callback) {
 	const webpackOptionsValidationErrors = validateSchema(webpackOptionsSchema, options);

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "memory-fs": "~0.4.1",
     "mkdirp": "~0.5.0",
     "node-libs-browser": "^2.0.0",
-    "schema-utils": "^0.4.0",
+    "schema-utils": "^0.4.2",
     "source-map": "^0.5.3",
     "supports-color": "^4.2.1",
     "tapable": "^0.2.7",

diff --git a/schemas/webpackOptionsSchema.json → schemas/WebpackOptions.json b/schemas/webpackOptionsSchema.json → schemas/WebpackOptions.json
diff --git a/schemas/plugins/bannerPluginSchema.json → schemas/plugins/BannerPlugin.json b/schemas/plugins/bannerPluginSchema.json → schemas/plugins/BannerPlugin.json
diff --git a/schemas/plugins/dllPluginSchema.json → schemas/plugins/DllPlugin.json b/schemas/plugins/dllPluginSchema.json → schemas/plugins/DllPlugin.json
diff --git a/...mas/plugins/dllReferencePluginSchema.json → schemas/plugins/DllReferencePlugin.json b/...mas/plugins/dllReferencePluginSchema.json → schemas/plugins/DllReferencePlugin.json
diff --git a/.../plugins/hashedModuleIdsPluginSchema.json → schemas/plugins/HashedModuleIdsPlugin.json b/.../plugins/hashedModuleIdsPluginSchema.json → schemas/plugins/HashedModuleIdsPlugin.json
diff --git a/...as/plugins/loaderOptionsPluginSchema.json → schemas/plugins/LoaderOptionsPlugin.json b/...as/plugins/loaderOptionsPluginSchema.json → schemas/plugins/LoaderOptionsPlugin.json
diff --git a/...plugins/sourceMapDevToolPluginSchema.json → schemas/plugins/SourceMapDevToolPlugin.json b/...plugins/sourceMapDevToolPluginSchema.json → schemas/plugins/SourceMapDevToolPlugin.json
diff --git a/schemas/plugins/watchIgnorePluginSchema.json → schemas/plugins/WatchIgnorePlugin.json b/schemas/plugins/watchIgnorePluginSchema.json → schemas/plugins/WatchIgnorePlugin.json
diff --git a/...mize/aggressiveSplittingPluginSchema.json → ...s/optimize/AggressiveSplittingPlugin.json b/...mize/aggressiveSplittingPluginSchema.json → ...s/optimize/AggressiveSplittingPlugin.json
diff --git a/...ns/optimize/commonsChunkPluginSchema.json → .../plugins/optimize/CommonsChunkPlugin.json b/...ns/optimize/commonsChunkPluginSchema.json → .../plugins/optimize/CommonsChunkPlugin.json
diff --git a/...optimize/limitChunkCountPluginSchema.json → ...ugins/optimize/LimitChunkCountPlugin.json b/...optimize/limitChunkCountPluginSchema.json → ...ugins/optimize/LimitChunkCountPlugin.json
diff --git a/...ns/optimize/minChunkSizePluginSchema.json → .../plugins/optimize/MinChunkSizePlugin.json b/...ns/optimize/minChunkSizePluginSchema.json → .../plugins/optimize/MinChunkSizePlugin.json
diff --git a/yarn.lock b/yarn.lock
@@ -500,6 +500,14 @@ chalk@^2.0.0, chalk@^2.0.1:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 [email protected]:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.1.tgz#c0dde4ab182713b919b970959a123ecc1a30fcd6"
@@ -3569,12 +3577,13 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.0.tgz#cf98d870a5f74e7526211f6d38caf0d250366688"
+schema-utils@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.2.tgz#86d92aedf4dfc51c9b321ef16bd33a9417b122d0"
   dependencies:
     ajv "^5.0.0"
     ajv-keywords "^2.1.0"
+    chalk "^2.3.0"
 
 script-loader@~0.7.0:
   version "0.7.0"