fix: normalize slashes (#23)

* fix: normalize slashes

* fix: resolve dirs to relative path

Co-authored-by: hanlee <[email protected]>

Author: antfu

src/context.ts

@@ -1,9 +1,9 @@
-import { join, relative, resolve } from 'path'
+import { relative, resolve } from 'path'
 import Debug from 'debug'
 import chokidar from 'chokidar'
 import { ResolvedConfig, UpdatePayload, ViteDevServer } from 'vite'
 import { Options, ComponentInfo, ResolvedOptions } from './types'
-import { pascalCase, toArray, getNameFromFilePath, resolveAlias, resolveOptions, matchGlobs } from './utils'
+import { pascalCase, toArray, getNameFromFilePath, resolveAlias, resolveOptions, matchGlobs, slash } from './utils'
 import { searchComponents } from './fs/glob'
 
 const debug = {
@@ -25,19 +25,19 @@ export class Context {
     public readonly viteConfig: ResolvedConfig,
   ) {
     this.options = resolveOptions(options, viteConfig)
-    const { watchGlobs, dirs } = this.options
+    const { globs, dirs } = this.options
 
     if (viteConfig.command === 'serve') {
       // TODO: use vite's watcher instead
-      chokidar.watch(dirs, { ignoreInitial: true })
+      chokidar.watch(dirs, { ignoreInitial: true, cwd: this.root })
         .on('unlink', (path) => {
-          if (matchGlobs(path, watchGlobs)) {
+          if (matchGlobs(path, globs)) {
             this.removeComponents(path)
             this.onUpdate(path)
           }
         })
         .on('add', (path) => {
-          if (matchGlobs(path, watchGlobs)) {
+          if (matchGlobs(path, globs)) {
             this.addComponents(path)
             this.onUpdate(path)
           }
@@ -180,8 +180,8 @@ export class Context {
 
   relative(path: string) {
     if (path.startsWith('/') && !path.startsWith(this.root))
-      return path.slice(1).replace(/\\/g, '/')
-    return relative(this.root, path).replace(/\\/g, '/')
+      return slash(path.slice(1))
+    return slash(relative(this.root, path))
   }
 
   _searched = false

src/types.ts

@@ -76,7 +76,6 @@ Required<Options>,
   extensions: string[]
   dirs: string[]
   globs: string[]
-  watchGlobs: string[]
 }
 
 export interface ComponentInfo {

src/utils.ts

@@ -1,4 +1,4 @@
-import { join, parse, resolve } from 'path'
+import { join, parse } from 'path'
 import minimatch from 'minimatch'
 import { ResolvedConfig } from 'vite'
 import { ComponentInfo, ResolvedOptions, Options } from './types'
@@ -10,6 +10,10 @@ export interface ResolveComponent {
   namespace?: string
 }
 
+export function slash(str: string) {
+  return str.replace(/\\/g, '/')
+}
+
 export function pascalCase(str: string) {
   return capitalize(camelCase(str))
 }
@@ -58,7 +62,7 @@ export function isEmpty(value: any) {
 
 export function matchGlobs(filepath: string, globs: string[]) {
   for (const glob of globs) {
-    if (minimatch(filepath, glob))
+    if (minimatch(slash(filepath), glob))
       return true
   }
   return false
@@ -82,18 +86,12 @@ export function resolveOptions(options: Options, viteConfig: ResolvedConfig): Re
     ? resolved.extensions
     : `{${resolved.extensions.join(',')}}`
 
-  resolved.globs = toArray(resolved.dirs).map(i =>
-    resolved.deep
-      ? `${i}/**/*.${extsGlob}`
-      : `${i}/*.${extsGlob}`,
-  )
-
-  resolved.dirs = toArray(resolved.dirs).map(i => resolve(viteConfig.root, i))
+  resolved.dirs = toArray(resolved.dirs)
 
-  resolved.watchGlobs = toArray(resolved.dirs).map(i =>
+  resolved.globs = resolved.dirs.map(i =>
     resolved.deep
-      ? join(i, `/**/*.${extsGlob}`)
-      : join(i, `/*.${extsGlob}`),
+      ? slash(join(i, `**/*.${extsGlob}`))
+      : slash(join(i, `*.${extsGlob}`)),
   )
 
   if (!resolved.extensions.length)
@@ -110,7 +108,7 @@ export function getNameFromFilePath(filePath: string, options: ResolvedOptions):
   let strippedPath = ''
 
   // remove include directories from filepath
-  for (const dir of toArray(dirs)) {
+  for (const dir of dirs) {
     if (parsedFilePath.dir.startsWith(dir)) {
       strippedPath = parsedFilePath.dir.slice(dir.length)
       break