Skip to content

fix(styles): resolve new scss component styles #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
userquin merged 1 commit into from
Apr 1, 2025
Merged

fix(styles): resolve new scss component styles #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/utils/configure-vite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,16 @@ export function configureVite(configKey: string, nuxt: Nuxt, ctx: VuetifyNuxtCon
viteInlineConfig.css.preprocessorOptions ??= {}
viteInlineConfig.css.preprocessorOptions.sass ??= {}
viteInlineConfig.css.preprocessorOptions.sass.api = 'modern-compiler'
viteInlineConfig.css.preprocessorOptions.scss ??= {}
viteInlineConfig.css.preprocessorOptions.scss.api = 'modern-compiler'
}
else {
viteInlineConfig.css ??= {}
viteInlineConfig.css.preprocessorOptions ??= {}
viteInlineConfig.css.preprocessorOptions.sass ??= {}
viteInlineConfig.css.preprocessorOptions.sass.api = 'modern'
viteInlineConfig.css.preprocessorOptions.scss ??= {}
viteInlineConfig.css.preprocessorOptions.scss.api = 'modern'
if (!('preprocessorMaxWorkers' in viteInlineConfig.css))
viteInlineConfig.css.preprocessorMaxWorkers = true
}
Expand Down
34 changes: 27 additions & 7 deletions src/vite/vuetify-styles-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import process from 'node:process'
import { pathToFileURL } from 'node:url'
import { existsSync } from 'node:fs'
import type { Plugin } from 'vite'
import { isObject, normalizePath, resolveVuetifyBase } from '@vuetify/loader-shared'
import { isAbsolute, relative as relativePath } from 'pathe'
Expand All @@ -21,6 +22,7 @@ export function vuetifyStylesPlugin(
let fileImport = false
const PREFIX = 'vuetify-styles/'
const SSR_PREFIX = `/@${PREFIX}`
const resolveCss = resolveCssFactory()

return <Plugin>{
name: 'vuetify:styles:nuxt',
Expand Down Expand Up @@ -49,7 +51,7 @@ export function vuetifyStylesPlugin(
},
async resolveId(source, importer, { custom, ssr }) {
if (source.startsWith(PREFIX) || source.startsWith(SSR_PREFIX)) {
if (source.endsWith('.sass'))
if (source.match(/\.s[ca]ss$/))
return source

const idx = source.indexOf('?')
Expand All @@ -63,16 +65,14 @@ export function vuetifyStylesPlugin(
&& isSubdir(vuetifyBase, path.isAbsolute(source) ? source : importer)
)
) {
if (options.styles === 'sass') {
const target = source.replace(/\.css$/, '.sass')
return this.resolve(target, importer, { skipSelf: true, custom })
}
if (options.styles === 'sass')
return this.resolve(resolveCss(source), importer, { skipSelf: true, custom })

const resolution = await this.resolve(source, importer, { skipSelf: true, custom })
if (!resolution)
return undefined

const target = resolution.id.replace(/\.css$/, '.sass')
const target = resolveCss(resolution.id)
if (isNone) {
noneFiles.add(target)
return target
Expand All @@ -92,8 +92,9 @@ export function vuetifyStylesPlugin(
: undefined

if (target) {
const suffix = target.match(/\.scss/) ? ';\n' : '\n'
return {
code: `@use "${configFile}"\n@use "${fileImport ? pathToFileURL(target).href : normalizePath(target)}"`,
code: `@use "${configFile}"${suffix}@use "${fileImport ? pathToFileURL(target).href : normalizePath(target)}"${suffix}`,
map: {
mappings: '',
},
Expand All @@ -105,6 +106,25 @@ export function vuetifyStylesPlugin(
}
}

function resolveCssFactory() {
const mappings = new Map<string, string>()
return (source: string) => {
let mapping = mappings.get(source)
if (!mapping) {
try {
mapping = source.replace(/\.css$/, '.sass')
if (!existsSync(mapping))
mapping = source.replace(/\.css$/, '.scss')
}
catch {
mapping = source.replace(/\.css$/, '.scss')
}
mappings.set(source, mapping)
}
return mapping
}
}

function isSubdir(root: string, test: string) {
const relative = relativePath(root, test)
return relative && !relative.startsWith('..') && !isAbsolute(relative)
Expand Down