Merge pull request #60 from chuckdumont/work2

Add noConsole option

Author: Chuck Dumont

README.md

@@ -199,6 +199,10 @@ If not specified, the default pattern `imports-loader|exports-loader)[?!]` is us
 
 This property is optional.  If the value is truthy, then undefined features will be treated as false for the purpose of dojo/has loader plugin feature evaluation at build time.  See [The dojo/has loader extension](#the-dojohas-loader-extension) for more information.
 
+### noConsole
+
+This property is optional.  If the value is truthy, then console output from building the Dojo loader will be suppressed.
+
 # Building the Dojo loader
 
 This plugin uses a custom build of the Dojo loader.  The built loader is packaged as a CommonJS module so that it may be more easily consumed by Webpack.  The loader build config specifies has.js features which exclude unneeded code (e.g. for loading modules) so that the loader embedded into the client is as small as possible (~4KB after uglify and gzip).  The Dojo loader builder requires that the Dojo util directory is a sibling of the `dojo` directory and is named either `util` or `dojo-util`.

lib/DojoAMDPlugin.js

@@ -74,7 +74,7 @@ module.exports = class DojoAMDPlugin {
 			loaderConfig.baseUrl = path.resolve(compiler.context, loaderConfig.baseUrl || ".").replace(/\\/g, "/");
 
 			if (!loaderScope.require) {
-				this.getDojoLoader(this.options, loaderConfig, (err, dojoLoader) => {
+				this.getDojoLoader(loaderConfig, (err, dojoLoader) => {
 					if (!err) {
 						dojoLoader.call(loaderScope, loaderConfig, {hasCache:{'dojo-config-api':1, 'dojo-inject-api':1, 'host-node':0, 'dom':0, 'dojo-sniff':0}}, loaderScope, loaderScope);
 					}
@@ -183,7 +183,7 @@ Refer to https://github.com/OpenNTF/dojo-webpack-plugin/blob/master/README.md#bu
 		alias['dojo/loaderProxy'] = path.resolve(__dirname, "..", "loaders", "dojo", "loaderProxy");
 	}
 
-	getDojoLoader(options__, loaderConfig, callback) {
+	getDojoLoader(loaderConfig, callback) {
 		var dojoLoader;
 		if (this.options.loader) {
 			try {
@@ -193,7 +193,9 @@ Refer to https://github.com/OpenNTF/dojo-webpack-plugin/blob/master/README.md#bu
 			}
 			callback(null, dojoLoader);
 		} else {
-			console.log("Dojo loader not specified in options.  Building the loader...");
+			if (!this.options.noConsole) {
+				console.log("Dojo loader not specified in options.  Building the loader...");
+			}
 			const execFile = require("child_process").execFile;
 			const tmp = require("tmp");
 			let dojoPath;
@@ -221,10 +223,14 @@ Refer to https://github.com/OpenNTF/dojo-webpack-plugin/blob/master/README.md#bu
 						tempDir	// target location
 					], (error, stdout, stderr) => {
 						if (error) {
-							console.log(stderr.toString());
+							if (!this.options.noConsole) {
+								console.log(stderr.toString());
+							}
 							callback(error);
 						} else {
-							console.log(stdout.toString());
+							if (!this.options.noConsole) {
+								console.log(stdout.toString());
+							}
 							this.options.loader = path.join(tempDir, "dojo/dojo.js");
 							dojoLoader = require(path.join(this.options.loader));
 							callback(null, dojoLoader);

test/ErrorTestCases/misc/loaderVersion/webpack.config.js

@@ -13,7 +13,8 @@ module.exports = {
 			loaderConfig: {
 				paths:{test: "."}
 			},
-			loader: loaderPath
+			loader: loaderPath,
+			noConsole: true
 		})
 	]
 };

test/ErrorTestCases/options/badDojoPath/webpack.config.js

@@ -6,7 +6,8 @@ module.exports = {
 			loaderConfig: {
 				paths:{test: "."},
 				packages:[{name: "dojo", location: "./dojo"}]
-			}
+			},
+			noConsole: true
 		})
 	]
 };

test/ErrorTestCases/options/missingDojo/webpack.config.js

@@ -5,7 +5,8 @@ module.exports = {
 		new DojoWebpackPlugin({
 			loaderConfig: {
 				paths:{test: "."}
-			}
+			},
+			noConsole: true
 		})
 	]
 };

test/TestCases/dependencies/constDeps/webpack.config.js

@@ -5,7 +5,8 @@ module.exports = {
 		new DojoWebpackPlugin({
 			loaderConfig: {
 				paths:{test: "."},
-				packages:[{name: "dojo", location: "../../../../node_modules/dojo"}]
+				packages:[{name: "dojo", location: "../../../../node_modules/dojo"}],
+				noConsole: true
 			}
 		})
 	],