refactor: split icons to packages

.changeset/many-schools-reflect.md

@@ -0,0 +1,20 @@
+---
+"frog": minor
+---
+
+**Breaking change** Frog UI `icon` property requires an icon map imported from the `'frog/ui/icons'` entrypoint. This also makes it easier for you to supply your own custom icons.
+
+```diff
++ import { lucide } from 'frog/ui/icons'
+
+export const system = createSystem({
+- icons: 'lucide',
++ icons: lucide,
+})
+```
+
+In addition, the following separate entrypoints were added for resource constrained environments.
+
+- `frog/ui/icons/heroicons`
+- `frog/ui/icons/lucide`
+- `frog/ui/icons/radix-icons`

.gitignore

@@ -9,6 +9,7 @@ create-frog/templates
 node_modules
 site/dist
 src/ui/.frog
-src/ui/icons.ts
+src/ui/icons/**
+!src/ui/icons/package.json
 tsconfig.*.tsbuildinfo
 tsconfig.tsbuildinfo

.scripts/gen-icons.ts

@@ -1,7 +1,8 @@
 import path from 'node:path'
 import { IconifyJSONIconsData } from '@iconify/types'
-import { getIconData, iconToHTML, iconToSVG } from '@iconify/utils'
+import { camelize, getIconData, iconToHTML, iconToSVG } from '@iconify/utils'
 import { glob } from 'fast-glob'
+import { ensureDir } from 'fs-extra'
 
 console.log('Copying icons to package.')
 
@@ -16,31 +17,54 @@ const collections = (await glob('**/@iconify/json/json/*.json'))
   })
   .filter((collection) => collectionSet.has(collection.name))
 
-const iconMap: Record<string, Record<string, string>> = {}
-for (const collection of collectionSet) {
-  iconMap[collection] = {}
-}
-
+const iconCollectionExports: string[] = []
 let count = 0
 for (const collection of collections) {
   const file = Bun.file(collection.path)
   const json = (await file.json()) as IconifyJSONIconsData
 
+  const iconMap: Record<string, string> = {}
   for (const key of Object.keys(json.icons)) {
     const item = getIconData(json, key)
     if (!item) throw new TypeError(`Invalid icon: ${key}`)
     const svg = iconToSVG(item)
     const text = iconToHTML(svg.body, svg.attributes)
-    iconMap[collection.name][key] = encodeURIComponent(text)
+    iconMap[key] = encodeURIComponent(text)
   }
 
+  const iconsContent = `export const ${camelize(
+    collection.name,
+  )} = ${JSON.stringify(iconMap, null, 2)}`
+  const iconsDist = path.resolve(
+    import.meta.dirname,
+    `../src/ui/icons/${collection.name}`,
+  )
+  await ensureDir(iconsDist)
+  await Bun.write(`${iconsDist}/index.ts`, `${iconsContent}\n`)
+
+  const proxyPackageContent = JSON.stringify(
+    {
+      type: 'module',
+      types: `../../_lib/ui/icons/${collection.name}/index.d.ts`,
+      module: `../../_lib/ui/icons/${collection.name}/index.js`,
+    },
+    null,
+    2,
+  )
+  await Bun.write(`${iconsDist}/package.json`, proxyPackageContent)
+
+  iconCollectionExports.push(
+    `export { ${camelize(collection.name)} } from './${
+      collection.name
+    }/index.js'`,
+  )
+
   console.log(collection.name)
   count += 1
 }
 
-const iconsExport = `export const icons = ${JSON.stringify(iconMap, null, 2)}`
-const dist = path.resolve(import.meta.dirname, '../src/ui')
-await Bun.write(`${dist}/icons.ts`, `${iconsExport}\n`)
+const dist = path.resolve(import.meta.dirname, '../src/ui/icons')
+await Bun.write(`${dist}/index.ts`, `${iconCollectionExports.join('\n')}\n`)
 
 console.log(
   `Done. Copied ${count} ${count === 1 ? 'collection' : 'collections'}.`,

playground/src/ui-system.tsx

@@ -1,5 +1,6 @@
 import { Button, Frog } from 'frog'
 import { serveStatic } from 'frog/serve-static'
+import { heroicons, lucide, radixIcons } from 'frog/ui/icons'
 
 import {
   Box,
@@ -186,19 +187,19 @@ export const app = new Frog({
                 <Icon color="green800" name="zap" size="64" />
                 <Icon
                   color="green800"
-                  collection="lucide"
+                  collection={lucide}
                   name="zap"
                   size="64"
                 />
                 <Icon
                   color="green800"
-                  collection="heroicons"
+                  collection={heroicons}
                   name="bolt"
                   size="64"
                 />
                 <Icon
                   color="green800"
-                  collection="radix-icons"
+                  collection={radixIcons}
                   name="lightning-bolt"
                   size="64"
                 />

site/pages/ui/Icon.mdx

@@ -116,19 +116,20 @@ function Example() {
 
 ### `collection`
 
-Icon collection to use for resolving icons. Defaults to `'lucide'`.
+Icon collection to use for resolving icons. Defaults to `lucide` imported from `'frog/ui/icons'`.
 
 The following collections are available:
-- [Heroicons](https://heroicons.com)
-- [Lucide](https://lucide.dev)
-- [Radix Icons](https://www.radix-ui.com/icons)
+- [Heroicons - `frog/ui/icons/heroicons`](https://heroicons.com)
+- [Lucide - `frog/ui/icons/lucide`](https://lucide.dev)
+- [Radix Icons - `frog/ui/icons/radix-icons`](https://www.radix-ui.com/icons)
 
 Collection is mapped to the [`icons` property](/ui/ui-system#icons) on the UI System Variables.
 
 :::code-group
 ```tsx twoslash [Code]
 /** @jsxImportSource frog/jsx */
 import { createSystem } from 'frog/ui'
+import { heroicons } from 'frog/ui/icons' // [!code focus]
 
 const { Icon } = createSystem()
 
@@ -137,7 +138,7 @@ function Example() {
 // ---cut---
 <Icon
   name="bolt"
-  collection="heroicons" // [!code focus]
+  collection={heroicons} // [!code focus]
 // ^?
 />
 

site/pages/ui/createSystem.mdx

@@ -159,8 +159,8 @@ export const system = createSystem({
 
 ### icons
 
-- **Type:** `'heroicons' | 'lucide' | 'radix-icons'`
-- **Default:** `'lucide'`
+- **Type:** `Record<string, string>`
+- **Default:** lucide
 
 Icon collection to use for resolving icons. The following collections are available:
 
@@ -170,9 +170,10 @@ Icon collection to use for resolving icons. The following collections are availa
 
 ```tsx twoslash
 import { createSystem } from 'frog/ui'
+import { lucide } from 'frog/ui/icons' // [!code focus]
 // ---cut---
 export const system = createSystem({
-  icons: 'lucide', // [!code focus]
+  icons: lucide, // [!code focus]
 })
 ```
 

site/pages/ui/ui-system.mdx

@@ -270,9 +270,10 @@ The `icons` variable is used to set the icon collection for the [`<Icon>` compon
 /** @jsxImportSource frog/jsx */
 // ---cut---
 import { createSystem } from 'frog/ui'
+import { lucide } from 'frog/ui/icons'
 
 const { Icon } = createSystem({
-  icons: 'lucide',
+  icons: lucide,
 })
 
 function Example() {

src/package.json

@@ -68,6 +68,22 @@
       "types": "./_lib/ui/index.d.ts",
       "default": "./_lib/ui/index.js"
     },
+    "./ui/icons": {
+      "types": "./_lib/ui/icons/index.d.ts",
+      "default": "./_lib/ui/icons/index.js"
+    },
+    "./ui/icons/heroicons": {
+      "types": "./_lib/ui/icons/heroicons/index.d.ts",
+      "default": "./_lib/ui/icons/heroicons/index.js"
+    },
+    "./ui/icons/lucide": {
+      "types": "./_lib/ui/icons/lucide/index.d.ts",
+      "default": "./_lib/ui/icons/lucide/index.js"
+    },
+    "./ui/icons/radix-icons": {
+      "types": "./_lib/ui/icons/radix-icons/index.d.ts",
+      "default": "./_lib/ui/icons/radix-icons/index.js"
+    },
     "./vercel": {
       "types": "./_lib/vercel/index.d.ts",
       "default": "./_lib/vercel/index.js"
@@ -105,10 +121,7 @@
   "license": "MIT",
   "homepage": "https://frog.fm",
   "repository": "wevm/frog",
-  "authors": [
-    "awkweb.eth",
-    "jxom.eth"
-  ],
+  "authors": ["awkweb.eth", "jxom.eth"],
   "funding": [
     {
       "type": "github",

src/ui/Icon.test-d.tsx

@@ -0,0 +1,31 @@
+import { expectTypeOf, test } from 'vitest'
+
+import { createSystem } from './createSystem.js'
+import { heroicons, lucide } from './icons/index.js'
+
+test('defaults', () => {
+  const { Icon } = createSystem()
+  type IconProps = Parameters<typeof Icon>[0]
+  expectTypeOf<IconProps['collection']>().toEqualTypeOf<
+    Record<string, string> | undefined
+  >()
+  expectTypeOf<IconProps['name']>().toEqualTypeOf<keyof typeof lucide>()
+})
+
+test('custom system collection', () => {
+  const { Icon } = createSystem({ icons: heroicons })
+  type IconProps = Parameters<typeof Icon>[0]
+  expectTypeOf<IconProps['collection']>().toEqualTypeOf<
+    Record<string, string> | undefined
+  >()
+  expectTypeOf<IconProps['name']>().toEqualTypeOf<keyof typeof heroicons>()
+})
+
+test('custom system collection', () => {
+  const { Icon, vars } = createSystem()
+  type IconProps = Parameters<typeof Icon<typeof vars, typeof heroicons>>[0]
+  expectTypeOf<IconProps['collection']>().toEqualTypeOf<
+    typeof heroicons | Record<string, string> | undefined
+  >()
+  expectTypeOf<IconProps['name']>().toEqualTypeOf<keyof typeof heroicons>()
+})

src/ui/Icon.tsx

@@ -1,10 +1,10 @@
 import { Box, type BoxProps, resolveColorToken } from './Box.js'
-import { icons } from './icons.js'
+import { lucide } from './icons/lucide/index.js'
 import { type DefaultVars, type Vars, defaultVars } from './vars.js'
 
 export type IconProps<
   vars extends Vars = DefaultVars,
-  collection extends Vars['icons'] = DefaultVars['icons'],
+  collection extends Vars['icons'] = vars['icons'],
 > = {
   __context?: { vars?: Vars | undefined } | undefined
   /**
@@ -22,13 +22,13 @@ export type IconProps<
   /**
    * Icon collection to use for resolving icons.
    *
-   * @default 'lucide'
+   * @default lucide (from 'frog/ui/icons')
    */
   collection?: collection | Vars['icons'] | undefined
   /** Icon name in the current icon collection. */
-  name: keyof (typeof icons)[collection extends keyof typeof icons
-    ? collection
-    : never]
+  name: Record<string, any> | undefined extends collection
+    ? keyof vars['icons']
+    : keyof collection
   /** Sets the size of the icon. */
   size?: BoxProps<vars>['width']
 }
@@ -39,14 +39,13 @@ export function Icon<
 >(props: IconProps<vars, collection>) {
   const {
     __context,
-    collection = __context?.vars?.icons ?? 'lucide',
+    collection = __context?.vars?.icons ?? lucide,
     mode = 'auto',
     name,
     size = '24',
   } = props
 
-  const iconMap = icons[collection]
-  let text: string = iconMap[name as keyof typeof iconMap]
+  let text: string = collection[name as keyof typeof collection]
   if (!text) throw new TypeError(`Invalid set: ${collection}`)
 
   const resolvedMode = (() => {

src/ui/createSystem.test-d.ts

@@ -0,0 +1,14 @@
+import { expectTypeOf, test } from 'vitest'
+
+import { createSystem } from './createSystem.js'
+import { heroicons, lucide } from './icons/index.js'
+
+test('defaults', () => {
+  const { vars } = createSystem()
+  expectTypeOf(vars.icons).toEqualTypeOf<typeof lucide>()
+})
+
+test('custom', () => {
+  const { vars } = createSystem({ icons: heroicons })
+  expectTypeOf(vars.icons).toEqualTypeOf<typeof heroicons>()
+})

src/ui/createSystem.tsx

@@ -1,4 +1,4 @@
-import type { Assign } from '../types/utils.js'
+import type { Assign, Pretty } from '../types/utils.js'
 import { Box } from './Box.js'
 import { Column, Columns } from './Columns.js'
 import { Divider } from './Divider.js'
@@ -32,15 +32,22 @@
  * })
  * ```
  */
-export function createSystem<vars extends Vars = DefaultVars>(
+export function createSystem<const vars extends Vars = DefaultVars>(
   vars?: vars | undefined,
 ) {
+  type Icons = unknown extends vars['icons']
+    ? DefaultVars['icons']
+    : vars['icons']
+  type MergedVars = Pretty<
+    Omit<Assign<DefaultVars, vars>, 'icons'> & {
+      icons: Icons
+    }
+  >
+
   const mergedVars = {
     ...defaultVars,
     ...vars,
-  }
-
-  type MergedVars = Assign<DefaultVars, vars>
+  } as MergedVars
 
   function createComponent<
     const component extends (...args: any[]) => JSX.Element,
@@ -149,7 +156,7 @@
      */
     Icon: <
       vars extends MergedVars,
-      collection extends Vars['icons'] = DefaultVars['icons'],
+      collection extends Vars['icons'] = MergedVars['icons'],
     >(
       props: IconProps<vars, collection>,
     ) => <Icon __context={{ vars: mergedVars }} {...props} />,

src/ui/icons/package.json

@@ -0,0 +1,5 @@
+{
+  "type": "module",
+  "types": "../../_lib/ui/icons/index.d.ts",
+  "module": "../../_lib/ui/icons/index.js"
+}