@yahoo/uds 3.162.0 → 3.162.2

package/dist/cli/commands/purge.cjs

@@ -17,6 +17,9 @@ const showHelp = () => {
 	require_print.print(`${require_colors.magenta("Options:")}`);
 	require_print.print(`  ${require_colors.cyan("--entry <path>")}       Entry directory or file to scan (default: ./src)`);
 	require_print.print(`  ${require_colors.cyan("--output <path>")}      Output safelist file (default: dist/safelist.ts)`);
+	require_print.print(`  ${require_colors.cyan("--ignore <glob>")}      Extra glob(s) to exclude from the scan (comma-separated)`);
+	require_print.print(`  ${require_colors.cyan("--include-dev-files")}  Also scan test/spec/story files (excluded by default)`);
+	require_print.print(`  ${require_colors.cyan("--include-stories")}    Also scan story files, keeping test/spec excluded`);
 	require_print.print(`  ${require_colors.cyan("--config <path>")}      Path to uds.config.ts for legacy purge mode`);
 	require_print.print(`  ${require_colors.cyan("--optimized")}          Use the optimized AST-based purger implementation`);
 	require_print.print(`  ${require_colors.cyan("--help, -h")}           Show this help message`);
@@ -36,7 +39,7 @@ const makePurgeCommand = (getContext) => ({
 			showHelp();
 			return;
 		}
-		const { config, entry, optimized, output } = require_cli_commands_purge_helpers.getPurgeRunOptions(props.options);
+		const { config, entry, ignore, ignoreDevFiles, includeStories, optimized, output } = require_cli_commands_purge_helpers.getPurgeRunOptions(props.options);
 		const { variants, autoVariants, componentData, packageJson, generatedPurgeCssData } = await getContext();
 		if (optimized) {
 			require_spinner.spinStart("Purging CSS with optimized purger...");
@@ -44,6 +47,9 @@ const makePurgeCommand = (getContext) => ({
 				const result = await require_purge.purgeOptimized({
 					entry,
 					output,
+					ignore,
+					ignoreDevFiles,
+					includeStories,
 					variants,
 					autoVariants,
 					componentData
@@ -51,6 +57,7 @@ const makePurgeCommand = (getContext) => ({
 				require_spinner.spinStop("✅", `Purging done (optimized)! Generated ${result.stats.classesGenerated} classes in ${result.stats.timeMs}ms`);
 				require_print.print(`   Files scanned: ${result.stats.filesScanned}`);
 				require_print.print(`   Spreads traced: ${result.stats.spreadsTraced}`);
+				require_print.print(`   Spreads unresolved: ${result.stats.spreadsUnresolved}`);
 				require_print.print(`   Expressions resolved: ${result.stats.expressionsResolved}`);
 				return;
 			} catch (error) {

package/dist/cli/commands/purge.helpers.cjs

@@ -7,11 +7,18 @@ const entryOption = (value) => {
 	if (typeof value === "string") return value;
 	if (Array.isArray(value) && value.every((item) => typeof item === "string")) return value;
 };
+const ignoreOption = (value) => {
+	if (typeof value === "string") return value.split(",").map((glob) => glob.trim()).filter(Boolean);
+	if (Array.isArray(value) && value.every((item) => typeof item === "string")) return value;
+};
 const shouldShowHelp = (options) => isTruthyFlag(options.help) || isTruthyFlag(options.h);
 const isOptimizedPurgeEnabled = (options) => isTruthyFlag(options.optimized);
 const getPurgeRunOptions = (options) => ({
 	config: stringOption(options.config),
 	entry: entryOption(options.entry),
+	ignore: ignoreOption(options.ignore),
+	ignoreDevFiles: !(isTruthyFlag(options["include-dev-files"]) || isTruthyFlag(options.includeDevFiles)),
+	includeStories: isTruthyFlag(options["include-stories"]) || isTruthyFlag(options.includeStories),
 	optimized: isOptimizedPurgeEnabled(options),
 	output: stringOption(options.output)
 });

package/dist/cli/commands/purge.helpers.d.cts

@@ -4,6 +4,9 @@ type PurgeCliOptions = Record<string, unknown>;
 type PurgeRunOptions = {
   config?: string;
   entry?: string | string[];
+  ignore?: string[];
+  ignoreDevFiles: boolean;
+  includeStories: boolean;
   optimized: boolean;
   output?: string;
 };

package/dist/cli/commands/purge.helpers.d.ts

@@ -4,6 +4,9 @@ type PurgeCliOptions = Record<string, unknown>;
 type PurgeRunOptions = {
   config?: string;
   entry?: string | string[];
+  ignore?: string[];
+  ignoreDevFiles: boolean;
+  includeStories: boolean;
   optimized: boolean;
   output?: string;
 };

package/dist/cli/commands/purge.helpers.js

@@ -6,11 +6,18 @@ const entryOption = (value) => {
 	if (typeof value === "string") return value;
 	if (Array.isArray(value) && value.every((item) => typeof item === "string")) return value;
 };
+const ignoreOption = (value) => {
+	if (typeof value === "string") return value.split(",").map((glob) => glob.trim()).filter(Boolean);
+	if (Array.isArray(value) && value.every((item) => typeof item === "string")) return value;
+};
 const shouldShowHelp = (options) => isTruthyFlag(options.help) || isTruthyFlag(options.h);
 const isOptimizedPurgeEnabled = (options) => isTruthyFlag(options.optimized);
 const getPurgeRunOptions = (options) => ({
 	config: stringOption(options.config),
 	entry: entryOption(options.entry),
+	ignore: ignoreOption(options.ignore),
+	ignoreDevFiles: !(isTruthyFlag(options["include-dev-files"]) || isTruthyFlag(options.includeDevFiles)),
+	includeStories: isTruthyFlag(options["include-stories"]) || isTruthyFlag(options.includeStories),
 	optimized: isOptimizedPurgeEnabled(options),
 	output: stringOption(options.output)
 });

package/dist/cli/commands/purge.js

@@ -16,6 +16,9 @@ const showHelp = () => {
 	print(`${magenta("Options:")}`);
 	print(`  ${cyan("--entry <path>")}       Entry directory or file to scan (default: ./src)`);
 	print(`  ${cyan("--output <path>")}      Output safelist file (default: dist/safelist.ts)`);
+	print(`  ${cyan("--ignore <glob>")}      Extra glob(s) to exclude from the scan (comma-separated)`);
+	print(`  ${cyan("--include-dev-files")}  Also scan test/spec/story files (excluded by default)`);
+	print(`  ${cyan("--include-stories")}    Also scan story files, keeping test/spec excluded`);
 	print(`  ${cyan("--config <path>")}      Path to uds.config.ts for legacy purge mode`);
 	print(`  ${cyan("--optimized")}          Use the optimized AST-based purger implementation`);
 	print(`  ${cyan("--help, -h")}           Show this help message`);
@@ -35,7 +38,7 @@ const makePurgeCommand = (getContext) => ({
 			showHelp();
 			return;
 		}
-		const { config, entry, optimized, output } = getPurgeRunOptions(props.options);
+		const { config, entry, ignore, ignoreDevFiles, includeStories, optimized, output } = getPurgeRunOptions(props.options);
 		const { variants, autoVariants, componentData, packageJson, generatedPurgeCssData } = await getContext();
 		if (optimized) {
 			spinStart("Purging CSS with optimized purger...");
@@ -43,6 +46,9 @@ const makePurgeCommand = (getContext) => ({
 				const result = await purgeOptimized({
 					entry,
 					output,
+					ignore,
+					ignoreDevFiles,
+					includeStories,
 					variants,
 					autoVariants,
 					componentData
@@ -50,6 +56,7 @@ const makePurgeCommand = (getContext) => ({
 				spinStop("✅", `Purging done (optimized)! Generated ${result.stats.classesGenerated} classes in ${result.stats.timeMs}ms`);
 				print(`   Files scanned: ${result.stats.filesScanned}`);
 				print(`   Spreads traced: ${result.stats.spreadsTraced}`);
+				print(`   Spreads unresolved: ${result.stats.spreadsUnresolved}`);
 				print(`   Expressions resolved: ${result.stats.expressionsResolved}`);
 				return;
 			} catch (error) {

package/dist/components/client/Menu/Menu.ItemCheckbox.d.cts

@@ -131,6 +131,6 @@ interface MenuItemCheckboxProps extends Omit<PressableProps, 'asChild'>, HtmlBut
  *
  * @related [Menu](https://uds.build/docs/components/menu), [Menu.Item](https://uds.build/docs/components/menu-item)
  **/
-declare const MenuItemCheckbox: _$react.ForwardRefExoticComponent<Omit<MenuItemCheckboxProps, "active" | "rootProps" | "hideEndIcon"> & _$react.RefAttributes<HTMLDivElement>>;
+declare const MenuItemCheckbox: _$react.ForwardRefExoticComponent<Omit<MenuItemCheckboxProps, "active" | "hideEndIcon" | "rootProps"> & _$react.RefAttributes<HTMLDivElement>>;
 //#endregion
 export { MenuItemCheckbox, type MenuItemCheckboxProps };

package/dist/components/client/Menu/Menu.ItemCheckbox.d.ts

@@ -132,6 +132,6 @@ interface MenuItemCheckboxProps extends Omit<PressableProps, 'asChild'>, HtmlBut
  *
  * @related [Menu](https://uds.build/docs/components/menu), [Menu.Item](https://uds.build/docs/components/menu-item)
  **/
-declare const MenuItemCheckbox: _$react.ForwardRefExoticComponent<Omit<MenuItemCheckboxProps, "active" | "rootProps" | "hideEndIcon"> & _$react.RefAttributes<HTMLDivElement>>;
+declare const MenuItemCheckbox: _$react.ForwardRefExoticComponent<Omit<MenuItemCheckboxProps, "active" | "hideEndIcon" | "rootProps"> & _$react.RefAttributes<HTMLDivElement>>;
 //#endregion
 export { MenuItemCheckbox, type MenuItemCheckboxProps };

package/dist/components/client/Popover/UDSPopoverConfigProvider.d.cts

@@ -29,7 +29,7 @@ declare function usePopoverConfig(sizeProp?: PopoverSize | undefined, variantPro
   gap: SpacingAlias;
   dismissButtonSpacing: SpacingAlias;
   dismissIconSize: number;
-  ariaKitPlacement: ("top-start" | "top-end" | "bottom-start" | "bottom-end" | ("top" | "bottom" | "left" | "right") | "left-start" | "right-start" | "left-end" | "right-end") | undefined;
+  ariaKitPlacement: ("bottom-end" | "bottom-start" | "top-end" | "top-start" | ("bottom" | "left" | "right" | "top") | "left-start" | "right-start" | "left-end" | "right-end") | undefined;
   animationDuration: number;
 };
 //#endregion

package/dist/components/client/Popover/UDSPopoverConfigProvider.d.ts

@@ -30,7 +30,7 @@ declare function usePopoverConfig(sizeProp?: PopoverSize | undefined, variantPro
   gap: SpacingAlias;
   dismissButtonSpacing: SpacingAlias;
   dismissIconSize: number;
-  ariaKitPlacement: ("top-start" | "top-end" | "bottom-start" | "bottom-end" | ("top" | "bottom" | "left" | "right") | "left-start" | "right-start" | "left-end" | "right-end") | undefined;
+  ariaKitPlacement: ("bottom-end" | "bottom-start" | "top-end" | "top-start" | ("bottom" | "left" | "right" | "top") | "left-start" | "right-start" | "left-end" | "right-end") | undefined;
   animationDuration: number;
 };
 //#endregion

package/dist/components/client/Switch/Switch.cjs

@@ -7,6 +7,7 @@ const require_components_IconSlot = require("../../IconSlot.cjs");
 const require_components_Box = require("../../Box.cjs");
 const require_hooks_usePrefersReducedMotion = require("../../../hooks/usePrefersReducedMotion.cjs");
 const require_components_client_SpringMotionConfig = require("../SpringMotionConfig.cjs");
+const require_hooks_useRtl = require("../../../hooks/useRtl.cjs");
 const require_components_client_Switch_SwitchBase = require("./SwitchBase.cjs");
 let react = require("react");
 react = require_runtime.__toESM(react);
@@ -46,6 +47,7 @@ const toggleTransition = {
 **/
 const Switch = (0, react.forwardRef)(function Switch({ reduceMotion: forceReduceMotion, ...props }, parentRef) {
 	const prefersReducedMotion = require_hooks_usePrefersReducedMotion.usePrefersReducedMotion();
+	const isRtl = require_hooks_useRtl.useRtl();
 	const reduceMotion = forceReduceMotion ? "always" : "user";
 	const cssAnimationDuration = prefersReducedMotion || forceReduceMotion ? "duration-0" : "duration-120";
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_components_client_Switch_SwitchBase.SwitchBase, {
@@ -54,14 +56,15 @@ const Switch = (0, react.forwardRef)(function Switch({ reduceMotion: forceReduce
 		cssAnimationDuration,
 		enableHoverTracking: true,
 		renderHandle: ({ size, isOn, isOnX, showHoverEffect, disabled, onIcon, offIcon, cssAnimationDuration, handleSlotProps }) => {
+			const onX = isRtl ? `-${isOnX}` : isOnX;
 			const motionInitialAndAnimate = {
 				initial: {
 					scale: 1,
-					x: isOn ? isOnX : 0
+					x: isOn ? onX : 0
 				},
 				animate: {
 					scale: showHoverEffect ? 1.05 : 1,
-					x: isOn ? isOnX : 0
+					x: isOn ? onX : 0
 				}
 			};
 			const classNames = {

package/dist/components/client/Switch/Switch.js

@@ -5,6 +5,7 @@ import { IconSlot } from "../../IconSlot.js";
 import { Box } from "../../Box.js";
 import { usePrefersReducedMotion } from "../../../hooks/usePrefersReducedMotion.js";
 import { SpringMotionConfig } from "../SpringMotionConfig.js";
+import { useRtl } from "../../../hooks/useRtl.js";
 import { SwitchBase } from "./SwitchBase.js";
 import { forwardRef } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -42,6 +43,7 @@ const toggleTransition = {
 **/
 const Switch = forwardRef(function Switch({ reduceMotion: forceReduceMotion, ...props }, parentRef) {
 	const prefersReducedMotion = usePrefersReducedMotion();
+	const isRtl = useRtl();
 	const reduceMotion = forceReduceMotion ? "always" : "user";
 	const cssAnimationDuration = prefersReducedMotion || forceReduceMotion ? "duration-0" : "duration-120";
 	return /* @__PURE__ */ jsx(SwitchBase, {
@@ -50,14 +52,15 @@ const Switch = forwardRef(function Switch({ reduceMotion: forceReduceMotion, ...
 		cssAnimationDuration,
 		enableHoverTracking: true,
 		renderHandle: ({ size, isOn, isOnX, showHoverEffect, disabled, onIcon, offIcon, cssAnimationDuration, handleSlotProps }) => {
+			const onX = isRtl ? `-${isOnX}` : isOnX;
 			const motionInitialAndAnimate = {
 				initial: {
 					scale: 1,
-					x: isOn ? isOnX : 0
+					x: isOn ? onX : 0
 				},
 				animate: {
 					scale: showHoverEffect ? 1.05 : 1,
-					x: isOn ? isOnX : 0
+					x: isOn ? onX : 0
 				}
 			};
 			const classNames = {

package/dist/components/client/Switch/switchStyles.cjs

@@ -6,11 +6,11 @@ const require_styles_styler = require("../../../styles/styler.cjs");
 const SIZE_MAP = {
 	md: {
 		isOnX: "1.25rem",
-		isOnTranslateClass: require_styles_styler.cx("translate-x-[1.25rem]")
+		isOnTranslateClass: require_styles_styler.cx("translate-x-[1.25rem]", "rtl:translate-x-[-1.25rem]")
 	},
 	sm: {
 		isOnX: "0.75rem",
-		isOnTranslateClass: require_styles_styler.cx("translate-x-[0.75rem]")
+		isOnTranslateClass: require_styles_styler.cx("translate-x-[0.75rem]", "rtl:translate-x-[-0.75rem]")
 	}
 };
 //#endregion

package/dist/components/client/Switch/switchStyles.js

@@ -5,11 +5,11 @@ import { cx } from "../../../styles/styler.js";
 const SIZE_MAP = {
 	md: {
 		isOnX: "1.25rem",
-		isOnTranslateClass: cx("translate-x-[1.25rem]")
+		isOnTranslateClass: cx("translate-x-[1.25rem]", "rtl:translate-x-[-1.25rem]")
 	},
 	sm: {
 		isOnX: "0.75rem",
-		isOnTranslateClass: cx("translate-x-[0.75rem]")
+		isOnTranslateClass: cx("translate-x-[0.75rem]", "rtl:translate-x-[-0.75rem]")
 	}
 };
 //#endregion

package/dist/css/dist/commands/css.cjs

@@ -27,6 +27,8 @@ const showHelp = () => {
 	require_print.print(`  ${require_colors.cyan("--verbose, -v")}     List every scanned file used for purging`);
 	require_print.print(`  ${require_colors.cyan("--workers <n>")}     Number of parallel workers (default: auto = CPU count - 1)`);
 	require_print.print(`  ${require_colors.cyan("--emit <mode>")}     Emission mode: exhaustive (default) | selective`);
+	require_print.print(`  ${require_colors.cyan("--include-dev-files")} Also scan test/spec/story files (excluded by default)`);
+	require_print.print(`  ${require_colors.cyan("--include-stories")}   Also scan story files, keeping test/spec excluded`);
 	require_print.print(`  ${require_colors.cyan("--force")}           Overwrite existing uds.theme.ts (for init)`);
 	require_print.print(`  ${require_colors.cyan("--help, -h")}        Show this help message`);
 	require_print.print("");

package/dist/css/dist/commands/css.helpers.cjs

@@ -35,6 +35,8 @@ const getCssRunOptions = (workspaceDir, options) => {
 		entryOption: entryOption(options.entry),
 		configOption: stringOption(options.config),
 		emit: parseEmitOption(options.emit),
+		includeDevFiles: isTruthyFlag(options["include-dev-files"]) || isTruthyFlag(options.includeDevFiles) ? true : void 0,
+		includeStories: isTruthyFlag(options["include-stories"]) || isTruthyFlag(options.includeStories) ? true : void 0,
 		watch: isTruthyFlag(options.watch) || isTruthyFlag(options.w),
 		silent: isTruthyFlag(options.silent) || isTruthyFlag(options.s),
 		verbose: isTruthyFlag(options.verbose) || isTruthyFlag(options.v),

package/dist/css/dist/commands/css.helpers.js

@@ -35,6 +35,8 @@ const getCssRunOptions = (workspaceDir, options) => {
 		entryOption: entryOption(options.entry),
 		configOption: stringOption(options.config),
 		emit: parseEmitOption(options.emit),
+		includeDevFiles: isTruthyFlag(options["include-dev-files"]) || isTruthyFlag(options.includeDevFiles) ? true : void 0,
+		includeStories: isTruthyFlag(options["include-stories"]) || isTruthyFlag(options.includeStories) ? true : void 0,
 		watch: isTruthyFlag(options.watch) || isTruthyFlag(options.w),
 		silent: isTruthyFlag(options.silent) || isTruthyFlag(options.s),
 		verbose: isTruthyFlag(options.verbose) || isTruthyFlag(options.v),

package/dist/css/dist/commands/css.js

@@ -27,6 +27,8 @@ const showHelp = () => {
 	print(`  ${cyan("--verbose, -v")}     List every scanned file used for purging`);
 	print(`  ${cyan("--workers <n>")}     Number of parallel workers (default: auto = CPU count - 1)`);
 	print(`  ${cyan("--emit <mode>")}     Emission mode: exhaustive (default) | selective`);
+	print(`  ${cyan("--include-dev-files")} Also scan test/spec/story files (excluded by default)`);
+	print(`  ${cyan("--include-stories")}   Also scan story files, keeping test/spec excluded`);
 	print(`  ${cyan("--force")}           Overwrite existing uds.theme.ts (for init)`);
 	print(`  ${cyan("--help, -h")}        Show this help message`);
 	print("");

package/dist/css/dist/css/nodeUtils.cjs

@@ -5,13 +5,14 @@ const require_print = require("../packages/cli/dist/lib/print.cjs");
 const require_perf = require("./perf.cjs");
 const require_purgeFromCode = require("../purger/optimized/purgeFromCode.cjs");
 const require_entryPoints = require("../../../tailwind-internal/dist/utils/entryPoints.cjs");
+const require_files = require("../purger/optimized/utils/files.cjs");
 let node_path = require("node:path");
 node_path = require_runtime.__toESM(node_path, 1);
 let node_fs = require("node:fs");
 node_fs = require_runtime.__toESM(node_fs, 1);
-let node_module = require("node:module");
 let fast_glob = require("fast-glob");
 fast_glob = require_runtime.__toESM(fast_glob, 1);
+let node_module = require("node:module");
 //#region ../css/dist/css/nodeUtils.mjs
 /*! © 2026 Yahoo, Inc. UDS CSS v0.0.0-development */
 const loadConfigFile = async (configPath) => {
@@ -24,11 +25,15 @@ const loadConfigFile = async (configPath) => {
 		throw new Error(`Failed to load config file: ${absolutePath}\n${error instanceof Error ? error.message : "Unknown error"}`);
 	}
 };
-const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool) => {
+const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool, extraIgnore = [], ignoreDevFiles = true) => {
 	const files = await require_perf.measureAsync("scan:glob", () => (0, fast_glob.default)("**/*.{js,jsx,mjs,cjs,ts,tsx}", {
 		cwd: dir,
 		absolute: true,
-		ignore: ["**/node_modules/**"]
+		ignore: [
+			"**/node_modules/**",
+			...ignoreDevFiles ? require_files.DEV_FILE_IGNORE_GLOBS : [],
+			...extraIgnore
+		]
 	}).then((f) => f.sort((left, right) => left.localeCompare(right))));
 	const processFile = (filePath) => {
 		const code = node_fs.default.readFileSync(filePath, "utf-8");
@@ -38,7 +43,8 @@ const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants,
 			colorModes,
 			variantDefaults,
 			runtimeConfigValues,
-			includeAllClassNamePrimitives
+			includeAllClassNamePrimitives,
+			deferWrapperSpreadResolution: true
 		});
 		return require_purgeFromCode.purgeFromCodeOptimized(code, {
 			colorModes,
@@ -48,6 +54,7 @@ const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants,
 			autoVariants,
 			componentData,
 			includeAllClassNamePrimitives,
+			deferWrapperSpreadResolution: true,
 			filePath
 		});
 	};
@@ -60,7 +67,8 @@ const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants,
 		components: [...allComponents],
 		filesScanned: files.length,
 		filesWithComponents,
-		filePaths: files
+		filePaths: files,
+		unresolvedWrapperSpreads: results.flatMap((result) => result.unresolvedWrapperSpreads ?? [])
 	};
 };
 const scanFileForSafelist = async (filePath, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false) => {
@@ -71,27 +79,36 @@ const scanFileForSafelist = async (filePath, colorModes, variants, autoVariants,
 		variants,
 		autoVariants,
 		componentData,
-		includeAllClassNamePrimitives
+		includeAllClassNamePrimitives,
+		deferWrapperSpreadResolution: true
 	});
 	return {
 		safelist: result.safelist,
 		components: result.components,
 		filesScanned: 1,
 		filesWithComponents: result.components.length > 0 ? 1 : 0,
-		filePaths: [filePath]
+		filePaths: [filePath],
+		unresolvedWrapperSpreads: result.unresolvedWrapperSpreads ?? []
 	};
 };
-const scanDirectoriesForSafelist = async (dirs, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool) => {
+const scanDirectoriesForSafelist = async (dirs, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool, extraIgnore = [], ignoreDevFiles = true) => {
 	const results = await Promise.all(dirs.map((dir) => {
 		if (node_fs.default.existsSync(dir) && node_fs.default.statSync(dir).isFile()) return scanFileForSafelist(dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives);
-		return scanDirectoryForSafelist(dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives, pool);
+		return scanDirectoryForSafelist(dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives, pool, extraIgnore, ignoreDevFiles);
 	}));
+	const unresolvedWrapperSpreads = results.flatMap((result) => result.unresolvedWrapperSpreads);
+	const safelist = results.flatMap((result) => result.safelist);
+	if (unresolvedWrapperSpreads.length > 0) {
+		const sources = results.flatMap((result) => result.filePaths).map((filePath) => node_fs.default.readFileSync(filePath, "utf-8"));
+		safelist.push(...require_purgeFromCode.resolveWrapperSpreadSafelist(unresolvedWrapperSpreads, sources, variants));
+	}
 	return {
-		safelist: results.flatMap((result) => result.safelist),
+		safelist,
 		components: [...new Set(results.flatMap((result) => result.components))],
 		filesScanned: results.reduce((total, result) => total + result.filesScanned, 0),
 		filesWithComponents: results.reduce((total, result) => total + result.filesWithComponents, 0),
-		filePaths: results.flatMap((result) => result.filePaths).sort((left, right) => left.localeCompare(right))
+		filePaths: results.flatMap((result) => result.filePaths).sort((left, right) => left.localeCompare(right)),
+		unresolvedWrapperSpreads
 	};
 };
 const findMonorepoRoot = (startDir) => {

package/dist/css/dist/css/nodeUtils.js

@@ -2,12 +2,13 @@
 import { cyan, green, magenta, red } from "../packages/cli/dist/lib/colors.js";
 import { print } from "../packages/cli/dist/lib/print.js";
 import { measureAsync } from "./perf.js";
-import { purgeFromCodeOptimized } from "../purger/optimized/purgeFromCode.js";
+import { purgeFromCodeOptimized, resolveWrapperSpreadSafelist } from "../purger/optimized/purgeFromCode.js";
 import { formatEntryValue } from "../../../tailwind-internal/dist/utils/entryPoints.js";
+import { DEV_FILE_IGNORE_GLOBS } from "../purger/optimized/utils/files.js";
 import path from "node:path";
 import fs from "node:fs";
-import { createRequire } from "node:module";
 import fg from "fast-glob";
+import { createRequire } from "node:module";
 //#region ../css/dist/css/nodeUtils.mjs
 /*! © 2026 Yahoo, Inc. UDS CSS v0.0.0-development */
 const loadConfigFile = async (configPath) => {
@@ -20,11 +21,15 @@ const loadConfigFile = async (configPath) => {
 		throw new Error(`Failed to load config file: ${absolutePath}\n${error instanceof Error ? error.message : "Unknown error"}`);
 	}
 };
-const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool) => {
+const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool, extraIgnore = [], ignoreDevFiles = true) => {
 	const files = await measureAsync("scan:glob", () => fg("**/*.{js,jsx,mjs,cjs,ts,tsx}", {
 		cwd: dir,
 		absolute: true,
-		ignore: ["**/node_modules/**"]
+		ignore: [
+			"**/node_modules/**",
+			...ignoreDevFiles ? DEV_FILE_IGNORE_GLOBS : [],
+			...extraIgnore
+		]
 	}).then((f) => f.sort((left, right) => left.localeCompare(right))));
 	const processFile = (filePath) => {
 		const code = fs.readFileSync(filePath, "utf-8");
@@ -34,7 +39,8 @@ const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants,
 			colorModes,
 			variantDefaults,
 			runtimeConfigValues,
-			includeAllClassNamePrimitives
+			includeAllClassNamePrimitives,
+			deferWrapperSpreadResolution: true
 		});
 		return purgeFromCodeOptimized(code, {
 			colorModes,
@@ -44,6 +50,7 @@ const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants,
 			autoVariants,
 			componentData,
 			includeAllClassNamePrimitives,
+			deferWrapperSpreadResolution: true,
 			filePath
 		});
 	};
@@ -56,7 +63,8 @@ const scanDirectoryForSafelist = async (dir, colorModes, variants, autoVariants,
 		components: [...allComponents],
 		filesScanned: files.length,
 		filesWithComponents,
-		filePaths: files
+		filePaths: files,
+		unresolvedWrapperSpreads: results.flatMap((result) => result.unresolvedWrapperSpreads ?? [])
 	};
 };
 const scanFileForSafelist = async (filePath, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false) => {
@@ -67,27 +75,36 @@ const scanFileForSafelist = async (filePath, colorModes, variants, autoVariants,
 		variants,
 		autoVariants,
 		componentData,
-		includeAllClassNamePrimitives
+		includeAllClassNamePrimitives,
+		deferWrapperSpreadResolution: true
 	});
 	return {
 		safelist: result.safelist,
 		components: result.components,
 		filesScanned: 1,
 		filesWithComponents: result.components.length > 0 ? 1 : 0,
-		filePaths: [filePath]
+		filePaths: [filePath],
+		unresolvedWrapperSpreads: result.unresolvedWrapperSpreads ?? []
 	};
 };
-const scanDirectoriesForSafelist = async (dirs, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool) => {
+const scanDirectoriesForSafelist = async (dirs, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives = false, pool, extraIgnore = [], ignoreDevFiles = true) => {
 	const results = await Promise.all(dirs.map((dir) => {
 		if (fs.existsSync(dir) && fs.statSync(dir).isFile()) return scanFileForSafelist(dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives);
-		return scanDirectoryForSafelist(dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives, pool);
+		return scanDirectoryForSafelist(dir, colorModes, variants, autoVariants, componentData, variantDefaults, runtimeConfigValues, includeAllClassNamePrimitives, pool, extraIgnore, ignoreDevFiles);
 	}));
+	const unresolvedWrapperSpreads = results.flatMap((result) => result.unresolvedWrapperSpreads);
+	const safelist = results.flatMap((result) => result.safelist);
+	if (unresolvedWrapperSpreads.length > 0) {
+		const sources = results.flatMap((result) => result.filePaths).map((filePath) => fs.readFileSync(filePath, "utf-8"));
+		safelist.push(...resolveWrapperSpreadSafelist(unresolvedWrapperSpreads, sources, variants));
+	}
 	return {
-		safelist: results.flatMap((result) => result.safelist),
+		safelist,
 		components: [...new Set(results.flatMap((result) => result.components))],
 		filesScanned: results.reduce((total, result) => total + result.filesScanned, 0),
 		filesWithComponents: results.reduce((total, result) => total + result.filesWithComponents, 0),
-		filePaths: results.flatMap((result) => result.filePaths).sort((left, right) => left.localeCompare(right))
+		filePaths: results.flatMap((result) => result.filePaths).sort((left, right) => left.localeCompare(right)),
+		unresolvedWrapperSpreads
 	};
 };
 const findMonorepoRoot = (startDir) => {

package/dist/css/dist/css/runner.cjs

@@ -4,6 +4,7 @@ const require_colors = require("../packages/cli/dist/lib/colors.cjs");
 const require_print = require("../packages/cli/dist/lib/print.cjs");
 const require_perf = require("./perf.cjs");
 const require_entryPoints = require("../../../tailwind-internal/dist/utils/entryPoints.cjs");
+const require_files = require("../purger/optimized/utils/files.cjs");
 const require_nodeUtils = require("./nodeUtils.cjs");
 const require_spinner = require("../packages/cli/dist/lib/spinner.cjs");
 const require_logger = require("../packages/cli/dist/lib/logger.cjs");
@@ -249,6 +250,10 @@ const runThemeMode = async (options, context) => {
 		effectiveSilent = setup.effectiveSilent;
 		log = require_logger.createLogger({ silent: effectiveSilent });
 		const entryDirs = entries.map((entry) => entry.absolutePath);
+		const includeDevFiles = options.includeDevFiles ?? themeConfig.includeDevFiles ?? false;
+		const includeStories = options.includeStories ?? themeConfig.includeStories ?? false;
+		const ignoreDevFiles = !includeDevFiles && !includeStories;
+		const scanIgnore = [...themeConfig.ignore ?? [], ...!includeDevFiles && includeStories ? require_files.TEST_FILE_IGNORE_GLOBS : []];
 		if (!effectiveSilent) log.spinStop("✅", "Theme configuration loaded");
 		if (themeConfig.config && appConfig === require_index.defaultTokensConfig) log.warn(`App config not found: ${themeConfig.config}, using defaults`);
 		const packageDirs = [];
@@ -280,7 +285,7 @@ const runThemeMode = async (options, context) => {
 					return {
 						packageName,
 						status: "ok",
-						scanResult: await require_nodeUtils.scanDirectoryForSafelist(packageDir, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, true, pool)
+						scanResult: await require_nodeUtils.scanDirectoryForSafelist(packageDir, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, true, pool, scanIgnore, ignoreDevFiles)
 					};
 				};
 				const processScopedPackage = async (packageName, scopedPackageValue) => {
@@ -304,7 +309,7 @@ const runThemeMode = async (options, context) => {
 					});
 				};
 				const [appScanResult, inheritedResults] = await Promise.all([
-					require_perf.measureAsync("scan", () => require_nodeUtils.scanDirectoriesForSafelist(entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, false, pool)),
+					require_perf.measureAsync("scan", () => require_nodeUtils.scanDirectoriesForSafelist(entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, false, pool, scanIgnore, ignoreDevFiles)),
 					Promise.all((themeConfig.inherit ?? []).map((packageName) => require_perf.measureAsync(`scan:inherit:${packageName}`, () => processInheritedPackage(packageName)))),
 					Promise.all(Object.entries(themeConfig.scoped ?? {}).map(([packageName, scopedPackageConfig]) => processScopedPackage(packageName, scopedPackageConfig)))
 				]);
@@ -364,7 +369,7 @@ const runThemeMode = async (options, context) => {
 					const packageConfig = await require_nodeUtils.loadConfigFile(isAbsolutePath(scopedPackageTarget.config.config) ? scopedPackageTarget.config.config : joinPath(scopedPackageTarget.packageRoot, scopedPackageTarget.config.config)) ?? require_index.defaultTokensConfig;
 					const packageVariantDefaults = require_utils.extractVariantDefaults(packageConfig);
 					const packageRuntimeConfigValues = require_utils.extractRuntimeConfigValues(packageConfig);
-					const packageScanResult = await require_nodeUtils.scanDirectoriesForSafelist(scopedPackageTarget.entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, packageVariantDefaults, packageRuntimeConfigValues, true, pool);
+					const packageScanResult = await require_nodeUtils.scanDirectoriesForSafelist(scopedPackageTarget.entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, packageVariantDefaults, packageRuntimeConfigValues, true, pool, scanIgnore, ignoreDevFiles);
 					genLog.spinStop("✅", require_runner_helpers.getScanSummaryMessage({
 						label: scopedPackageTarget.packageName,
 						filesScanned: packageScanResult.filesScanned,

package/dist/css/dist/css/runner.js

@@ -3,6 +3,7 @@ import { gray, green, magenta } from "../packages/cli/dist/lib/colors.js";
 import { print } from "../packages/cli/dist/lib/print.js";
 import { captureMemory, clearTimings, measureAsync, printPerfSummary } from "./perf.js";
 import { resolveEntryPaths } from "../../../tailwind-internal/dist/utils/entryPoints.js";
+import { TEST_FILE_IGNORE_GLOBS } from "../purger/optimized/utils/files.js";
 import { findPackageRoot, findPackageSourceDir, getPackageUdsScope, loadConfigFile, scanDirectoriesForSafelist, scanDirectoryForSafelist } from "./nodeUtils.js";
 import { spinStart, spinStop } from "../packages/cli/dist/lib/spinner.js";
 import { createLogger } from "../packages/cli/dist/lib/logger.js";
@@ -247,6 +248,10 @@ const runThemeMode = async (options, context) => {
 		effectiveSilent = setup.effectiveSilent;
 		log = createLogger({ silent: effectiveSilent });
 		const entryDirs = entries.map((entry) => entry.absolutePath);
+		const includeDevFiles = options.includeDevFiles ?? themeConfig.includeDevFiles ?? false;
+		const includeStories = options.includeStories ?? themeConfig.includeStories ?? false;
+		const ignoreDevFiles = !includeDevFiles && !includeStories;
+		const scanIgnore = [...themeConfig.ignore ?? [], ...!includeDevFiles && includeStories ? TEST_FILE_IGNORE_GLOBS : []];
 		if (!effectiveSilent) log.spinStop("✅", "Theme configuration loaded");
 		if (themeConfig.config && appConfig === defaultTokensConfig) log.warn(`App config not found: ${themeConfig.config}, using defaults`);
 		const packageDirs = [];
@@ -278,7 +283,7 @@ const runThemeMode = async (options, context) => {
 					return {
 						packageName,
 						status: "ok",
-						scanResult: await scanDirectoryForSafelist(packageDir, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, true, pool)
+						scanResult: await scanDirectoryForSafelist(packageDir, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, true, pool, scanIgnore, ignoreDevFiles)
 					};
 				};
 				const processScopedPackage = async (packageName, scopedPackageValue) => {
@@ -302,7 +307,7 @@ const runThemeMode = async (options, context) => {
 					});
 				};
 				const [appScanResult, inheritedResults] = await Promise.all([
-					measureAsync("scan", () => scanDirectoriesForSafelist(entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, false, pool)),
+					measureAsync("scan", () => scanDirectoriesForSafelist(entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, false, pool, scanIgnore, ignoreDevFiles)),
 					Promise.all((themeConfig.inherit ?? []).map((packageName) => measureAsync(`scan:inherit:${packageName}`, () => processInheritedPackage(packageName)))),
 					Promise.all(Object.entries(themeConfig.scoped ?? {}).map(([packageName, scopedPackageConfig]) => processScopedPackage(packageName, scopedPackageConfig)))
 				]);
@@ -362,7 +367,7 @@ const runThemeMode = async (options, context) => {
 					const packageConfig = await loadConfigFile(isAbsolutePath(scopedPackageTarget.config.config) ? scopedPackageTarget.config.config : joinPath(scopedPackageTarget.packageRoot, scopedPackageTarget.config.config)) ?? defaultTokensConfig;
 					const packageVariantDefaults = extractVariantDefaults(packageConfig);
 					const packageRuntimeConfigValues = extractRuntimeConfigValues(packageConfig);
-					const packageScanResult = await scanDirectoriesForSafelist(scopedPackageTarget.entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, packageVariantDefaults, packageRuntimeConfigValues, true, pool);
+					const packageScanResult = await scanDirectoriesForSafelist(scopedPackageTarget.entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, packageVariantDefaults, packageRuntimeConfigValues, true, pool, scanIgnore, ignoreDevFiles);
 					genLog.spinStop("✅", getScanSummaryMessage({
 						label: scopedPackageTarget.packageName,
 						filesScanned: packageScanResult.filesScanned,