mirror of https://github.com/webpack/webpack.git
				
				
				
			change some constructs to ES2015
This commit is contained in:
		
							parent
							
								
									34cf2ac93c
								
							
						
					
					
						commit
						be40f6da65
					
				|  | @ -9,28 +9,28 @@ const DefinePlugin = require("./DefinePlugin"); | ||||||
| 
 | 
 | ||||||
| class EnvironmentPlugin { | class EnvironmentPlugin { | ||||||
| 	constructor(keys) { | 	constructor(keys) { | ||||||
| 		this.defaultValues = {}; |  | ||||||
| 
 |  | ||||||
| 		if(Array.isArray(keys)) { | 		if(Array.isArray(keys)) { | ||||||
| 			this.keys = keys; | 			this.keys = keys; | ||||||
|  | 			this.defaultValues = {}; | ||||||
| 		} else if(keys && typeof keys === "object") { | 		} else if(keys && typeof keys === "object") { | ||||||
| 			this.keys = Object.keys(keys); | 			this.keys = Object.keys(keys); | ||||||
| 			this.defaultValues = keys; | 			this.defaultValues = keys; | ||||||
| 		} else { | 		} else { | ||||||
| 			this.keys = Array.prototype.slice.call(arguments); | 			this.keys = Array.prototype.slice.call(arguments); | ||||||
|  | 			this.defaultValues = {}; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	apply(compiler) { | 	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]; | 			const value = process.env[key] || this.defaultValues[key]; | ||||||
| 
 | 
 | ||||||
| 			if(value === undefined) { | 			if(value === undefined) { | ||||||
| 				compiler.plugin("this-compilation", function(compilation) { | 				compiler.plugin("this-compilation", compilation => { | ||||||
| 					const error = new Error( | 					const error = new Error( | ||||||
| 						"EnvironmentPlugin - " + key + " environment variable is undefined. \n\n" + | 						`EnvironmentPlugin - ${key} environment variable is undefined.\n\n` + | ||||||
| 						"You can pass an object with default values to suppress this warning. \n" + | 						`You can pass an object with default values to suppress this warning.\n` + | ||||||
| 						"See https://webpack.js.org/plugins/environment-plugin for example." | 						`See https://webpack.js.org/plugins/environment-plugin for example.` | ||||||
| 					); | 					); | ||||||
| 
 | 
 | ||||||
| 					error.name = "EnvVariableNotDefinedError"; | 					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; | 			return defs; | ||||||
| 		}.bind(this), {}); | 		}, {}); | ||||||
| 
 | 
 | ||||||
| 		compiler.apply(new DefinePlugin(definitions)); | 		compiler.apply(new DefinePlugin(definitions)); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue