Merge branch 'master' into add/setimmediate

Author: jhnns

LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2012 - 2014 Tobias Koppers
+Copyright (c) 2012 - 2015 Tobias Koppers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/Compiler.js

@@ -2,6 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
+var path = require("path");
 var clone = require("clone");
 var Tapable = require("tapable");
 
@@ -235,9 +236,9 @@ Compiler.prototype.emitAssets = function(compilation, callback) {
 			if(queryStringIdx >= 0) {
 				targetFile = targetFile.substr(0, queryStringIdx);
 			}
-			if(targetFile.indexOf("/") >= 0) {
-				var idx = targetFile.lastIndexOf("/");
-				var dir = targetFile.substr(0, idx);
+
+			if(targetFile.match(/\/|\\/)) {
+				var dir = path.dirname(targetFile);
 				this.outputFileSystem.mkdirp(this.outputFileSystem.join(outputPath, dir), writeOut.bind(this));
 			} else writeOut.call(this);
 			function writeOut(err) {

lib/EnvironmentPlugin.js

@@ -0,0 +1,28 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Simen Brekken @simenbrekken
+*/
+var DefinePlugin = require("./DefinePlugin");
+
+function EnvironmentPlugin(keys) {
+	this.keys = Array.isArray(keys) ? keys : Array.prototype.slice.call(arguments);
+}
+module.exports = EnvironmentPlugin;
+
+EnvironmentPlugin.prototype.apply = function(compiler) {
+	compiler.apply(new DefinePlugin(this.keys.reduce(function(definitions, key) {
+		var value = process.env[key];
+
+		if (value === undefined) {
+			compiler.plugin("this-compilation", function(compilation) {
+				var error = new Error(key + " environment variable is undefined.");
+				error.name = "EnvVariableNotDefinedError";
+				compilation.warnings.push(error);
+			});
+		}
+
+		definitions["process.env." + key] = value ? JSON.stringify(value) : "undefined";
+
+		return definitions;
+	}, {})));
+};

lib/webpack.js

@@ -77,6 +77,7 @@ exportPlugins(exports, ".", [
 	"UmdMainTemplatePlugin",
 	"NoErrorsPlugin",
 	"NewWatchingPlugin",
+	"EnvPlugin"
 ]);
 exportPlugins(exports.optimize = {}, "./optimize", [
 	"AggressiveMergingPlugin",

test/Compiler.test.js

@@ -12,6 +12,10 @@ describe("Compiler", function() {
 		options.entry = entry;
 		options.context = path.join(__dirname, "fixtures");
 		options.output.pathinfo = true;
+		var logs = {
+			mkdirp: [],
+			writeFile: [],
+		};
 
 		var c = new Compiler();
 		c.options = new WebpackOptionsApply().process(options, c);
@@ -20,9 +24,11 @@ describe("Compiler", function() {
 		c.outputFileSystem = {
 			join: path.join.bind(path),
 			mkdirp: function(path, callback) {
+				logs.mkdirp.push(path);
 				callback();
 			},
 			writeFile: function(name, content, callback) {
+				logs.writeFile.push(name, content);
 				files[name] = content.toString("utf-8");
 				callback();
 			}
@@ -44,9 +50,26 @@ describe("Compiler", function() {
 				stats.errors[0].should.be.instanceOf(Error);
 				throw stats.errors[0];
 			}
+			stats.logs = logs;
 			callback(stats, files);
 		});
 	}
+	it("should compile a single file to deep output", function(done) {
+		var sep = path.sep;
+
+		compile("./c", {
+			output: {
+				path: 'what',
+				filename: 'the' + sep + 'hell.js',
+			}
+		}, function(stats, files) {
+			stats.logs.mkdirp.should.eql([
+				'what',
+				'what' + sep + 'the',
+			]);
+			done();
+		});
+	});
 	it("should compile a single file", function(done) {
 		compile("./c", {}, function(stats, files) {
 			files.should.have.property("bundle.js").have.type("string");
@@ -135,4 +158,4 @@ describe("Compiler", function() {
 			done();
 		});
 	});
-});
+});

test/configCases/plugins/environment-plugin/errors.js

@@ -0,0 +1,11 @@
+module.exports = [
+	[/(aaa)/, /module bbb/],
+	[/(aaa)/, /module ccc/],
+	[/(aaa)/, /module ddd/],
+	[/(bbbccc)/, /module aaa/],
+	[/(bbbccc)/, /module ddd/],
+	[/(ddd)/, /module aaa/],
+	[/(ddd)/, /module bbb/],
+	[/(ddd)/, /module ccc/],
+	[/(ddd)/, /module ddd/],
+];

test/configCases/plugins/environment-plugin/index.js

@@ -0,0 +1,16 @@
+it("should import a single process.env var", function() {
+	if(process.env.AAA !== "aaa")
+		require.include("aaa");
+});
+
+it("should import multiple process.env vars", function() {
+	if(process.env.BBB !== "bbb")
+		require.include("bbb");
+	if(process.env.CCC !== "ccc")
+		require.include("ccc");
+});
+
+it("should warn when a process.env variable is undefined", function() {
+	if(process.env.DDD !== "ddd")
+		require.include("ddd");
+});

test/configCases/plugins/environment-plugin/warnings.js

@@ -0,0 +1,3 @@
+module.exports = [
+	[/(ddd)/, /DDD environment variable is undefined./]
+];

test/configCases/plugins/environment-plugin/webpack.config.js

@@ -0,0 +1,23 @@
+var EnvironmentPlugin = require("../../../../lib/EnvironmentPlugin");
+process.env.AAA = "aaa";
+process.env.BBB = "bbb";
+process.env.CCC = "ccc";
+module.exports = [{
+	name: "aaa",
+	module: { unknownContextRegExp: /$^/, unknownContextCritical: false },
+	plugins: [
+		new EnvironmentPlugin("AAA")
+	]
+}, {
+	name: "bbbccc",
+	module: { unknownContextRegExp: /$^/, unknownContextCritical: false },
+	plugins: [
+		new EnvironmentPlugin("BBB", "CCC")
+	]
+}, {
+	name: "ddd",
+	module: { unknownContextRegExp: /$^/, unknownContextCritical: false },
+	plugins: [
+		new EnvironmentPlugin("DDD")
+	]
+}];