Skip to content

Commit 3b8a819

Browse files
committed
fix(issue#4354): unknown at-rule expression commas
* Fix issue #4354 unknown at-rule expressions should not have commas in a keyword list. * Add some additional layer at-rule tests. * Fix broken CDN link so tests pass.
1 parent 4322869 commit 3b8a819

File tree

6 files changed

+100
-4
lines changed

6 files changed

+100
-4
lines changed

packages/less/src/less/tree/atrule.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ AtRule.prototype = Object.assign(new Node(), {
135135

136136
if (value) {
137137
value = value.eval(context);
138-
if (value.value && this.keywordList(value.value)) {
139-
value = new Anonymous(value.value.map(keyword => keyword.value).join(', '), this.getIndex(), this.fileInfo());
140-
}
141138
}
142139

143140
if (rules) {

packages/test-data/tests-unit/import/import-remote.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// https://github.com/less/less.js/issues/3541
22
@import (reference) url(https://cdn.jsdelivr.net/npm/@less/test-data/less/_main/selectors.less);
33
@import (reference) url("https://cdn.jsdelivr.net/npm/@less/test-data/less/_main/media.less");
4-
@import (reference) url("https://cdn.jsdelivr.net/npm/@less/test-data/less/_main/empty.less?arg");
4+
@import (reference) url("https://cdn.jsdelivr.net/gh/less/[email protected]/packages/test-data/less/_main/empty.less?arg");
55

66
.test {
77
color: @var;

packages/test-data/tests-unit/layer/layer.css

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,43 @@
9191
color: #555;
9292
}
9393
}
94+
@layer theme;
95+
@layer layout, utilities;
96+
body {
97+
color: black;
98+
}
99+
@layer components {
100+
.btn {
101+
color: red;
102+
}
103+
.btn:hover {
104+
color: blue;
105+
}
106+
}
107+
@layer {
108+
p {
109+
margin-block: 1rem;
110+
}
111+
}
112+
@layer framework.buttons.primary {
113+
.btn-primary {
114+
background: dodgerblue;
115+
color: white;
116+
}
117+
}
118+
.feature {
119+
color: gray;
120+
}
121+
@layer component {
122+
.feature h2 {
123+
font-size: 1.5rem;
124+
}
125+
}
126+
@layer ui {
127+
.btn {
128+
padding: 0.5rem 1rem;
129+
border-radius: 4px;
130+
background: rebeccapurple;
131+
color: white;
132+
}
133+
}

packages/test-data/tests-unit/layer/layer.less

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,56 @@
112112
}
113113

114114

115+
@layer theme;
116+
@layer layout, utilities;
117+
118+
body {
119+
color: black;
120+
}
121+
122+
@layer components {
123+
.btn {
124+
color: red;
125+
&:hover {
126+
color: blue;
127+
}
128+
}
129+
}
130+
131+
@layer {
132+
p {
133+
margin-block: 1rem;
134+
}
135+
}
136+
137+
@layer framework.buttons.primary {
138+
.btn-primary {
139+
background: dodgerblue;
140+
color: white;
141+
}
142+
}
143+
144+
.feature {
145+
color: gray;
146+
147+
@layer component {
148+
h2 {
149+
font-size: 1.5rem;
150+
}
151+
}
152+
}
153+
154+
@primary-color: rebeccapurple;
155+
156+
.button-styles() {
157+
padding: 0.5rem 1rem;
158+
border-radius: 4px;
159+
}
160+
161+
@layer ui {
162+
.btn {
163+
.button-styles();
164+
background: @primary-color;
165+
color: white;
166+
}
167+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.box {
2+
@apply h-64 w-64;
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.box {
2+
@apply h-64 w-64;
3+
}

0 commit comments

Comments
 (0)