From dcb7ef74fe27cff0d982da4a13918a028c3013d8 Mon Sep 17 00:00:00 2001 From: HomyeeKing Date: Fri, 26 Mar 2021 15:52:09 +0800 Subject: [PATCH] fix: loadPreprocessor from both configFile path and cwd --- packages/vite/src/node/plugins/css.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 97a5402aadf79f..23edbebd34b1db 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -553,7 +553,7 @@ async function compileCSS( opts.filename = cleanUrl(id) const preprocessResult = await preProcessor( code, - config.root, + [config.root, config.configFile || ''], opts, atImportResolvers ) @@ -846,7 +846,7 @@ type PreprocessorAdditionalData = type StylePreprocessor = ( source: string, - root: string, + root: string[], options: { [key: string]: any additionalData?: PreprocessorAdditionalData @@ -865,12 +865,12 @@ export interface StylePreprocessorResults { const loadedPreprocessors: Partial> = {} -function loadPreprocessor(lang: PreprocessLang, root: string) { +function loadPreprocessor(lang: PreprocessLang, root: string[]) { if (lang in loadedPreprocessors) { return loadedPreprocessors[lang] } try { - const resolved = require.resolve(lang, { paths: [root] }) + const resolved = require.resolve(lang, { paths: root }) return (loadedPreprocessors[lang] = require(resolved)) } catch (e) { throw new Error(