Merge pull request #152 from chuckdumont/work

Fix for Object.defineProperties error when using webpack-dev-server #151

Author: Chuck Dumont

lib/DojoAMDModuleFactoryPlugin.js

@@ -27,13 +27,6 @@ module.exports = class DojoAMDModuleFactoryPlugin {
 
 	apply(compiler) {
 		this.compiler = compiler;
-		/*
-		 * Module factories are per-compilation objects.  We register our plugins using the
-		 * compiler's "normal-module-factory" event instead of the "compilation" event to
-		 * get the order of registration we need wrt other plugins, but it's safe to add
-		 * the compilation objects to the context after the fact, because the
-		 * "normal-module-factory" event will fire again for each new compilation.
-		 */
 		compiler.plugin("normal-module-factory", (factory) => {
 			const context = Object.create(this, {factory: {value: factory}});
 			plugin(factory, {
@@ -42,14 +35,14 @@ module.exports = class DojoAMDModuleFactoryPlugin {
 				"add absMids from request" : this.addAbsMidsFromRequest,	// plugin specific event
 				"before-resolve"           : this.beforeResolve,
 				"resolver"                 : this.resolver,
-				"create-module"            : this.createModule,
-				"module"                   : this.module
+				"create-module"            : this.createModule
 			}, context);
 			compiler.plugin("compilation", (compilation, params) => {
-				Object.defineProperties(context, {
+				var context2 = Object.create(context, {
 					compilation: {value: compilation},
 					params: {value: params}
 				});
+				plugin(factory, {"module": this.module}, context2);
 			});
 		});
 	}