Skip to content

fix: Qualifier matcher did not support multiple qualifiers for a single file #9720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 1 commit into from
Jan 4, 2022
Merged

fix: Qualifier matcher did not support multiple qualifiers for a single file #9720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/core/module-name-resolver/qualifier-matcher/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,21 @@ const supportedQualifiers: Array<QualifierSpec> = [minWidthHeightQualifier, minW

function checkQualifiers(path: string, context: PlatformContext): number {
let result = 0;
let value: number;
for (let i = 0; i < supportedQualifiers.length; i++) {
const qualifier = supportedQualifiers[i];
if (qualifier.isMatch(path)) {
const occurences = qualifier.getMatchOccurences(path);
// Always get the last qualifier among identical occurences
result = qualifier.getMatchValue(occurences[occurences.length - 1], context);
if (result < 0) {
value = qualifier.getMatchValue(occurences[occurences.length - 1], context);
if (value < 0) {
// Non of the supported qualifiers matched this or the match was not satisfied
return -1;
}

result += (supportedQualifiers.length - i) * PRIORITY_STEP;

return result;
if (value > 0) {
result += value + (supportedQualifiers.length - i) * PRIORITY_STEP;
}
}
}

Expand Down