Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 19 additions & 28 deletions packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2433,31 +2433,23 @@ const makeScssWorker = (
return unquotedUrl.startsWith('#{')
}

const createInternalImporter = (
isForRelative: boolean,
): Sass.Importer<'async'> => ({
const internalImporter: Sass.Importer<'async'> = {
async canonicalize(url, context) {
if (isForRelative) {
// sass passes resolved paths for importer passed to `importer` option
const resolved = new URL(url, context.containingUrl ?? undefined)
if (fs.existsSync(resolved)) return resolved
} else {
const importer = context.containingUrl
? fileURLToPath(context.containingUrl)
: options.filename
const resolved = await resolvers.sass(
environment,
url,
cleanScssBugUrl(importer),
)
if (
resolved &&
(resolved.endsWith('.css') ||
resolved.endsWith('.scss') ||
resolved.endsWith('.sass'))
) {
return pathToFileURL(resolved)
}
const importer = context.containingUrl
? fileURLToPath(context.containingUrl)
: options.filename
const resolved = await resolvers.sass(
environment,
url,
cleanScssBugUrl(importer),
)
if (
resolved &&
(resolved.endsWith('.css') ||
resolved.endsWith('.scss') ||
resolved.endsWith('.sass'))
) {
return pathToFileURL(resolved)
}
return null
},
Expand All @@ -2480,13 +2472,12 @@ const makeScssWorker = (
result.contents ?? (await fsp.readFile(result.file, 'utf-8'))
return { contents, syntax, sourceMapUrl: canonicalUrl }
},
})

}
sassOptions.importers = [
...(sassOptions.importers ?? []),
createInternalImporter(false),
internalImporter,
]
sassOptions.importer ??= createInternalImporter(true)
sassOptions.importer ??= internalImporter

const result = await compiler.compileStringAsync(data, sassOptions)
return {
Expand Down
2 changes: 1 addition & 1 deletion playground/css/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default defineConfig({
resolve: {
alias: [
{ find: '=', replacement: __dirname },
{ find: /=replace\/(.*)/, replacement: `${__dirname}/$1` },
{ find: /^=replace\/(.*)/, replacement: `${__dirname}/$1` },
{ find: 'spacefolder', replacement: __dirname + '/folder with space' },
{ find: '#alias', replacement: __dirname + '/aliased/foo.css' },
{
Expand Down