apply split methods to their usages

timse · timse · commit 524043032189 · 2017-01-21T13:51:35.000+11:00
diff --git a/lib/APIPlugin.js b/lib/APIPlugin.js
@@ -41,7 +41,7 @@ class APIPlugin {
 					parser.plugin(`evaluate typeof ${key}`, ParserHelpers.evaluateToString(REPLACEMENT_TYPES[key]));
 				});
 				IGNORES.forEach(key => {
-					parser.plugin(key, ParserHelpers.returnTrue);
+					parser.plugin(key, ParserHelpers.skipTraversal);
 				});
 			});
 		});
diff --git a/lib/DefinePlugin.js b/lib/DefinePlugin.js
@@ -54,7 +54,7 @@ class DefinePlugin {
 					const splittedKey = key.split(".");
 					splittedKey.slice(1).forEach((_, i) => {
 						const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
-						parser.plugin("can-rename " + fullKey, ParserHelpers.returnTrue);
+						parser.plugin("can-rename " + fullKey, ParserHelpers.approve);
 					});
 				}
 
@@ -65,7 +65,7 @@ class DefinePlugin {
 					let recurseTypeof = false;
 					code = toCode(code);
 					if(!isTypeof) {
-						parser.plugin("can-rename " + key, ParserHelpers.returnTrue);
+						parser.plugin("can-rename " + key, ParserHelpers.approve);
 						parser.plugin("evaluate Identifier " + key, (expr) => {
 							if(recurse) return;
 							let res = parser.evaluate(code);
@@ -92,7 +92,7 @@ class DefinePlugin {
 
 				function applyObjectDefine(key, obj) {
 					let code = stringifyObj(obj);
-					parser.plugin("can-rename " + key, ParserHelpers.returnTrue);
+					parser.plugin("can-rename " + key, ParserHelpers.approve);
 					parser.plugin("evaluate Identifier " + key, (expr) => new BasicEvaluatedExpression().setRange(expr.range));
 					parser.plugin("evaluate typeof " + key, ParserHelpers.evaluateToString("object"));
 					parser.plugin("expression " + key, ParserHelpers.toConstantDependency(code));
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -252,7 +252,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 					}.bind(this));
 				}
 			});
-			parser.plugin("expression module.hot", ParserHelpers.returnTrue);
+			parser.plugin("expression module.hot", ParserHelpers.skipTraversal);
 		});
 	});
 
diff --git a/lib/ProvidePlugin.js b/lib/ProvidePlugin.js
@@ -23,7 +23,7 @@ ProvidePlugin.prototype.apply = function(compiler) {
 				if(splittedName.length > 0) {
 					splittedName.slice(1).forEach(function(_, i) {
 						var name = splittedName.slice(0, i + 1).join(".");
-						parser.plugin("can-rename " + name, ParserHelpers.returnTrue);
+						parser.plugin("can-rename " + name, ParserHelpers.approve);
 					});
 				}
 				parser.plugin("expression " + name, function(expr) {
diff --git a/lib/dependencies/AMDPlugin.js b/lib/dependencies/AMDPlugin.js
@@ -85,7 +85,7 @@ AMDPlugin.prototype.apply = function(compiler) {
 			parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToBoolean(true));
 			parser.plugin("typeof define", ParserHelpers.toConstantDependency(JSON.stringify("function")));
 			parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
-			parser.plugin("can-rename define", ParserHelpers.returnTrue);
+			parser.plugin("can-rename define", ParserHelpers.approve);
 			parser.plugin("rename define", function(expr) {
 				var dep = new AMDRequireItemDependency("!!webpack amd define", expr.range);
 				dep.userRequest = "define";
diff --git a/lib/dependencies/CommonJsPlugin.js b/lib/dependencies/CommonJsPlugin.js
@@ -68,15 +68,15 @@ CommonJsPlugin.prototype.apply = function(compiler) {
 				this.scope.definitions.push("require");
 				return true;
 			});
-			parser.plugin("can-rename require", ParserHelpers.returnTrue);
+			parser.plugin("can-rename require", ParserHelpers.approve);
 			parser.plugin("rename require", function(expr) {
 				// define the require variable. It's still undefined, but not "not defined".
 				var dep = new ConstDependency("var require;", 0);
 				dep.loc = expr.loc;
 				this.state.current.addDependency(dep);
 				return false;
 			});
-			parser.plugin("typeof module", ParserHelpers.returnTrue);
+			parser.plugin("typeof module", ParserHelpers.skipTraversal);
 			parser.plugin("evaluate typeof exports", ParserHelpers.evaluateToString("object"));
 			parser.apply(
 				new CommonJsRequireDependencyParserPlugin(options),

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {`
`252`	`252`	`}.bind(this));`
`253`	`253`	`}`
`254`	`254`	`});`
`255`		`- parser.plugin("expression module.hot", ParserHelpers.returnTrue);`
	`255`	`+ parser.plugin("expression module.hot", ParserHelpers.skipTraversal);`
`256`	`256`	`});`
`257`	`257`	`});`
`258`	`258`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ ProvidePlugin.prototype.apply = function(compiler) {`
`23`	`23`	`if(splittedName.length > 0) {`
`24`	`24`	`splittedName.slice(1).forEach(function(_, i) {`
`25`	`25`	`var name = splittedName.slice(0, i + 1).join(".");`
`26`		`- parser.plugin("can-rename " + name, ParserHelpers.returnTrue);`
	`26`	`+ parser.plugin("can-rename " + name, ParserHelpers.approve);`
`27`	`27`	`});`
`28`	`28`	`}`
`29`	`29`	`parser.plugin("expression " + name, function(expr) {`