fix: include Nuxt layers in icon scanner context. (#505)

oyedejioyewole · antfubot · web-flow · commit 1345dc94d09c · 2026-07-02T19:02:15.000+09:00
Co-authored-by: Anthony Fu (via agent) &lt;reg-github-bot@antfu.me&gt;
diff --git a/playgrounds/dummy/app/components/DummyComponent.vue b/playgrounds/dummy/app/components/DummyComponent.vue
@@ -0,0 +1,3 @@
+<template>
+  <Icon name="uil:0-plus" />
+</template>
diff --git a/playgrounds/dummy/nuxt.config.ts b/playgrounds/dummy/nuxt.config.ts
@@ -0,0 +1 @@
+export default defineNuxtConfig({})
diff --git a/playgrounds/nuxt/nuxt.config.ts b/playgrounds/nuxt/nuxt.config.ts
@@ -3,6 +3,7 @@ import Module from '../../src/module'
 export default defineNuxtConfig({
   extends: [
     './base',
+    '../dummy',
   ],
 
   modules: [
diff --git a/src/context.ts b/src/context.ts
@@ -173,7 +173,10 @@ export class NuxtIconModuleContext {
             ],
           }
       this.scanner = new IconUsageScanner(scanOptions)
-      await this.scanner.scanFiles(this.nuxt.options.rootDir, this.scannedIcons)
+      await this.scanner.scanFiles(
+        this.nuxt.options._layers.map(layer => layer.cwd),
+        this.scannedIcons,
+      )
     }
 
     const icons = new Set<string>([...userIcons, ...this.scannedIcons])
diff --git a/src/core/scan.ts b/src/core/scan.ts
@@ -46,21 +46,26 @@ export class IconUsageScanner {
   }
 
   async scanFiles(
-    cwd: string,
+    cwd: string | string[],
     set: Set<string> = new Set(),
   ) {
-    const files = await glob(
-      this.globInclude,
-      {
-        ignore: this.globExclude,
-        cwd,
-        absolute: true,
-        expandDirectories: false,
-      },
+    const dirs = Array.isArray(cwd) ? cwd : [cwd]
+    const files = new Set(
+      (await Promise.all(
+        dirs.map(dir => glob(
+          this.globInclude,
+          {
+            ignore: this.globExclude,
+            cwd: dir,
+            absolute: true,
+            expandDirectories: false,
+          },
+        )),
+      )).flat(),
     )
 
     await Promise.all(
-      files.map(async (file) => {
+      [...files].map(async (file) => {
         const code = await fs.readFile(file, 'utf-8').catch(() => '')
         this.extractFromCode(code, set)
       }),

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<template>`
	`2`	`+ <Icon name="uil:0-plus" />`
	`3`	`+</template>`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,10 @@ export class NuxtIconModuleContext {`
`173`	`173`	`],`
`174`	`174`	`}`
`175`	`175`	`this.scanner = new IconUsageScanner(scanOptions)`
`176`		`- await this.scanner.scanFiles(this.nuxt.options.rootDir, this.scannedIcons)`
	`176`	`+ await this.scanner.scanFiles(`
	`177`	`+ this.nuxt.options._layers.map(layer => layer.cwd),`
	`178`	`+ this.scannedIcons,`
	`179`	`+ )`
`177`	`180`	`}`
`178`	`181`
`179`	`182`	`const icons = new Set<string>([...userIcons, ...this.scannedIcons])`