Merge branch 'unfold-env-plugin'

sokra · sokra · commit cd2183810e68 · 2015-01-06T23:03:29.000+01:00
diff --git a/lib/EnvironmentPlugin.js b/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;
+	}, {})));
+};
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -77,6 +77,7 @@ exportPlugins(exports, ".", [
 	"UmdMainTemplatePlugin",
 	"NoErrorsPlugin",
 	"NewWatchingPlugin",
+	"EnvPlugin"
 ]);
 exportPlugins(exports.optimize = {}, "./optimize", [
 	"AggressiveMergingPlugin",
diff --git a/test/configCases/plugins/environment-plugin/errors.js b/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/],
+];
diff --git a/test/configCases/plugins/environment-plugin/index.js b/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");
+});
diff --git a/test/configCases/plugins/environment-plugin/warnings.js b/test/configCases/plugins/environment-plugin/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/(ddd)/, /DDD environment variable is undefined./]
+];
diff --git a/test/configCases/plugins/environment-plugin/webpack.config.js b/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")
+	]
+}];

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/(ddd)/, /DDD environment variable is undefined./]`
	`3`	`+];`