enhanced-resolve
Advanced tools
Comparing version 0.4.4 to 0.4.5
@@ -94,2 +94,4 @@ /* | ||
var resource = request.resource; | ||
if(request.loaders && options.disableLoaders) | ||
return callback(new Error("Loaders are disabled")); | ||
if(request.loaders === null && resource === null) { | ||
@@ -157,2 +159,12 @@ // We want to resolve an empty identifier | ||
function onResolvedBoth() { | ||
if(request.resource && request.resource.query && options.disableResourceQuery) | ||
return callback(new Error("Resource query is disabled")); | ||
if(request.resource && request.resource.query && !request.resource.path && options.disableResourcePureQuery) | ||
return callback(new Error("Resource pure query is disabled")); | ||
if(request.loaders && options.disableLoaderQuery) { | ||
for(var i = 0; i < request.loaders.length; i++) { | ||
if(request.loaders[i].query && options.disableLoaderQuery) | ||
return callback(new Error("Loader query is disabled")); | ||
} | ||
} | ||
var intermediateResult = stringify(request); | ||
@@ -229,3 +241,3 @@ var postprocessors = options.postprocess[type].slice(0); | ||
if(!result) result = []; | ||
if(request.resource.path.slice(-1) == "*" && request.resource.query === null) { | ||
if(request.resource.path.slice(-1) == "*" && request.resource.query === null && !options.disableLoaders) { | ||
completePart(context, request.resource, options, "loader", sync, function(err, resultLoader) { | ||
@@ -796,2 +808,3 @@ request.resource = null; | ||
var postfixes = type === "loader" || type === "loader-context" ? options.loaderPostfixes : options.postfixes; | ||
if(postfixes.length == 0) return callback(new Error("Loading these modules is disabled")); | ||
var paths = modulesDirectoriesPaths(context, options); | ||
@@ -798,0 +811,0 @@ (sync?iterateSync:iterateAsync)(options.paths, function(path, idx, next) { |
{ | ||
"name": "enhanced-resolve", | ||
"version": "0.4.4", | ||
"version": "0.4.5", | ||
"author": "Tobias Koppers @sokra", | ||
@@ -5,0 +5,0 @@ "description": "Offers a async require.resolve function. It's highly configurable.", |
@@ -152,2 +152,14 @@ # enhanced-resolve | ||
} | ||
disableLoaders: false, | ||
// disallow loaders | ||
disableResourceQuery: false, | ||
// disallow query at resource | ||
disableResourcePureQuery: false, | ||
// disallow only query without resource | ||
disableLoaderQuery: false, | ||
// disallow queries at loaders | ||
} | ||
@@ -154,0 +166,0 @@ ``` |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
67494
2042
181