Skip to content

Commit 57902d0

Browse files
authored
chore: migrate scss import to use (#1007)
1 parent 58bc781 commit 57902d0

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

packages/e2e-tests/css-dev-sourcemap/src/App.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="foo">magenta</div>
33

44
<style lang="scss">
5-
@import './foo';
5+
@use './foo';
66
#test {
77
& {
88
color: red;

packages/e2e-tests/svelte-preprocess/__tests__/svelte-preprocess.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if (!isBuild) {
8181
expect(await getColor('h2')).toBe('magenta');
8282
await editFileAndWaitForHmrComplete(
8383
'src/lib/multifile/MultiFile.scss',
84-
(c) => c.replace("@import 'someImport';", "/*@import 'someImport';*/"),
84+
(c) => c.replace("@use 'someImport';", "/*@use 'someImport';*/"),
8585
'/src/lib/multifile/MultiFile.svelte?svelte&type=style&lang.css'
8686
);
8787
expect(await getColor('h2')).toBe('black');
@@ -93,7 +93,7 @@ if (!isBuild) {
9393
expect(await getColor('h2')).toBe('black');
9494
await editFileAndWaitForHmrComplete(
9595
'src/lib/multifile/MultiFile.scss',
96-
(c) => c.replace("/*@import 'someImport';*/", "/*@import 'someImport';*/\n@import 'foo';"),
96+
(c) => c.replace("/*@use 'someImport';*/", "/*@use 'someImport';*/\n@use 'foo';"),
9797
'/src/lib/multifile/MultiFile.svelte?svelte&type=style&lang.css'
9898
);
9999
expect(await getColor('h2')).toBe('maroon');
@@ -135,7 +135,7 @@ if (!isBuild) {
135135
expect(errorOverlay2).toBeFalsy();
136136
await editFileAndWaitForHmrComplete(
137137
'src/lib/multifile/MultiFile.scss',
138-
(c) => c.replace("@import 'foo';", ''),
138+
(c) => c.replace("@use 'foo';", ''),
139139
'/src/lib/multifile/MultiFile.svelte?svelte&type=style&lang.css'
140140
);
141141
expect(await getColor('h2')).toBe('black');
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'someImport';
1+
@use 'someImport';
22
h1 {
33
color: blue;
44
}

packages/vite-plugin-svelte/__tests__/preprocess.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('vitePreprocess', () => {
5151
);
5252
expect(style).toBeDefined();
5353
const scss = `
54-
@import './foo';
54+
@use './foo';
5555
.foo {
5656
&.bar {
5757
color: red;
@@ -69,7 +69,6 @@ describe('vitePreprocess', () => {
6969
expect(processed).toBeDefined();
7070
const { code, map, dependencies } = processed;
7171
expect(code).toBe('.foo {\n color: green;\n}\n\n.foo.bar {\n color: red;\n}');
72-
expect(map.file).toBe('File.svelte');
7372
expect(map.sources.length).toBe(2);
7473
expect(map.sources[0]).toBe('foo.scss');
7574
expect(map.sources[1]).toBe('File.svelte');

0 commit comments

Comments
 (0)