From be40f6da65da88ec876d6258ab353af832372d65 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Wed, 11 Jan 2017 09:12:55 +0100
Subject: [PATCH] change some constructs to ES2015

---
 lib/EnvironmentPlugin.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/EnvironmentPlugin.js b/lib/EnvironmentPlugin.js
index ef0ae4af1..5de89de93 100644
--- a/lib/EnvironmentPlugin.js
+++ b/lib/EnvironmentPlugin.js
@@ -9,28 +9,28 @@ const DefinePlugin = require("./DefinePlugin");
 
 class EnvironmentPlugin {
 	constructor(keys) {
-		this.defaultValues = {};
-
 		if(Array.isArray(keys)) {
 			this.keys = keys;
+			this.defaultValues = {};
 		} else if(keys && typeof keys === "object") {
 			this.keys = Object.keys(keys);
 			this.defaultValues = keys;
 		} else {
 			this.keys = Array.prototype.slice.call(arguments);
+			this.defaultValues = {};
 		}
 	}
 
 	apply(compiler) {
-		const definitions = this.keys.reduce(function(defs, key) {
+		const definitions = this.keys.reduce((defs, key) => {
 			const value = process.env[key] || this.defaultValues[key];
 
 			if(value === undefined) {
-				compiler.plugin("this-compilation", function(compilation) {
+				compiler.plugin("this-compilation", compilation => {
 					const error = new Error(
-						"EnvironmentPlugin - " + key + " environment variable is undefined. \n\n" +
-						"You can pass an object with default values to suppress this warning. \n" +
-						"See https://webpack.js.org/plugins/environment-plugin for example."
+						`EnvironmentPlugin - ${key} environment variable is undefined.\n\n` +
+						`You can pass an object with default values to suppress this warning.\n` +
+						`See https://webpack.js.org/plugins/environment-plugin for example.`
 					);
 
 					error.name = "EnvVariableNotDefinedError";
@@ -38,10 +38,10 @@ class EnvironmentPlugin {
 				});
 			}
 
-			defs["process.env." + key] = value === undefined ? "undefined" : JSON.stringify(value);
+			defs[`process.env.${key}`] = value === undefined ? "undefined" : JSON.stringify(value);
 
 			return defs;
-		}.bind(this), {});
+		}, {});
 
 		compiler.apply(new DefinePlugin(definitions));
 	}