Merge pull request #61 from chuckdumont/work2

Chuck Dumont · web-flow · commit 413717676e68 · 2017-10-09T19:34:11.000-04:00
Fix webpack Critical dependency warning
diff --git a/lib/DojoAMDRequireDependenciesBlockParserPlugin.js b/lib/DojoAMDRequireDependenciesBlockParserPlugin.js
@@ -35,7 +35,7 @@ module.exports = class DojoAMDRequireDependenciesBlockParserPlugin {
 		});
 
 		parser.plugin("call require", (expr) => {
-			if (!parser.state.module.isAMD || expr.callee.name !== "require") {
+			if (!parser.state.module.isAMD || expr.callee.name === "cjsRequire") {
 				return;
 			}
 			switch(expr.arguments.length) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ module.exports = class DojoAMDRequireDependenciesBlockParserPlugin {`
`35`	`35`	`});`
`36`	`36`
`37`	`37`	`parser.plugin("call require", (expr) => {`
`38`		`- if (!parser.state.module.isAMD \|\| expr.callee.name !== "require") {`
	`38`	`+ if (!parser.state.module.isAMD \|\| expr.callee.name === "cjsRequire") {`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`	`41`	`switch(expr.arguments.length) {`