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

This commit is contained in:
alexander.akait 2023-05-04 19:18:13 +03:00
parent 4e8f8144fd
commit 65bf52de87
5 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/css/CssParser.js
View File

@ -187,8 +187,6 @@ class CssParser extends Parser {
let modeData = undefined; let modeData = undefined;
/** @type {[number, number] | undefined} */ /** @type {[number, number] | undefined} */
let lastIdentifier = undefined; let lastIdentifier = undefined;
/** @type {boolean} */
let awaitRightParenthesis = false;
/** @type [string, number, number][] */ /** @type [string, number, number][] */
let balanced = []; let balanced = [];
const modeStack = []; const modeStack = [];
@ -779,14 +777,14 @@ class CssParser extends Parser {
switch (mode) { switch (mode) {
case CSS_MODE_TOP_LEVEL: { case CSS_MODE_TOP_LEVEL: {
if (awaitRightParenthesis) { if (modeStack.length > 0) {
awaitRightParenthesis = false; const newModeData = modeStack.pop();
}
const newModeData = modeStack.pop(); if (newModeData !== false) {
if (newModeData !== false) { modeData = newModeData;
modeData = newModeData; const dep = new ConstDependency("", [start, end]);
const dep = new ConstDependency("", [start, end]); module.addPresentationalDependency(dep);
module.addPresentationalDependency(dep); }
} }
break; break;
} }
@ -816,6 +814,7 @@ class CssParser extends Parser {
switch (mode) { switch (mode) {
case CSS_MODE_TOP_LEVEL: { case CSS_MODE_TOP_LEVEL: {
const name = input.slice(start, end).toLowerCase(); const name = input.slice(start, end).toLowerCase();
if (name === ":global") { if (name === ":global") {
modeData = "global"; modeData = "global";
const dep = new ConstDependency("", [start, end]); const dep = new ConstDependency("", [start, end]);
@ -841,25 +840,24 @@ class CssParser extends Parser {
balanced.push([name, start, end]); balanced.push([name, start, end]);
switch (mode) { if (this.allowModeSwitch) {
case CSS_MODE_TOP_LEVEL: { switch (mode) {
name = name.toLowerCase(); case CSS_MODE_TOP_LEVEL: {
name = name.toLowerCase();
if (this.allowModeSwitch && name === ":global") { if (name === ":global") {
modeStack.push(modeData); modeStack.push(modeData);
modeData = "global"; modeData = "global";
const dep = new ConstDependency("", [start, end]); const dep = new ConstDependency("", [start, end]);
module.addPresentationalDependency(dep); module.addPresentationalDependency(dep);
} else if (this.allowModeSwitch && name === ":local") { } else if (name === ":local") {
modeStack.push(modeData); modeStack.push(modeData);
modeData = "local"; modeData = "local";
const dep = new ConstDependency("", [start, end]); const dep = new ConstDependency("", [start, end]);
module.addPresentationalDependency(dep); module.addPresentationalDependency(dep);
} else { }
awaitRightParenthesis = true; break;
modeStack.push(false);
} }
break;
} }
} }
return end; return end;
@ -867,10 +865,9 @@ class CssParser extends Parser {
comma: (input, start, end) => { comma: (input, start, end) => {
switch (mode) { switch (mode) {
case CSS_MODE_TOP_LEVEL: case CSS_MODE_TOP_LEVEL:
if (!awaitRightParenthesis) { // Reset stack for `:global .class :local .class-other` selector after `,`
modeData = undefined; modeData = undefined;
modeStack.length = 0; modeStack.length = 0;
}
break; break;
case CSS_MODE_IN_LOCAL_RULE: case CSS_MODE_IN_LOCAL_RULE:
processDeclarationValueDone(input, start); processDeclarationValueDone(input, start);

6
test/configCases/css/css-modules-in-node/index.js
View File

@ -83,6 +83,12 @@ it("should allow to create css modules", done => {
paddingSm: prod paddingSm: prod
? "my-app-491-zE" ? "my-app-491-zE"
: "./style.module.css-padding-sm", : "./style.module.css-padding-sm",
classLocalScope: prod
? "my-app-491-gz"
: "./style.module.css-class-local-scope",
inLocalGlobalScope: prod
? "my-app-491-Zv"
: "./style.module.css-in-local-global-scope",
}); });
} catch (e) { } catch (e) {
return done(e); return done(e);

6
test/configCases/css/css-modules/index.js
View File

@ -98,6 +98,12 @@ it("should allow to create css modules", done => {
paddingSm: prod paddingSm: prod
? "my-app-491-zE" ? "my-app-491-zE"
: "./style.module.css-padding-sm", : "./style.module.css-padding-sm",
classLocalScope: prod
? "my-app-491-gz"
: "./style.module.css-class-local-scope",
inLocalGlobalScope: prod
? "my-app-491-Zv"
: "./style.module.css-in-local-global-scope",
}); });
} catch (e) { } catch (e) {
return done(e); return done(e);

19
test/configCases/css/css-modules/style.module.css
View File

@ -71,6 +71,15 @@
background-color: aquamarine; background-color: aquamarine;
} }
.local9 :matches(div.parent1.child1.vertical-tiny,
div.parent1.child1.vertical-small,
div.otherDiv.horizontal-tiny,
div.otherDiv.horizontal-small div.description) {
max-height: 0;
margin: 0;
overflow: hidden;
}
:global(:global(:local(.nested1)).nested2).nested3 { :global(:global(:local(.nested1)).nested2).nested3 {
color: pink; color: pink;
} }
@ -397,6 +406,16 @@
@unknown .class { @unknown .class {
color: red; color: red;
.class {
color: red;
}
}
:global .class :local .in-local-global-scope,
:global .class :local .in-local-global-scope,
:local .class-local-scope :global .in-local-global-scope {
color: red;
} }
:scope { :scope {

2
test/configCases/css/css-modules/use-style.js
View File

@ -37,4 +37,6 @@ export default {
myColor: style['my-color'], myColor: style['my-color'],
paddingSm: style['padding-sm'], paddingSm: style['padding-sm'],
paddingLg: style['padding-lg'], paddingLg: style['padding-lg'],
inLocalGlobalScope: style['in-local-global-scope'],
classLocalScope: style['class-local-scope'],
}; };