Merge branch 'sudeep2003:main' into fix/jsx-runtime-warning

Author: chrismerkand

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: 📘 Documentation
-    url: https://astroicon.dev
+    url: https://astro-iconset.wingflows.com
     about: Read the official documentation

.github/workflows/ci.yml

@@ -27,3 +27,22 @@ jobs:
           cache: 'pnpm'
       - run: pnpm install
       - run: pnpm -r build
+
+  test:
+    name: Unit Tests (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # Windows is intentionally included: several path/URL bugs only surface
+        # when the project path contains spaces or uses backslashes.
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+      - run: pnpm install
+      - run: pnpm --filter astro-iconset run test

.gitignore

@@ -137,16 +137,7 @@ dist
 
 
 .vscode
-docs/plan-*
 sandbox.config.json
-
-packages/core/*.md
-
-PLAN.md
 REFERENCES.md
-FRAMEWORKS.md
-GAPS.md
 TESTING.md
-ISSUES.md
-
-tests/
+ISSUES.md

package.json

@@ -6,6 +6,8 @@
   "scripts": {
     "build": "pnpm --filter astro-iconset --filter site run build",
     "dev": "pnpm -r run dev",
+    "test": "pnpm --filter astro-iconset run test",
+    "test:coverage": "pnpm --filter astro-iconset run test:coverage",
     "lint": "prettier --check \"**/*.{js,ts,md,json}\"",
     "format": "prettier --write \"**/*.{js,ts,md,json}\"",
     "version": "changeset version && pnpm install --no-frozen-lockfile --lockfile-only"
@@ -29,6 +31,6 @@
     "@changesets/cli": "^2.18.1"
   },
   "devDependencies": {
-    "prettier": "^3.1.1"
+    "prettier": "^3.8.4"
   }
 }

packages/astro-iconset/CHANGELOG.md

@@ -1,5 +1,14 @@
 # astro-iconset Changelog
 
+## 0.0.6
+
+### Patch
+
+- Resilient icon loading: missing icon directories and un-optimizable SVGs (e.g. embedded raster images) now warn instead of aborting the build.
+- Fix: `?icon` imports resolve through Vite, adding support for path aliases including tsconfig `paths` and `resolve.alias`.
+- Fix: deduplicate the "Loaded icons from …" dev log across SSR/client module evaluations.
+- New `dataAttr` integration option to rename (`dataAttr: "data-astro-icon"`) or disable (`dataAttr: false`) the `data-icon` attribute. Defaults to `data-icon` (backward compatible).
+
 ## 0.0.5
 
 ### Patch

packages/astro-iconset/README.md

@@ -223,6 +223,16 @@ icon({
 
 To use only `iconDirs` for the default local set, set `iconDirs.local` instead of `iconDir`. Do not set both `iconDir` and `iconDirs.local`.
 
+### `dataAttr`
+
+The data attribute added to each rendered icon for CSS targeting. Defaults to `"data-icon"`. Pass a custom string to rename it, or `false` to remove it entirely.
+
+```js
+icon({
+  dataAttr: "data-astro-icon", // or false to disable
+});
+```
+
 ### `svgoOptions`
 
 Override default SVGO behavior. See [SVGO configuration](https://github.com/svg/svgo#configuration).

packages/astro-iconset/components/Icon.astro

@@ -86,6 +86,20 @@ let normalizedBody: string;
 let viewBox: string | undefined;
 let id: string;
 
+const mod = (await import("virtual:astro-iconset")) as {
+  default: AstroIconCollectionMap;
+  config: {
+    include?: Record<string, ["*"] | string[]>;
+    dataAttr?: string | false;
+  };
+};
+
+const icons = mod.default;
+const config = mod.config;
+
+const dataAttrName =
+  config.dataAttr === false ? undefined : (config.dataAttr ?? "data-icon");
+
 if (icon) {
   const renderData = iconToSVG(icon);
   id = `ai:${importedCacheKey(icon)}`;
@@ -107,12 +121,6 @@ if (icon) {
     delete normalizedProps.viewBox;
   }
 } else {
-  const mod = (await import("virtual:astro-iconset")) as {
-    default: AstroIconCollectionMap;
-    config: { include?: Record<string, ["*"] | string[]> };
-  };
-  const icons = mod.default;
-  const config = mod.config;
   const name = nameProp as string;
   const { include = {} } = config;
   const sets = Object.keys(include);
@@ -200,9 +208,11 @@ if (icon) {
     delete normalizedProps.viewBox;
   }
 }
+
+const svgDataAttr = dataAttrName != null ? { [dataAttrName]: cacheKey } : {};
 ---
 
-<svg {...normalizedProps} data-icon={cacheKey}>
+<svg {...normalizedProps} {...svgDataAttr}>
   {title && <title>{title}</title>}
   {desc && <desc>{desc}</desc>}
   {

packages/astro-iconset/components/preact/Icon.tsx

@@ -18,7 +18,7 @@ type IconProps =
 
 export default function Icon(props: IconProps) {
   const { name, icon, size, width, height, title, desc, ...rest } = props;
-  const { attrs, inner, dataIcon } = resolveIcon(
+  const { attrs, inner, dataAttr } = resolveIcon(
     { name: name as string | undefined, icon, size, width: width as number | string | undefined, height: height as number | string | undefined, title, desc },
     "preact"
   );
@@ -27,7 +27,9 @@ export default function Icon(props: IconProps) {
     <svg
       {...(attrs as JSX.IntrinsicElements["svg"])}
       {...rest}
-      data-icon={dataIcon}
+      {...(dataAttr
+        ? { [dataAttr.name]: dataAttr.value }
+        : {})}
       dangerouslySetInnerHTML={{ __html: inner }}
     />
   );

packages/astro-iconset/components/react/Icon.tsx

@@ -18,7 +18,7 @@ type IconProps =
 
 export default function Icon(props: IconProps) {
   const { name, icon, size, width, height, title, desc, ...rest } = props;
-  const { attrs, inner, dataIcon } = resolveIcon(
+  const { attrs, inner, dataAttr } = resolveIcon(
     { name: name as string | undefined, icon, size, width: width as number | string | undefined, height: height as number | string | undefined, title, desc },
     "react"
   );
@@ -27,7 +27,9 @@ export default function Icon(props: IconProps) {
     <svg
       {...(attrs as SVGProps<SVGSVGElement>)}
       {...rest}
-      data-icon={dataIcon}
+      {...(dataAttr
+        ? { [dataAttr.name]: dataAttr.value }
+        : {})}
       dangerouslySetInnerHTML={{ __html: inner }}
     />
   );

packages/astro-iconset/components/shared/core.ts

@@ -3,10 +3,12 @@
 import { getIconData, iconToSVG, replaceIDs } from "@iconify/utils";
 import type { AstroIconCollectionMap } from "../../typings/integration";
 import type { AstroIconImport } from "../../typings/astro-icon-import";
-import collections_mod from "virtual:astro-iconset";
+import collections_mod, { config } from "virtual:astro-iconset";
 
 const _collections = ((collections_mod as any).default ?? collections_mod) as AstroIconCollectionMap;
 
+const _config = config ?? {};
+
 export interface ResolveIconInput {
   name?: string;
   icon?: AstroIconImport;
@@ -20,7 +22,10 @@ export interface ResolveIconInput {
 export interface ResolvedIcon {
   attrs: Record<string, string>;
   inner: string;
-  dataIcon: string;
+  dataAttr?: {
+    name: string;
+    value: string;
+  };
 }
 
 function escapeHtml(s: string): string {
@@ -79,5 +84,15 @@ export function resolveIcon(input: ResolveIconInput, framework: string): Resolve
     (desc ? `<desc>${escapeHtml(desc)}</desc>` : "") +
     body;
 
-  return { attrs, inner, dataIcon: icon ? "astro-iconset:import" : (name as string) };
+  const dataIconValue = icon ? "astro-iconset:import" : (name as string);
+
+  const dataAttr =
+    _config.dataAttr === false
+      ? undefined
+      : {
+          name: _config.dataAttr ?? "data-icon",
+          value: dataIconValue,
+        };
+
+  return { attrs, inner, dataAttr };
 }