Skip to content

Commit 8669955

Browse files
GoodwineGoodwine
committed
fix tests
1 parent ae122bf commit 8669955

File tree

3 files changed

+103
-16
lines changed

3 files changed

+103
-16
lines changed

‎spec/core_functions/meta/load_css/error/load.hrx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,23 @@ Error: Module loop: input.scss is already being loaded.
3434
'
3535
_other.scss 2:1 load-css()
3636
input.scss 2:1 root stylesheet
37+
38+
<===>
39+
================================================================================
40+
<===> top_level_include_declaration/input.scss
41+
@use "sass:meta";
42+
@include meta.load-css("upstream");
43+
44+
<===> top_level_include_declaration/_upstream.scss
45+
@mixin a { b: c }
46+
@include a;
47+
48+
<===> top_level_include_declaration/error
49+
Error: Declarations may only be used within style rules.
50+
,
51+
1 | @mixin a { b: c }
52+
| ^^^^^
53+
'
54+
_upstream.scss 1:12 a()
55+
_upstream.scss 2:1 load-css()
56+
input.scss 2:1 root stylesheet

‎spec/core_functions/meta/load_css/extend.hrx

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,64 @@ a {
104104
.target, .extender {
105105
a: b;
106106
}
107+
108+
<===>
109+
================================================================================
110+
<===> nested/README.md
111+
These are regression tests for https://github.com/sass/dart-sass/issues/2588.
112+
113+
<===>
114+
================================================================================
115+
<===> nested/without_use/input.scss
116+
@use 'sass:meta';
117+
.a {
118+
@include meta.load-css('upstream');
119+
}
120+
121+
<===> nested/without_use/_upstream.scss
122+
@mixin b { c: d }
123+
@include b;
124+
125+
<===> nested/without_use/output.css
126+
.a {
127+
c: d;
128+
}
129+
130+
<===> nested/without_use/warning
131+
DEPRECATION WARNING [import]: Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.
132+
More info and automated migrator: https://sass-lang.com/d/import
133+
,
134+
2 | @import 'upstream';
135+
| ^^^^^^^^^^
136+
'
137+
input.scss 2:11 root stylesheet
138+
139+
<===>
140+
================================================================================
141+
<===> nested/with_use/input.scss
142+
@use 'sass:meta';
143+
.a {
144+
@include meta.load-css('midstream');
145+
}
146+
147+
<===> nested/with_use/_midstream.scss
148+
@use 'upstream';
149+
@mixin b { c: d }
150+
@include b;
151+
152+
<===> nested/with_use/_upstream.scss
153+
// Intentionally empty.
154+
155+
<===> nested/with_use/output.css
156+
.a {
157+
c: d;
158+
}
159+
160+
<===> nested/with_use/warning
161+
DEPRECATION WARNING [import]: Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.
162+
More info and automated migrator: https://sass-lang.com/d/import
163+
,
164+
2 | @import 'upstream';
165+
| ^^^^^^^^^^
166+
'
167+
input.scss 2:11 root stylesheet

‎spec/directives/import/nested.hrx

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ These are regression tests for https://github.com/sass/dart-sass/issues/2588.
277277

278278
<===> top_level_include_declaration/without_use/_upstream.scss
279279
@mixin b { c: d }
280-
@include a;
280+
@include b;
281281

282282
<===> top_level_include_declaration/without_use/output.css
283283
.a {
@@ -305,7 +305,7 @@ More info and automated migrator: https://sass-lang.com/d/import
305305
@mixin b { c: d }
306306
@include b;
307307

308-
<===> top_level_include_declaration/with_use/_other.scss
308+
<===> top_level_include_declaration/with_use/_upstream.scss
309309
// Intentionally empty.
310310

311311
<===> top_level_include_declaration/with_use/output.css
@@ -315,29 +315,31 @@ More info and automated migrator: https://sass-lang.com/d/import
315315

316316
<===> top_level_include_declaration/with_use/warning
317317
DEPRECATION WARNING [import]: Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.
318+
318319
More info and automated migrator: https://sass-lang.com/d/import
320+
319321
,
320-
2 | @import 'upstream';
321-
| ^^^^^^^^^^
322+
2 | @import 'midstream';
323+
| ^^^^^^^^^^^
322324
'
323325
input.scss 2:11 root stylesheet
324326

325327
<===>
326328
================================================================================
327329
<===> top_level_include_declaration/with_use_two_levels_deep/input.scss
328330
.a {
329-
@import 'upstream1';
331+
@import 'midstream1';
330332
}
331333

332-
<===> top_level_include_declaration/with_use_two_levels_deep/_upstream1.scss
333-
@import 'upstream2';
334+
<===> top_level_include_declaration/with_use_two_levels_deep/_midstream1.scss
335+
@import 'midstream2';
334336

335-
<===> top_level_include_declaration/with_use_two_levels_deep/_upstream2.scss
336-
@use 'other';
337+
<===> top_level_include_declaration/with_use_two_levels_deep/_midstream2.scss
338+
@use 'upstream';
337339
@mixin b { c: d }
338340
@include b;
339341

340-
<===> top_level_include_declaration/with_use_two_levels_deep/other.scss
342+
<===> top_level_include_declaration/with_use_two_levels_deep/_upstream.scss
341343
// Intentionally empty.
342344

343345
<===> top_level_include_declaration/with_use_two_levels_deep/output.css
@@ -347,18 +349,22 @@ More info and automated migrator: https://sass-lang.com/d/import
347349

348350
<===> top_level_include_declaration/with_use_two_levels_deep/warning
349351
DEPRECATION WARNING [import]: Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.
352+
350353
More info and automated migrator: https://sass-lang.com/d/import
354+
351355
,
352-
2 | @import 'upstream1';
353-
| ^^^^^^^^^^^
356+
2 | @import 'midstream1';
357+
| ^^^^^^^^^^^^
354358
'
355359
input.scss 2:11 root stylesheet
356360

357361
DEPRECATION WARNING [import]: Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.
362+
358363
More info and automated migrator: https://sass-lang.com/d/import
364+
359365
,
360-
1 | @import 'upstream2';
361-
| ^^^^^^^^^^^
366+
1 | @import 'midstream2';
367+
| ^^^^^^^^^^^^
362368
'
363-
_upstream1.scss 1:9 @import
364-
input.scss 2:11 root stylesheet
369+
_midstream1.scss 1:9 @import
370+
input.scss 2:11 root stylesheet

0 commit comments

Comments
 (0)