fix: should resolve icons from all roots (#1838)

Co-authored-by: Anthony Fu <github@antfu.me>

packages/client/uno.config.ts

@@ -1,9 +1,6 @@
-import { fileURLToPath } from 'node:url'
-import { readFileSync } from 'node:fs'
 import {
   defineConfig,
   presetAttributify,
-  presetIcons,
   presetTypography,
   presetUno,
   transformerDirectives,
@@ -41,18 +38,8 @@ export default defineConfig({
   presets: [
     presetUno(),
     presetAttributify(),
-    presetIcons({
-      collectionsNodeResolvePath: fileURLToPath(import.meta.url),
-      collections: {
-        slidev: {
-          logo: async () => {
-            const content = readFileSync(fileURLToPath(new URL('assets/logo.svg', import.meta.url)), 'utf-8')
-            return content
-          },
-        },
-      },
-    }),
     presetTypography(),
+    /* Preset Icons is added in ../node/setups/unocss.ts */
   ],
   transformers: [
     transformerDirectives({ enforce: 'pre' }),

packages/slidev/node/options.ts

@@ -80,6 +80,7 @@ export async function createDataUtils(resolved: Omit<ResolvedSlidevOptions, 'uti
   return {
     ...await setupShiki(resolved.roots),
     indexHtml: setupIndexHtml(resolved),
+    iconsResolvePath: [resolved.clientRoot, ...resolved.roots].reverse(),
     isMonacoTypesIgnored: pkg => monacoTypesIgnorePackagesMatches.some(i => i(pkg)),
     getLayouts: () => {
       const now = Date.now()

packages/slidev/node/setups/unocss.ts

@@ -1,14 +1,14 @@
 import { resolve } from 'node:path'
-import { existsSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import type { Theme } from '@unocss/preset-uno'
 import type { UserConfig } from '@unocss/core'
-import { mergeConfigs } from 'unocss'
+import { mergeConfigs, presetIcons } from 'unocss'
 import type { ResolvedSlidevOptions, UnoSetup } from '@slidev/types'
 import { loadSetups } from '../setups/load'
 import { loadModule } from '../utils'
 
 export default async function setupUnocss(
-  { clientRoot, roots, data }: ResolvedSlidevOptions,
+  { clientRoot, roots, data, utils }: ResolvedSlidevOptions,
 ) {
   function loadFileConfigs(root: string): UserConfig<Theme>[] {
     return [
@@ -23,6 +23,18 @@ export default async function setupUnocss(
   }
 
   const configs = [
+    {
+      presets: [
+        presetIcons({
+          collectionsNodeResolvePath: utils.iconsResolvePath,
+          collections: {
+            slidev: {
+              logo: () => readFileSync(resolve(clientRoot, 'assets/logo.svg'), 'utf-8'),
+            },
+          },
+        }),
+      ],
+    },
     ...loadFileConfigs(clientRoot),
     ...await loadSetups<UnoSetup>(roots, 'unocss.ts', [], loadFileConfigs),
   ].filter(Boolean) as UserConfig<Theme>[]

packages/slidev/node/vite/icons.ts

@@ -1,14 +1,13 @@
-import { fileURLToPath } from 'node:url'
 import type { ResolvedSlidevOptions, SlidevPluginOptions } from '@slidev/types'
 import Icons from 'unplugin-icons/vite'
 
 export function createIconsPlugin(
-  _options: ResolvedSlidevOptions,
+  options: ResolvedSlidevOptions,
   pluginOptions: SlidevPluginOptions,
 ) {
   return Icons({
     defaultClass: 'slidev-icon',
-    collectionsNodeResolvePath: fileURLToPath(import.meta.url),
+    collectionsNodeResolvePath: options.utils.iconsResolvePath,
     ...pluginOptions.icons,
   })
 }

packages/types/src/options.ts

@@ -49,6 +49,7 @@ export interface ResolvedSlidevUtils {
   shiki: HighlighterGeneric<any, any>
   shikiOptions: MarkdownItShikiOptions
   indexHtml: string
+  iconsResolvePath: string[]
   isMonacoTypesIgnored: (pkg: string) => boolean
   getLayouts: () => Record<string, string>
 }