Skip to content

Commit 29039f3

Browse files
committed
feat: support meta.load-css()
1 parent 31bd4a6 commit 29039f3

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

dev/src/App.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<v-btn></v-btn>
1212
<!-- <v-list>-->
1313
<!-- <v-list-item title="List"></v-list-item>-->
14+
<!-- <v-list-group>-->
15+
<!-- <template #activator="{ props }">-->
16+
<!-- <v-list-item title="Group" v-bind="props"></v-list-item>-->
17+
<!-- </template>-->
18+
<!-- <v-list-item title="Sub item"></v-list-item>-->
19+
<!-- </v-list-group>-->
1420
<!-- </v-list>-->
1521
</v-card-text>
1622
</v-card>

dev/src/main.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
@use 'vuetify/styles' with (
22
$color-pack: false,
3-
$alert-padding: 24px,
43
$utilities: false,
4+
$alert-padding: 24px,
55
);
6+
7+
//@use 'sass:meta';
8+
//@include meta.load-css('vuetify/styles', (
9+
// color-pack: false,
10+
// utilities: false,
11+
// alert-padding: 24px,
12+
//));

dev/vite.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,8 @@ export default {
3939
// additionalData: `@forward '@/src/_variables'\n`,
4040
}
4141
}
42+
},
43+
optimizeDeps: {
44+
exclude: ['vuetify']
4245
}
4346
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@vue/compiler-sfc": "^3.2.24",
1919
"conventional-changelog-conventionalcommits": "^4.6.1",
2020
"lerna": "^3.22.1",
21-
"sass": "^1.49.9",
21+
"sass": "^1.52.3",
2222
"typescript": "^4.4.2",
2323
"vite": "^2.7.1",
2424
"vue": "^3.2.19",

packages/vite-plugin/src/stylesPlugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function isSubdir (root: string, test: string) {
1414
return relative && !relative.startsWith('..') && !path.isAbsolute(relative)
1515
}
1616

17-
const styleImportRegexp = /@use ['"]vuetify(\/lib)?\/styles(\/main(\.sass)?)?['"]/
17+
const styleImportRegexp = /(@use |meta\.load-css\()['"](vuetify(?:\/lib)?\/styles(?:\/main(?:\.sass)?)?)['"]/
1818

1919
export function stylesPlugin (options: Options): PluginOption {
2020
const vuetifyBase = path.dirname(require.resolve('vuetify/package.json'))
@@ -166,7 +166,7 @@ export function stylesPlugin (options: Options): PluginOption {
166166
await awaitResolve(id)
167167
debug(`returning ${id}`)
168168

169-
return code.replace(styleImportRegexp, '@use ".cache/vuetify/styles.scss"')
169+
return code.replace(styleImportRegexp, '$1".cache/vuetify/styles.scss"')
170170
}
171171
},
172172
load (id) {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7695,10 +7695,10 @@ sass-loader@^12.6.0:
76957695
klona "^2.0.4"
76967696
neo-async "^2.6.2"
76977697

7698-
sass@^1.49.9:
7699-
version "1.49.9"
7700-
resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
7701-
integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
7698+
sass@^1.52.3:
7699+
version "1.52.3"
7700+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb"
7701+
integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==
77027702
dependencies:
77037703
chokidar ">=3.0.0 <4.0.0"
77047704
immutable "^4.0.0"

0 commit comments

Comments
 (0)