Skip to content

Commit a638b3c

Browse files
Fix resolver
1 parent 554d4fb commit a638b3c

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/node_modules
2-
test/output/*
2+
test/output/*
3+
.idea/

index.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,18 @@ module.exports = function(input, inputMap) {
2222
var resolve = this.resolve;
2323
var addDependency = this.addDependency;
2424
var emitWarning = this.emitWarning || function() {};
25-
var match = input.match(regex1) || input.match(regex2);
25+
26+
var match1 = regex1.exec(input); // TODO: Take into account multi-occurences too
27+
var match2 = regex2.exec(input); // TODO: Take into account multi-occurences too
28+
29+
var match = (match1 && match1[1]) || (match2 && match2[1]);
30+
31+
if (match1 != null && match2 != null) {
32+
match = (match1.index > match2.index) ? match1[1] : match2[1];
33+
}
34+
2635
if(match) {
27-
var url = match[1];
36+
var url = match;
2837
var dataUrlMatch = regexDataUrl.exec(url);
2938
var callback = this.async();
3039
if(dataUrlMatch) {

0 commit comments

Comments
 (0)