fix: namespace regression, close #25

Author: antfu

package.json

@@ -19,8 +19,8 @@
   ],
   "scripts": {
     "dev": "npm run build -- --watch",
-    "example:dev": "npm -C example run dev",
-    "example:build": "npm -C example run build",
+    "example:dev": "npm -C example/basic run dev",
+    "example:build": "npm -C example/basic run build",
     "build": "tsup src/index.ts --dts --format cjs,esm",
     "prepublishOnly": "npm run build",
     "release": "npx git-ensure -a && npx bumpp --commit --tag --push"

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import { relative, resolve } from 'path'
+import { relative } from 'path'
 import Debug from 'debug'
 import chokidar from 'chokidar'
 import { ResolvedConfig, UpdatePayload, ViteDevServer } from 'vite'
@@ -24,7 +24,7 @@ export class Context {
     options: Options,
     public readonly viteConfig: ResolvedConfig,
   ) {
-    this.options = resolveOptions(options)
+    this.options = resolveOptions(options, viteConfig)
     const { globs, dirs } = this.options
 
     if (viteConfig.command === 'serve') {

src/context.ts

@@ -82,6 +82,7 @@ Required<Options>,
   libraries: UILibraryOptions[]
   extensions: string[]
   dirs: string[]
+  resolvedDirs: string[]
   globs: string[]
 }
 

src/types.ts

@@ -1,4 +1,4 @@
-import { join, parse } from 'path'
+import { join, parse, resolve } from 'path'
 import minimatch from 'minimatch'
 import { ResolvedConfig } from 'vite'
 import { ComponentInfo, ResolvedOptions, Options } from './types'
@@ -75,7 +75,7 @@ export function stringifyComponentImport({ name, path, importName }: ComponentIn
     return `import ${name} from '${path}'`
 }
 
-export function resolveOptions(options: Options): ResolvedOptions {
+export function resolveOptions(options: Options, viteConfig: ResolvedConfig): ResolvedOptions {
   const resolved = Object.assign({}, defaultOptions, options) as ResolvedOptions
   resolved.libraries = toArray(resolved.libraries).map(i => typeof i === 'string' ? { name: i } : i)
   resolved.customComponentResolvers = toArray(resolved.customComponentResolvers)
@@ -87,6 +87,7 @@ export function resolveOptions(options: Options): ResolvedOptions {
     : `{${resolved.extensions.join(',')}}`
 
   resolved.dirs = toArray(resolved.dirs)
+  resolved.resolvedDirs = resolved.dirs.map(i => resolve(viteConfig.root, i))
 
   resolved.globs = resolved.dirs.map(i =>
     resolved.deep
@@ -101,14 +102,14 @@ export function resolveOptions(options: Options): ResolvedOptions {
 }
 
 export function getNameFromFilePath(filePath: string, options: ResolvedOptions): string {
-  const { dirs, directoryAsNamespace, globalNamespaces } = options
+  const { resolvedDirs, directoryAsNamespace, globalNamespaces } = options
 
   const parsedFilePath = parse(filePath)
 
   let strippedPath = ''
 
   // remove include directories from filepath
-  for (const dir of dirs) {
+  for (const dir of resolvedDirs) {
     if (parsedFilePath.dir.startsWith(dir)) {
       strippedPath = parsedFilePath.dir.slice(dir.length)
       break