webpack 1.13.3 → 1.14.0

package/lib/node/NodeSourcePlugin.js

@@ -1,75 +1,85 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var ModuleAliasPlugin = require("enhanced-resolve/lib/ModuleAliasPlugin");
-var ModuleParserHelpers = require("../ModuleParserHelpers");
-var nodeLibsBrowser = require("node-libs-browser");
-
-function NodeSourcePlugin(options) {
-	this.options = options;
-}
-module.exports = NodeSourcePlugin;
-NodeSourcePlugin.prototype.apply = function(compiler) {
-	function getPathToModule(module, type) {
-		if(type === true || (type === undefined && nodeLibsBrowser[module])) {
-			if(!nodeLibsBrowser[module]) throw new Error("No browser version for node.js core module '" + module + "' available");
-			return nodeLibsBrowser[module];
-		} else if(type === "mock") {
-			return require.resolve("node-libs-browser/mock/" + module);
-		} else if(type === "empty") {
-			return require.resolve("node-libs-browser/mock/empty");
-		} else return module;
-	}
-	if(this.options.process) {
-		var processType = this.options.process;
-		compiler.parser.plugin("expression process", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "process", "require(" + JSON.stringify(getPathToModule("process", processType)) + ")");
-		});
-	}
-	if(this.options.global) {
-		compiler.parser.plugin("expression global", function() {
-			this.state.module.addVariable("global", "(function() { return this; }())");
-			return true;
-		});
-	}
-	if(this.options.console) {
-		var consoleType = this.options.console;
-		compiler.parser.plugin("expression console", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(getPathToModule("console", consoleType)) + ")");
-		});
-	}
-	var bufferType = this.options.Buffer;
-	if(typeof bufferType === "undefined") {
-		bufferType = this.options.buffer;
-		if(typeof bufferType === "undefined")
-			bufferType = true;
-	}
-	if(bufferType) {
-		compiler.parser.plugin("expression Buffer", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "Buffer", "require(" + JSON.stringify(getPathToModule("buffer", bufferType)) + ").Buffer");
-		});
-	}
-	if(this.options.setImmediate) {
-		var setImmediateType = this.options.setImmediate;
-		compiler.parser.plugin("expression setImmediate", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "setImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").setImmediate");
-		});
-		compiler.parser.plugin("expression clearImmediate", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "clearImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").clearImmediate");
-		});
-	}
-	var options = this.options;
-	compiler.plugin("after-resolvers", function(compiler) {
-		var alias = {};
-		Object.keys(nodeLibsBrowser).forEach(function(lib) {
-			if(options[lib] !== false)
-				alias[lib + "$"] = getPathToModule(lib, options[lib]);
-		});
-		if(Object.keys(alias).length > 0) {
-			compiler.resolvers.normal.apply(
-				new ModuleAliasPlugin(alias)
-			);
-		}
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ModuleAliasPlugin = require("enhanced-resolve/lib/ModuleAliasPlugin");
+var ModuleParserHelpers = require("../ModuleParserHelpers");
+var nodeLibsBrowser = require("node-libs-browser");
+var path = require("path");
+
+function NodeSourcePlugin(options) {
+	this.options = options;
+}
+module.exports = NodeSourcePlugin;
+NodeSourcePlugin.prototype.apply = function(compiler) {
+	var parser = compiler.parser;
+
+	function buildExpression(context, pathToModule) {
+		var moduleJsPath = path.relative(context, pathToModule);
+		if(!/^[A-Z]:/i.test(moduleJsPath)) {
+			moduleJsPath = "./" + moduleJsPath.replace(/\\/g, "/");
+		}
+		return "require(" + JSON.stringify(moduleJsPath) + ")";
+	}
+
+	function addExpression(parser, name, module, type, suffix) {
+		suffix = suffix || "";
+		parser.plugin("expression " + name, function() {
+			if(this.state.module && this.state.module.resource === getPathToModule(module, type)) return;
+			return ModuleParserHelpers.addParsedVariable(this, name, buildExpression(this.state.module.context, getPathToModule(module, type)) + suffix);
+		});
+	}
+
+	function getPathToModule(module, type) {
+		if(type === true || (type === undefined && nodeLibsBrowser[module])) {
+			if(!nodeLibsBrowser[module]) throw new Error("No browser version for node.js core module '" + module + "' available");
+			return nodeLibsBrowser[module];
+		} else if(type === "mock") {
+			return require.resolve("node-libs-browser/mock/" + module);
+		} else if(type === "empty") {
+			return require.resolve("node-libs-browser/mock/empty");
+		} else return module;
+	}
+
+	if(this.options.global) {
+		compiler.parser.plugin("expression global", function() {
+			this.state.module.addVariable("global", "(function() { return this; }())");
+			return true;
+		});
+	}
+	if(this.options.process) {
+		var processType = this.options.process;
+		addExpression(parser, "process", "process", processType);
+	}
+	if(this.options.console) {
+		var consoleType = this.options.console;
+		addExpression(parser, "console", "console", consoleType);
+	}
+	var bufferType = this.options.Buffer;
+	if(typeof bufferType === "undefined") {
+		bufferType = this.options.buffer;
+		if(typeof bufferType === "undefined")
+			bufferType = true;
+	}
+	if(bufferType) {
+		addExpression(parser, "Buffer", "buffer", bufferType, ".Buffer");
+	}
+	if(this.options.setImmediate) {
+		var setImmediateType = this.options.setImmediate;
+		addExpression(parser, "setImmediate", "timers", setImmediateType, ".setImmediate");
+		addExpression(parser, "clearImmediate", "timers", setImmediateType, ".clearImmediate");
+	}
+	var options = this.options;
+	compiler.plugin("after-resolvers", function(compiler) {
+		var alias = {};
+		Object.keys(nodeLibsBrowser).forEach(function(lib) {
+			if(options[lib] !== false)
+				alias[lib + "$"] = getPathToModule(lib, options[lib]);
+		});
+		if(Object.keys(alias).length > 0) {
+			compiler.resolvers.normal.apply(
+				new ModuleAliasPlugin(alias)
+			);
+		}
+	});
+};

package/lib/node/NodeTargetPlugin.js

@@ -1,12 +1,12 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var ExternalsPlugin = require("../ExternalsPlugin");
-
-function NodeTargetPlugin() {}
-
-module.exports = NodeTargetPlugin;
-NodeTargetPlugin.prototype.apply = function(compiler) {
-	new ExternalsPlugin("commonjs", Object.keys(process.binding("natives"))).apply(compiler);
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ExternalsPlugin = require("../ExternalsPlugin");
+
+function NodeTargetPlugin() {}
+
+module.exports = NodeTargetPlugin;
+NodeTargetPlugin.prototype.apply = function(compiler) {
+	new ExternalsPlugin("commonjs", Object.keys(process.binding("natives"))).apply(compiler);
+};

package/lib/node/NodeTemplatePlugin.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var NodeMainTemplatePlugin = require("./NodeMainTemplatePlugin");
-var NodeChunkTemplatePlugin = require("./NodeChunkTemplatePlugin");
-var NodeHotUpdateChunkTemplatePlugin = require("./NodeHotUpdateChunkTemplatePlugin");
-
-function NodeTemplatePlugin(options, asyncChunkLoading) {
-	// TODO remove options parameter
-	this.options = options;
-	this.asyncChunkLoading = asyncChunkLoading;
-}
-module.exports = NodeTemplatePlugin;
-NodeTemplatePlugin.prototype.apply = function(compiler) {
-	compiler.plugin("this-compilation", function(compilation) {
-		compilation.mainTemplate.apply(new NodeMainTemplatePlugin(this.asyncChunkLoading));
-		compilation.chunkTemplate.apply(new NodeChunkTemplatePlugin());
-		compilation.hotUpdateChunkTemplate.apply(new NodeHotUpdateChunkTemplatePlugin());
-	}.bind(this));
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var NodeMainTemplatePlugin = require("./NodeMainTemplatePlugin");
+var NodeChunkTemplatePlugin = require("./NodeChunkTemplatePlugin");
+var NodeHotUpdateChunkTemplatePlugin = require("./NodeHotUpdateChunkTemplatePlugin");
+
+function NodeTemplatePlugin(options, asyncChunkLoading) {
+	// TODO remove options parameter
+	this.options = options;
+	this.asyncChunkLoading = asyncChunkLoading;
+}
+module.exports = NodeTemplatePlugin;
+NodeTemplatePlugin.prototype.apply = function(compiler) {
+	compiler.plugin("this-compilation", function(compilation) {
+		compilation.mainTemplate.apply(new NodeMainTemplatePlugin(this.asyncChunkLoading));
+		compilation.chunkTemplate.apply(new NodeChunkTemplatePlugin());
+		compilation.hotUpdateChunkTemplate.apply(new NodeHotUpdateChunkTemplatePlugin());
+	}.bind(this));
+};

package/lib/node/NodeWatchFileSystem.js

@@ -1,65 +1,65 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var Watchpack = require("watchpack");
-
-function NodeWatchFileSystem(inputFileSystem) {
-	this.inputFileSystem = inputFileSystem;
-	this.watcherOptions = {
-		aggregateTimeout: 0
-	};
-	this.watcher = new Watchpack(this.watcherOptions);
-}
-
-module.exports = NodeWatchFileSystem;
-
-NodeWatchFileSystem.prototype.watch = function watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-	if(!Array.isArray(files))
-		throw new Error("Invalid arguments: 'files'");
-	if(!Array.isArray(dirs))
-		throw new Error("Invalid arguments: 'dirs'");
-	if(!Array.isArray(missing))
-		throw new Error("Invalid arguments: 'missing'");
-	if(typeof callback !== "function")
-		throw new Error("Invalid arguments: 'callback'");
-	if(typeof startTime !== "number" && startTime)
-		throw new Error("Invalid arguments: 'startTime'");
-	if(typeof options !== "object")
-		throw new Error("Invalid arguments: 'options'");
-	if(typeof callbackUndelayed !== "function" && callbackUndelayed)
-		throw new Error("Invalid arguments: 'callbackUndelayed'");
-	var oldWatcher = this.watcher;
-	this.watcher = new Watchpack(options);
-
-	if(callbackUndelayed)
-		this.watcher.once("change", callbackUndelayed);
-
-	this.watcher.once("aggregated", function(changes) {
-		if(this.inputFileSystem && this.inputFileSystem.purge) {
-			this.inputFileSystem.purge(changes);
-		}
-		var times = this.watcher.getTimes();
-		callback(null, changes.filter(function(file) {
-			return files.indexOf(file) >= 0;
-		}).sort(), changes.filter(function(file) {
-			return dirs.indexOf(file) >= 0;
-		}).sort(), changes.filter(function(file) {
-			return missing.indexOf(file) >= 0;
-		}).sort(), times, times);
-	}.bind(this));
-
-	this.watcher.watch(files.concat(missing), dirs, startTime);
-
-	if(oldWatcher) {
-		oldWatcher.close();
-	}
-	return {
-		close: function() {
-			this.watcher.close();
-		}.bind(this),
-		pause: function() {
-			this.watcher.pause();
-		}.bind(this)
-	};
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var Watchpack = require("watchpack");
+
+function NodeWatchFileSystem(inputFileSystem) {
+	this.inputFileSystem = inputFileSystem;
+	this.watcherOptions = {
+		aggregateTimeout: 0
+	};
+	this.watcher = new Watchpack(this.watcherOptions);
+}
+
+module.exports = NodeWatchFileSystem;
+
+NodeWatchFileSystem.prototype.watch = function watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
+	if(!Array.isArray(files))
+		throw new Error("Invalid arguments: 'files'");
+	if(!Array.isArray(dirs))
+		throw new Error("Invalid arguments: 'dirs'");
+	if(!Array.isArray(missing))
+		throw new Error("Invalid arguments: 'missing'");
+	if(typeof callback !== "function")
+		throw new Error("Invalid arguments: 'callback'");
+	if(typeof startTime !== "number" && startTime)
+		throw new Error("Invalid arguments: 'startTime'");
+	if(typeof options !== "object")
+		throw new Error("Invalid arguments: 'options'");
+	if(typeof callbackUndelayed !== "function" && callbackUndelayed)
+		throw new Error("Invalid arguments: 'callbackUndelayed'");
+	var oldWatcher = this.watcher;
+	this.watcher = new Watchpack(options);
+
+	if(callbackUndelayed)
+		this.watcher.once("change", callbackUndelayed);
+
+	this.watcher.once("aggregated", function(changes) {
+		if(this.inputFileSystem && this.inputFileSystem.purge) {
+			this.inputFileSystem.purge(changes);
+		}
+		var times = this.watcher.getTimes();
+		callback(null, changes.filter(function(file) {
+			return files.indexOf(file) >= 0;
+		}).sort(), changes.filter(function(file) {
+			return dirs.indexOf(file) >= 0;
+		}).sort(), changes.filter(function(file) {
+			return missing.indexOf(file) >= 0;
+		}).sort(), times, times);
+	}.bind(this));
+
+	this.watcher.watch(files.concat(missing), dirs, startTime);
+
+	if(oldWatcher) {
+		oldWatcher.close();
+	}
+	return {
+		close: function() {
+			this.watcher.close();
+		}.bind(this),
+		pause: function() {
+			this.watcher.pause();
+		}.bind(this)
+	};
+};