Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

feat(theme): split into independent packages with separate icon libraries (#239)

Cindy Zhang8ab86b3acfb6
diff --git a/apps/example-nextjs/package.json b/apps/example-nextjs/package.json
index 1ffceb7b18..020e3d865e 100644
--- a/apps/example-nextjs/package.json
+++ b/apps/example-nextjs/package.json
@@ -10,7 +10,7 @@
"dependencies": {
"@stylexjs/stylex": "^0.17.4",
"@xds/core": "*",
- "@xds/theme": "*",
+ "@xds/theme-default": "*",
"next": "^15.0.0",
"react": "^18.3.0",
"react-dom": "^18.3.0"
diff --git a/apps/example-nextjs/src/app/providers.tsx b/apps/example-nextjs/src/app/providers.tsx
index 1ab11e829a..41e4dfd709 100644
--- a/apps/example-nextjs/src/app/providers.tsx
+++ b/apps/example-nextjs/src/app/providers.tsx
@@ -1,7 +1,7 @@
'use client';
import {XDSTheme} from '@xds/core/theme';
-import {defaultTheme} from '@xds/theme/default';
+import {defaultTheme} from '@xds/theme-default';
export function Providers({children}: {children: React.ReactNode}) {
return <XDSTheme theme={defaultTheme}>{children}</XDSTheme>;
diff --git a/apps/example-vite/package.json b/apps/example-vite/package.json
index 3ed3060a7a..980f247ef2 100644
--- a/apps/example-vite/package.json
+++ b/apps/example-vite/package.json
@@ -11,7 +11,7 @@
"dependencies": {
"@stylexjs/stylex": "^0.17.4",
"@xds/core": "*",
- "@xds/theme": "*",
+ "@xds/theme-default": "*",
"react": "^18.3.0",
"react-dom": "^18.3.0"
},
diff --git a/apps/example-vite/src/App.tsx b/apps/example-vite/src/App.tsx
index 02b4c4b2b8..176fc85030 100644
--- a/apps/example-vite/src/App.tsx
+++ b/apps/example-vite/src/App.tsx
@@ -1,7 +1,7 @@
import {useState} from 'react';
import * as stylex from '@stylexjs/stylex';
import {XDSTheme} from '@xds/core/theme';
-import {defaultTheme} from '@xds/theme/default';
+import {defaultTheme} from '@xds/theme-default';
import {XDSVStack, XDSHStack} from '@xds/core/Layout';
import {XDSButton} from '@xds/core/Button';
import {XDSText, XDSHeading} from '@xds/core/Text';
diff --git a/apps/sandbox/package.json b/apps/sandbox/package.json
index 5b039efb74..a08d4b6097 100644
--- a/apps/sandbox/package.json
+++ b/apps/sandbox/package.json
@@ -12,7 +12,7 @@
"@stylexjs/stylex": "^0.17.4",
"@xds/cli": "*",
"@xds/core": "*",
- "@xds/theme": "*",
+ "@xds/theme-default": "*",
"next": "^15.0.0",
"react": "^18.3.0",
"react-dom": "^18.3.0"
diff --git a/apps/sandbox/src/app/providers.tsx b/apps/sandbox/src/app/providers.tsx
index 1ab11e829a..41e4dfd709 100644
--- a/apps/sandbox/src/app/providers.tsx
+++ b/apps/sandbox/src/app/providers.tsx
@@ -1,7 +1,7 @@
'use client';
import {XDSTheme} from '@xds/core/theme';
-import {defaultTheme} from '@xds/theme/default';
+import {defaultTheme} from '@xds/theme-default';
export function Providers({children}: {children: React.ReactNode}) {
return <XDSTheme theme={defaultTheme}>{children}</XDSTheme>;
diff --git a/apps/storybook/.storybook/main.ts b/apps/storybook/.storybook/main.ts
index 9d76ac13f0..a6494fc411 100644
--- a/apps/storybook/.storybook/main.ts
+++ b/apps/storybook/.storybook/main.ts
@@ -4,7 +4,14 @@ import path from 'path';
const rootDir = path.resolve(__dirname, '../../..');
const coreRoot = path.resolve(__dirname, '../../../packages/core/src');
-const themeRoot = path.resolve(__dirname, '../../../packages/theme/src');
+const themeDefaultRoot = path.resolve(
+ __dirname,
+ '../../../packages/themes/default/src',
+);
+const themeNeutralRoot = path.resolve(
+ __dirname,
+ '../../../packages/themes/neutral/src',
+);
/**
* Browser targets for lightningcss.
@@ -61,7 +68,12 @@ const config: StorybookConfig = {
aliases: {
'@xds/core/*': [path.join(rootDir, 'packages/core/src/*')],
'@xds/core': [path.join(rootDir, 'packages/core/src')],
- '@xds/theme/*': [path.join(rootDir, 'packages/theme/src/*')],
+ '@xds/theme-default/*': [
+ path.join(rootDir, 'packages/themes/default/src/*'),
+ ],
+ '@xds/theme-neutral/*': [
+ path.join(rootDir, 'packages/themes/neutral/src/*'),
+ ],
},
unstable_moduleResolution: {
type: 'commonJS',
@@ -86,7 +98,8 @@ const config: StorybookConfig = {
alias: {
...config.resolve?.alias,
'@xds/core': coreRoot,
- '@xds/theme': themeRoot,
+ '@xds/theme-default': themeDefaultRoot,
+ '@xds/theme-neutral': themeNeutralRoot,
},
},
css: {
diff --git a/apps/storybook/.storybook/preview.tsx b/apps/storybook/.storybook/preview.tsx
index 7dc0302a53..591511ace8 100644
--- a/apps/storybook/.storybook/preview.tsx
+++ b/apps/storybook/.storybook/preview.tsx
@@ -1,8 +1,8 @@
import type {Preview, Decorator} from '@storybook/react';
import * as React from 'react';
import {XDSTheme} from '@xds/core';
-import {defaultTheme} from '@xds/theme/default';
-import {neutralTheme} from '@xds/theme/neutral';
+import {defaultTheme} from '@xds/theme-default';
+import {neutralTheme} from '@xds/theme-neutral';
// Import the base reset stylesheet
import '@xds/core/reset.css';
diff --git a/apps/storybook/package.json b/apps/storybook/package.json
index d3f6cba7e6..b327b461dc 100644
--- a/apps/storybook/package.json
+++ b/apps/storybook/package.json
@@ -10,7 +10,8 @@
"@xds/core": "*",
"react": "^18.3.0",
"react-dom": "^18.3.0",
- "@xds/theme": "*"
+ "@xds/theme-default": "*",
+ "@xds/theme-neutral": "*"
},
"devDependencies": {
"@storybook/addon-essentials": "^8.4.0",
diff --git a/apps/storybook/stories/FontWrapper.stories.tsx b/apps/storybook/stories/FontWrapper.stories.tsx
index af7fb6e5d6..6231be3df8 100644
--- a/apps/storybook/stories/FontWrapper.stories.tsx
+++ b/apps/storybook/stories/FontWrapper.stories.tsx
@@ -183,7 +183,7 @@ export const MarkdownContent: Story = {
</p>
<pre>
<code>{`import { XDSTheme, XDSButton } from '@xds/core';
-import { defaultTheme } from '@xds/theme/default';
+import { defaultTheme } from '@xds/theme-default';
function App() {
return (
diff --git a/apps/storybook/stories/Layout.stories.tsx b/apps/storybook/stories/Layout.stories.tsx
index 4d92f8e0d2..651b64bb57 100644
--- a/apps/storybook/stories/Layout.stories.tsx
+++ b/apps/storybook/stories/Layout.stories.tsx
@@ -21,8 +21,8 @@ import {
elevationVars,
} from '@xds/core/theme/tokens.stylex';
import {XDSTheme} from '@xds/core';
-import {defaultTheme} from '@xds/theme/default';
-import {neutralTheme} from '@xds/theme/neutral';
+import {defaultTheme} from '@xds/theme-default';
+import {neutralTheme} from '@xds/theme-neutral';
const styles = stylex.create({
// Story wrapper styles
diff --git a/package.json b/package.json
index 418265893b..a1ba5b94fe 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,12 @@
"workspaces": [
"apps/*",
"packages/*",
+ "packages/themes/*",
"internal/*",
"e2e"
],
"scripts": {
- "build": "yarn workspace @xds/core build && yarn workspace @xds/theme build",
+ "build": "yarn workspace @xds/core build && yarn workspace @xds/theme-default build && yarn workspace @xds/theme-neutral build",
"dev": "yarn workspace @xds/storybook dev",
"test": "vitest run",
"test:watch": "vitest",
diff --git a/packages/core/src/theme/index.ts b/packages/core/src/theme/index.ts
index facb4875cd..a598d154d5 100644
--- a/packages/core/src/theme/index.ts
+++ b/packages/core/src/theme/index.ts
@@ -6,9 +6,9 @@
* - useXDSTheme: Hook to access current theme
* - Token exports for direct use in StyleX
*
- * Themes (defaultTheme, neutralTheme, etc.) are in @xds/theme:
- * import { defaultTheme } from '@xds/theme/default';
- * import { neutralTheme } from '@xds/theme/neutral';
+ * Themes are in separate packages:
+ * import { defaultTheme } from '@xds/theme-default';
+ * import { neutralTheme } from '@xds/theme-neutral';
*/
export {XDSTheme, useXDSTheme, Theme, useTheme} from './XDSTheme';
diff --git a/packages/theme/src/neutral/icons.tsx b/packages/theme/src/neutral/icons.tsx
deleted file mode 100644
index 395b7a2876..0000000000
--- a/packages/theme/src/neutral/icons.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file icons.tsx
- * @input Uses @heroicons/react outline and solid icon components, XDSIconRegistry type
- * @output Exports neutralIconRegistry for the neutral theme
- * @position Icon configuration for the neutral theme; consumed by index.ts
- *
- * Maps semantic icon names to Heroicons components.
- * These icons are bundled with the theme, not with @xds/core.
- */
-
-import React from 'react';
-import type {XDSIconRegistry} from '@xds/core/Icon';
-
-import {
- XMarkIcon,
- ChevronDownIcon,
- ChevronLeftIcon,
- ChevronRightIcon,
- CheckIcon,
- CalendarDaysIcon,
- ClockIcon,
- InformationCircleIcon,
-} from '@heroicons/react/24/outline';
-
-import {
- CheckCircleIcon,
- XCircleIcon,
- ExclamationTriangleIcon,
- ArrowTopRightOnSquareIcon,
-} from '@heroicons/react/24/solid';
-
-const iconProps = {
- width: '1em',
- height: '1em',
- 'aria-hidden': true as const,
-};
-
-export const neutralIconRegistry: XDSIconRegistry = {
- close: <XMarkIcon {...iconProps} />,
- chevronDown: <ChevronDownIcon {...iconProps} />,
- chevronLeft: <ChevronLeftIcon {...iconProps} />,
- chevronRight: <ChevronRightIcon {...iconProps} />,
- check: <CheckIcon {...iconProps} />,
- checkCircle: <CheckCircleIcon {...iconProps} />,
- xCircle: <XCircleIcon {...iconProps} />,
- warning: <ExclamationTriangleIcon {...iconProps} />,
- info: <InformationCircleIcon {...iconProps} />,
- calendar: <CalendarDaysIcon {...iconProps} />,
- clock: <ClockIcon {...iconProps} />,
- externalLink: <ArrowTopRightOnSquareIcon {...iconProps} />,
-};
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
deleted file mode 100644
index 613a6f3196..0000000000
--- a/packages/theme/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "../../tsconfig.json",
- "compilerOptions": {
- "outDir": "./dist",
- "paths": {
- "@xds/core/*": ["../core/src/*"],
- "@xds/core": ["../core/src"]
- }
- },
- "include": ["src"]
-}
diff --git a/packages/theme/esbuild-plugin-babel.d.ts b/packages/themes/default/esbuild-plugin-babel.d.ts
similarity index 100%
rename from packages/theme/esbuild-plugin-babel.d.ts
rename to packages/themes/default/esbuild-plugin-babel.d.ts
diff --git a/packages/theme/package.json b/packages/themes/default/package.json
similarity index 61%
rename from packages/theme/package.json
rename to packages/themes/default/package.json
index a5a1f0240b..c7eaecaf09 100644
--- a/packages/theme/package.json
+++ b/packages/themes/default/package.json
@@ -1,20 +1,18 @@
{
- "name": "@xds/theme",
+ "name": "@xds/theme-default",
"version": "0.0.1",
"private": true,
- "description": "Optional themes for XDS components",
+ "description": "Default theme for XDS components (Heroicons)",
"license": "MIT",
"sideEffects": false,
+ "main": "./dist/index.js",
+ "module": "./dist/index.mjs",
+ "types": "./dist/index.d.ts",
"exports": {
- "./default": {
- "types": "./dist/default/index.d.ts",
- "import": "./dist/default/index.mjs",
- "require": "./dist/default/index.js"
- },
- "./neutral": {
- "types": "./dist/neutral/index.d.ts",
- "import": "./dist/neutral/index.mjs",
- "require": "./dist/neutral/index.js"
+ ".": {
+ "types": "./dist/index.d.ts",
+ "import": "./dist/index.mjs",
+ "require": "./dist/index.js"
}
},
"files": [
diff --git a/packages/theme/src/default/defaultTheme.stylex.ts b/packages/themes/default/src/defaultTheme.stylex.ts
similarity index 100%
rename from packages/theme/src/default/defaultTheme.stylex.ts
rename to packages/themes/default/src/defaultTheme.stylex.ts
diff --git a/packages/theme/src/default/icons.tsx b/packages/themes/default/src/icons.tsx
similarity index 100%
rename from packages/theme/src/default/icons.tsx
rename to packages/themes/default/src/icons.tsx
diff --git a/packages/theme/src/default/index.ts b/packages/themes/default/src/index.ts
similarity index 100%
rename from packages/theme/src/default/index.ts
rename to packages/themes/default/src/index.ts
diff --git a/packages/themes/default/tsconfig.json b/packages/themes/default/tsconfig.json
new file mode 100644
index 0000000000..5f7cca32c5
--- /dev/null
+++ b/packages/themes/default/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "paths": {
+ "@xds/core/*": ["../../core/src/*"],
+ "@xds/core": ["../../core/src"]
+ }
+ },
+ "include": ["src"]
+}
diff --git a/packages/theme/tsup.config.ts b/packages/themes/default/tsup.config.ts
similarity index 81%
rename from packages/theme/tsup.config.ts
rename to packages/themes/default/tsup.config.ts
index 331cacd713..f3d2e313dd 100644
--- a/packages/theme/tsup.config.ts
+++ b/packages/themes/default/tsup.config.ts
@@ -3,7 +3,7 @@ import babel from 'esbuild-plugin-babel';
import path from 'path';
export default defineConfig({
- entry: ['src/default/index.ts', 'src/neutral/index.ts'],
+ entry: ['src/index.ts'],
format: ['cjs', 'esm'],
dts: true,
splitting: true,
@@ -26,11 +26,13 @@ export default defineConfig({
genConditionalClasses: true,
treeshakeCompensation: true,
aliases: {
- '@xds/core/*': [path.join(__dirname, '..', 'core', 'src', '*')],
+ '@xds/core/*': [
+ path.join(__dirname, '..', '..', 'core', 'src', '*'),
+ ],
},
unstable_moduleResolution: {
type: 'commonJS',
- rootDir: path.resolve(__dirname, '../..'),
+ rootDir: path.resolve(__dirname, '../../..'),
},
},
],
diff --git a/packages/themes/neutral/esbuild-plugin-babel.d.ts b/packages/themes/neutral/esbuild-plugin-babel.d.ts
new file mode 100644
index 0000000000..770031ab2a
--- /dev/null
+++ b/packages/themes/neutral/esbuild-plugin-babel.d.ts
@@ -0,0 +1 @@
+declare module 'esbuild-plugin-babel';
diff --git a/packages/themes/neutral/package.json b/packages/themes/neutral/package.json
new file mode 100644
index 0000000000..bbffd5dc99
--- /dev/null
+++ b/packages/themes/neutral/package.json
@@ -0,0 +1,42 @@
+{
+ "name": "@xds/theme-neutral",
+ "version": "0.0.1",
+ "private": true,
+ "description": "Neutral theme for XDS components (Lucide icons)",
+ "license": "MIT",
+ "sideEffects": false,
+ "main": "./dist/index.js",
+ "module": "./dist/index.mjs",
+ "types": "./dist/index.d.ts",
+ "exports": {
+ ".": {
+ "types": "./dist/index.d.ts",
+ "import": "./dist/index.mjs",
+ "require": "./dist/index.js"
+ }
+ },
+ "files": [
+ "dist",
+ "src"
+ ],
+ "scripts": {
+ "build": "tsup",
+ "dev": "tsup --watch"
+ },
+ "dependencies": {
+ "lucide-react": "^0.575.0"
+ },
+ "peerDependencies": {
+ "@stylexjs/stylex": ">=0.10.0",
+ "@xds/core": "*",
+ "react": ">=18"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.28.5",
+ "@babel/preset-react": "^7.28.5",
+ "@babel/preset-typescript": "^7.28.5",
+ "@stylexjs/babel-plugin": "^0.17.4",
+ "esbuild-plugin-babel": "^0.2.3",
+ "tsup": "^8.3.0"
+ }
+}
diff --git a/packages/themes/neutral/src/icons.tsx b/packages/themes/neutral/src/icons.tsx
new file mode 100644
index 0000000000..b9d3eb702f
--- /dev/null
+++ b/packages/themes/neutral/src/icons.tsx
@@ -0,0 +1,47 @@
+/**
+ * @file icons.tsx
+ * @input Uses lucide-react icon components, XDSIconRegistry type
+ * @output Exports neutralIconRegistry for the neutral theme
+ * @position Icon configuration for the neutral theme; consumed by index.ts
+ *
+ * Maps semantic icon names to Lucide icon components.
+ * These icons are bundled with the theme, not with @xds/core.
+ */
+
+import React from 'react';
+import type {XDSIconRegistry} from '@xds/core/Icon';
+
+import {
+ X,
+ ChevronDown,
+ ChevronLeft,
+ ChevronRight,
+ Check,
+ CheckCircle,
+ XCircle,
+ AlertTriangle,
+ Info,
+ Calendar,
+ Clock,
+ ExternalLink,
+} from 'lucide-react';
+
+const iconProps = {
+ size: '1em',
+ 'aria-hidden': true as const,
+};
+
+export const neutralIconRegistry: XDSIconRegistry = {
+ close: <X {...iconProps} />,
+ chevronDown: <ChevronDown {...iconProps} />,
+ chevronLeft: <ChevronLeft {...iconProps} />,
+ chevronRight: <ChevronRight {...iconProps} />,
+ check: <Check {...iconProps} />,
+ checkCircle: <CheckCircle {...iconProps} />,
+ xCircle: <XCircle {...iconProps} />,
+ warning: <AlertTriangle {...iconProps} />,
+ info: <Info {...iconProps} />,
+ calendar: <Calendar {...iconProps} />,
+ clock: <Clock {...iconProps} />,
+ externalLink: <ExternalLink {...iconProps} />,
+};
diff --git a/packages/theme/src/neutral/index.ts b/packages/themes/neutral/src/index.ts
similarity index 100%
rename from packages/theme/src/neutral/index.ts
rename to packages/themes/neutral/src/index.ts
diff --git a/packages/theme/src/neutral/neutralTheme.stylex.ts b/packages/themes/neutral/src/neutralTheme.stylex.ts
similarity index 100%
rename from packages/theme/src/neutral/neutralTheme.stylex.ts
rename to packages/themes/neutral/src/neutralTheme.stylex.ts
diff --git a/packages/themes/neutral/tsconfig.json b/packages/themes/neutral/tsconfig.json
new file mode 100644
index 0000000000..5f7cca32c5
--- /dev/null
+++ b/packages/themes/neutral/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "paths": {
+ "@xds/core/*": ["../../core/src/*"],
+ "@xds/core": ["../../core/src"]
+ }
+ },
+ "include": ["src"]
+}
diff --git a/packages/themes/neutral/tsup.config.ts b/packages/themes/neutral/tsup.config.ts
new file mode 100644
index 0000000000..f3d2e313dd
--- /dev/null
+++ b/packages/themes/neutral/tsup.config.ts
@@ -0,0 +1,43 @@
+import {defineConfig} from 'tsup';
+import babel from 'esbuild-plugin-babel';
+import path from 'path';
+
+export default defineConfig({
+ entry: ['src/index.ts'],
+ format: ['cjs', 'esm'],
+ dts: true,
+ splitting: true,
+ clean: true,
+ external: ['react', 'react-dom', '@stylexjs/stylex', '@xds/core'],
+ esbuildPlugins: [
+ babel({
+ filter: /\.[jt]sx?$/,
+ config: {
+ presets: [
+ ['@babel/preset-react', {runtime: 'automatic'}],
+ '@babel/preset-typescript',
+ ],
+ plugins: [
+ [
+ '@stylexjs/babel-plugin',
+ {
+ dev: false,
+ runtimeInjection: false,
+ genConditionalClasses: true,
+ treeshakeCompensation: true,
+ aliases: {
+ '@xds/core/*': [
+ path.join(__dirname, '..', '..', 'core', 'src', '*'),
+ ],
+ },
+ unstable_moduleResolution: {
+ type: 'commonJS',
+ rootDir: path.resolve(__dirname, '../../..'),
+ },
+ },
+ ],
+ ],
+ },
+ }),
+ ],
+});
diff --git a/yarn.lock b/yarn.lock
index c6b23a7422..59925ad9fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2010,18 +2010,6 @@
is-glob "^4.0.3"
postcss "^8.4.49"
-"@stylexjs/postcss-plugin@^0.17.4":
- version "0.17.5"
- resolved "https://registry.yarnpkg.com/@stylexjs/postcss-plugin/-/postcss-plugin-0.17.5.tgz#03ecd009409cbcb59e5083cac8a62f591ec38e16"
- integrity sha512-GeveZXN8aDrXTSRpDM0SvCjmmY7WCfoel+lWcsf47QcJvjz5auGmh3a9LhIFLpwmAgpsVr20RyB8yxX93NaKow==
- dependencies:
- "@babel/core" "^7.26.8"
- "@stylexjs/babel-plugin" "0.17.5"
- fast-glob "^3.3.2"
- glob-parent "^6.0.2"
- is-glob "^4.0.3"
- postcss "^8.4.49"
-
"@stylexjs/[email protected]":
version "0.11.1"
resolved "https://registry.yarnpkg.com/@stylexjs/shared/-/shared-0.11.1.tgz#c92160f33161f5721f5e1b4a623f99892df5d319"
@@ -3987,6 +3975,11 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
+lucide-react@^0.575.0:
+ version "0.575.0"
+ resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.575.0.tgz#90feaa4c140e9693e4ee9426d9927a6b833267ac"
+ integrity sha512-VuXgKZrk0uiDlWjGGXmKV6MSk9Yy4l10qgVvzGn2AWBx1Ylt0iBexKOAoA6I7JO3m+M9oeovJd3yYENfkUbOeg==
+
lz-string@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"