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

fix: bug with balanced parens

This commit is contained in:
alexander.akait 2023-04-26 03:52:17 +03:00
parent e3f83e2edc
commit 9d930f7a67
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/css/CssParser.js
View File

@ -399,12 +399,12 @@ class CssParser extends Parser {
}
default: {
// TODO move escaped parsing to tokenizer
const lastFunction = balanced[balanced.length - 1];
const last = balanced[balanced.length - 1];
if (
lastFunction &&
(lastFunction[0].replace(/\\/g, "").toLowerCase() === "url" ||
IMAGE_SET_FUNCTION.test(lastFunction[0].replace(/\\/g, "")))
last &&
(last[0].replace(/\\/g, "").toLowerCase() === "url" ||
IMAGE_SET_FUNCTION.test(last[0].replace(/\\/g, "")))
) {
let value = normalizeUrl(input.slice(start + 1, end - 1), true);
@ -417,8 +417,7 @@ class CssParser extends Parser {
break;
}
const isUrl =
lastFunction[0].replace(/\\/g, "").toLowerCase() === "url";
const isUrl = last[0].replace(/\\/g, "").toLowerCase() === "url";
const dep = new CssUrlDependency(
value,
[start, end],
@ -677,7 +676,7 @@ class CssParser extends Parser {
return end;
},
rightParenthesis: (input, start, end) => {
const lastFunction = balanced[balanced.length - 1];
const last = balanced[balanced.length - 1];
balanced.pop();
@ -695,21 +694,18 @@ class CssParser extends Parser {
break;
}
case CSS_MODE_AT_IMPORT_EXPECT_URL: {
if (lastFunction && lastFunction[0] === "url") {
if (last && last[0] === "url") {
modeData.lastPos = end;
mode = CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA;
}
break;
}
case CSS_MODE_AT_IMPORT_EXPECT_LAYER_OR_SUPPORTS_OR_MEDIA: {
if (lastFunction && lastFunction[0].toLowerCase() === "layer") {
modeData.layer = input.slice(lastFunction[2], end - 1).trim();
if (last && last[0].toLowerCase() === "layer") {
modeData.layer = input.slice(last[2], end - 1).trim();
modeData.lastPos = end;
} else if (
lastFunction &&
lastFunction[0].toLowerCase() === "supports"
) {
modeData.supports = input.slice(lastFunction[2], end - 1).trim();
} else if (last && last[0].toLowerCase() === "supports") {
modeData.supports = input.slice(last[2], end - 1).trim();
modeData.lastPos = end;
}
break;

8
test/__snapshots__/ConfigTestCases.basictest.js.snap
View File

File diff suppressed because one or more lines are too long

1
test/configCases/css/css-import/style.css
View File

@ -173,6 +173,7 @@ url(style6.css?foo=5)
@import url("./style8.css") (prefers-color-scheme: dark);
@import url("./style8.css") supports(display: flex);
@import url("./style8.css") supports(((display: flex)));
@import url("./style8.css") supports(((display: inline-grid))) screen and (((min-width: 400px)));
@import url("./style8.css") supports(display: flex);
@import url('./style8.css') supports(display: grid);
@import url("./style8.css") supports(display: flex) screen and (min-width: 400px);