Skip to content

Commit 446cd52

Browse files
committed
chore(deps): update @vuetify/unplugin-styles to beta.10
1 parent 105d797 commit 446cd52

5 files changed

Lines changed: 60 additions & 8 deletions

File tree

packages/vuetify-nuxt-module/src/types.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,18 @@ export interface MOptions {
255255
* Path to the custom Vuetify SASS configuration file.
256256
*/
257257
configFile: string
258+
/**
259+
* Caching options forwarded to `@vuetify/unplugin-styles`.
260+
*
261+
* @default true
262+
*/
263+
cache?: boolean | {
264+
path?: string
265+
sassOptions?: Record<string, unknown>
266+
}
267+
/**
268+
* @deprecated Use `styles.cache` instead.
269+
*/
258270
experimental?: {
259271
cache?: boolean
260272
}

packages/vuetify-nuxt-module/src/utils/configure-vite.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ import { vuetifySSRClientHintsPlugin } from '../vite/vuetify-ssr-client-hints-pl
1414
import { createTransformAssetUrls } from './index'
1515
import { checkVuetifyPlugins } from './module'
1616

17+
function resolveStylesCache (stylesOption: { cache?: unknown, experimental?: { cache?: unknown } }) {
18+
return stylesOption.cache ?? stylesOption.experimental?.cache
19+
}
20+
1721
export function configureVite (configKey: string, nuxt: Nuxt, ctx: VuetifyNuxtContext) {
1822
nuxt.hook('vite:extend', ({ config }) => checkVuetifyPlugins(config))
1923
nuxt.hook('vite:extendConfig', viteInlineConfig => {
@@ -89,7 +93,11 @@ export function configureVite (configKey: string, nuxt: Nuxt, ctx: VuetifyNuxtCo
8993
if (!ctx.stylesConfigFile) {
9094
throw new Error('vuetify-nuxt-module: styles.configFile could not be resolved')
9195
}
92-
viteInlineConfig.plugins.push(Styles({ settings: ctx.stylesConfigFile }))
96+
const cache = resolveStylesCache(stylesOption)
97+
viteInlineConfig.plugins.push(Styles({
98+
settings: ctx.stylesConfigFile,
99+
...(cache === undefined ? {} : { cache: cache as never }),
100+
}))
93101
}
94102
viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx), vuetifyIconsPlugin(ctx), vuetifyDateConfigurationPlugin(ctx))
95103
if (ctx.ssrClientHints.enabled) {

packages/vuetify-nuxt-module/test/unplugin-styles.test.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,38 @@ describe('configureVite — @vuetify/unplugin-styles wiring', () => {
118118
expect((plugin as any).__options).toEqual({ settings: '/abs/path/settings.scss' })
119119
})
120120

121+
it('forwards styles.cache when configFile is provided', () => {
122+
const { nuxt, runExtendConfig } = createStubNuxt()
123+
configureVite(
124+
'vuetify',
125+
nuxt,
126+
createCtx({
127+
moduleOptions: { styles: { configFile: 'whatever.scss', cache: false } as any },
128+
stylesConfigFile: '/abs/path/settings.scss',
129+
}),
130+
)
131+
const cfg = runExtendConfig()
132+
const plugin = findStylesPlugin(cfg.plugins)
133+
expect(plugin).toBeDefined()
134+
expect((plugin as any).__options).toEqual({ settings: '/abs/path/settings.scss', cache: false })
135+
})
136+
137+
it('supports legacy styles.experimental.cache as fallback', () => {
138+
const { nuxt, runExtendConfig } = createStubNuxt()
139+
configureVite(
140+
'vuetify',
141+
nuxt,
142+
createCtx({
143+
moduleOptions: { styles: { configFile: 'whatever.scss', experimental: { cache: false } } },
144+
stylesConfigFile: '/abs/path/settings.scss',
145+
}),
146+
)
147+
const cfg = runExtendConfig()
148+
const plugin = findStylesPlugin(cfg.plugins)
149+
expect(plugin).toBeDefined()
150+
expect((plugin as any).__options).toEqual({ settings: '/abs/path/settings.scss', cache: false })
151+
})
152+
121153
it('throws when configFile is provided but stylesConfigFile is not resolved, without registering the plugin before throwing', () => {
122154
const stub = createStubNuxt()
123155
configureVite(

pnpm-lock.yaml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ catalog:
3838
'@unocss/nuxt': ^66.6.5
3939
'@vite-pwa/assets-generator': ^1.0.2
4040
'@vite-pwa/vitepress': ^1.1.0
41-
'@vuetify/unplugin-styles': ^1.0.0-beta.9
41+
'@vuetify/unplugin-styles': ^1.0.0-beta.10
4242
bumpp: ^10.4.1
4343
conventional-github-releaser: ^3.1.5
4444
date-fns: ^4.1.0

0 commit comments

Comments
 (0)