root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed #627

This commit is contained in:
Tobias Koppers 2015-05-10 13:11:45 +02:00
parent 0e21e6ec0b
commit 9d5113827f
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dependencies/CommonJsRequireDependencyParserPlugin.js
View File

@ -37,15 +37,22 @@ CommonJsRequireDependencyParserPlugin.prototype.apply = function(parser) {
var localModule; var localModule;
var param = this.evaluateExpression(expr.arguments[0]); var param = this.evaluateExpression(expr.arguments[0]);
if(param.isConditional()) { if(param.isConditional()) {
var isExpression = false;
var prevLength = this.state.current.dependencies.length;
this.state.current.addDependency(new RequireHeaderDependency(expr.callee.range)); this.state.current.addDependency(new RequireHeaderDependency(expr.callee.range));
param.options.forEach(function(param) { param.options.forEach(function(param) {
var result = this.applyPluginsBailResult("call require:commonjs:item", expr, param); var result = this.applyPluginsBailResult("call require:commonjs:item", expr, param);
if(result === undefined) { if(result === undefined) {
throw new Error("Cannot convert options with mixed known and unknown stuff"); isExpression = true;
} }
}, this); }, this);
if(isExpression) {
this.state.current.dependencies.length = prevLength;
} else {
return true; return true;
} else if(param.isString() && (localModule = LocalModulesHelpers.getLocalModule(this.state, param.string))) { }
}
if(param.isString() && (localModule = LocalModulesHelpers.getLocalModule(this.state, param.string))) {
var dep = new LocalModuleDependency(localModule, expr.range); var dep = new LocalModuleDependency(localModule, expr.range);
dep.loc = expr.loc; dep.loc = expr.loc;
this.state.current.addDependency(dep); this.state.current.addDependency(dep);

4
test/cases/parsing/issue-627/dir/test.js Normal file
View File

@ -0,0 +1,4 @@
(function() {
var expr1 = "a", expr2 = "b";
require(Math.random() < 0.5 ? expr1 : expr2);
}).should.throw();

3
test/cases/parsing/issue-627/index.js Normal file
View File

@ -0,0 +1,3 @@
it("should compile expr in ?: operator", function() {
require("./dir/test");
});

3
test/cases/parsing/issue-627/warnings.js Normal file
View File

@ -0,0 +1,3 @@
module.exports = [
[/Critical dependencies/]
];