fix: resolve css @import relative imports without leading dot

fix #1737
vitejs · Jan 27, 2021 · 78eb32c · 78eb32c
1 parent 3dcf7f8
commit 78eb32c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -162,6 +162,7 @@ export type ResolvedConfig = Readonly<
       asSrc?: boolean
       tryIndex?: boolean | string
       extensions?: string[]
+      relativeFirst?: boolean
     }) => ResolveFn
   }
 >
@@ -322,6 +323,7 @@ export async function resolveConfig(
                 isProduction,
                 isBuild: command === 'build',
                 asSrc: options?.asSrc || true,
+                relativeFirst: options?.relativeFirst || false,
                 tryIndex: options?.tryIndex || true,
                 extensions: options?.extensions
               })

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -346,7 +346,8 @@ function createCSSResolvers(config: ResolvedConfig): CSSResolvers {
         cssResolve ||
         (cssResolve = config.createResolver({
           extensions: ['.css'],
-          tryIndex: false
+          tryIndex: false,
+          relativeFirst: true
         }))
       )
     },
@@ -356,7 +357,8 @@ function createCSSResolvers(config: ResolvedConfig): CSSResolvers {
         sassResolve ||
         (sassResolve = config.createResolver({
           extensions: ['.scss', '.sass', '.css'],
-          tryIndex: '_index'
+          tryIndex: '_index',
+          relativeFirst: true
         }))
       )
     },
@@ -365,7 +367,9 @@ function createCSSResolvers(config: ResolvedConfig): CSSResolvers {
       return (
         lessResolve ||
         (lessResolve = config.createResolver({
-          extensions: ['.less', '.css']
+          extensions: ['.less', '.css'],
+          tryIndex: false,
+          relativeFirst: true
         }))
       )
     }

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -63,6 +63,7 @@ interface ResolveOptions {
    */
   asSrc: boolean
   tryIndex?: boolean | string
+  relativeFirst?: boolean
   extensions?: string[]
   dedupe?: string[]
 }
@@ -74,6 +75,7 @@ export function resolvePlugin({
   asSrc,
   dedupe,
   tryIndex = true,
+  relativeFirst = false,
   extensions = SUPPORTED_EXTS
 }: ResolveOptions): Plugin {
   let server: ViteDevServer | undefined
@@ -122,7 +124,7 @@ export function resolvePlugin({
       }
 
       // relative
-      if (id.startsWith('.')) {
+      if (id.startsWith('.') || (relativeFirst && /^\w/.test(id))) {
         const basedir = importer ? path.dirname(importer) : process.cwd()
         let fsPath = path.resolve(basedir, id)
         // handle browser field mapping for relative imports