check for data-uri before resource resolving

This commit is contained in:
goganchic 2020-05-17 16:28:15 +03:00
parent f65ab7e21d
commit 1cdd38d3c0
1 changed files with 16 additions and 15 deletions

View File

@ -475,22 +475,23 @@ class NormalModuleFactory extends ModuleFactory {
return continueCallback();
}
normalResolver.resolve(
contextInfo,
context,
unresolvedResource,
resolveContext,
(err, resolvedResource, resolvedResourceResolveData) => {
if (err) {
if (!isDataURI(unresolvedResource)) return continueCallback(err);
resolvedResource = unresolvedResource;
if (isDataURI(unresolvedResource)) {
resource = unresolvedResource;
continueCallback();
} else {
normalResolver.resolve(
contextInfo,
context,
unresolvedResource,
resolveContext,
(err, resolvedResource, resolvedResourceResolveData) => {
if (err) return continueCallback(err);
resource = resolvedResource;
resourceResolveData = resolvedResourceResolveData;
continueCallback();
}
resource = resolvedResource;
resourceResolveData = resolvedResourceResolveData;
continueCallback();
}
);
);
}
}
);
}