@yahoo/uds 3.174.1 → 3.175.1

package/dist/css/dist/css/generate.helpers.d.cts

@@ -5,5 +5,11 @@ type TailwindSafelistConfig = string | {
   pattern: RegExp;
   variants?: string[];
 };
+/**
+ * Who owns utility (non-component) CSS in a generated bundle. `'emit'`
+ * compiles utilities from the entry content scan into the bundle;
+ * `'app-sheet'` omits them because the app's own Tailwind sheet supplies them.
+ */
+type UtilitiesMode = 'emit' | 'app-sheet';
 //#endregion
-export { TailwindSafelistConfig };
+export { TailwindSafelistConfig, UtilitiesMode };

package/dist/css/dist/css/generate.helpers.d.ts

@@ -7,5 +7,11 @@ type TailwindSafelistConfig = string | {
   pattern: RegExp;
   variants?: string[];
 };
+/**
+ * Who owns utility (non-component) CSS in a generated bundle. `'emit'`
+ * compiles utilities from the entry content scan into the bundle;
+ * `'app-sheet'` omits them because the app's own Tailwind sheet supplies them.
+ */
+type UtilitiesMode = 'emit' | 'app-sheet';
 //#endregion
-export { TailwindSafelistConfig };
+export { TailwindSafelistConfig, UtilitiesMode };

package/dist/css/dist/css/generate.helpers.js

@@ -41,6 +41,10 @@ const getRawContentEntries = (rawContents) => rawContents.map((rawContent) => ({
 	raw: rawContent,
 	extension: "html"
 }));
+const getTailwindContentSources = (options) => {
+	const sources = [...options.utilities === "app-sheet" ? [] : getContentGlobs(options.contentDir), ...getRawContentEntries(options.rawContents)];
+	return sources.length > 0 ? sources : getRawContentEntries([""]);
+};
 const getTailwindEntrypointCandidates = () => [new URL("../../../tailwind-internal/dist/vendor/tailwindcss/lib/index.js", import.meta.url), new URL("../vendor/tailwindcss/lib/index.js", import.meta.url)];
 const loadTailwindcss = async () => {
 	for (const candidate of getTailwindEntrypointCandidates()) {
@@ -64,11 +68,11 @@ const getInternalIconModeCss = (scopeClass) => {
 };
 const createTailwindPlugin = async (options) => {
 	return (await loadTailwindcss())({
-		content: [
-			...getContentGlobs(options.contentDir),
-			...getRawContentEntries(getInternalSafelistRawContent(options.safelist)),
-			...getRawContentEntries(options.rawContents ?? [])
-		],
+		content: getTailwindContentSources({
+			contentDir: options.contentDir,
+			utilities: options.utilities,
+			rawContents: [...getInternalSafelistRawContent(options.safelist), ...options.rawContents ?? []]
+		}),
 		safelist: options.safelist,
 		corePlugins: { preflight: options.enablePreflight },
 		plugins: [tailwindPlugin({

package/dist/css/dist/css/generate.js

@@ -45,7 +45,8 @@ const generateCSS = async (safelist, config, options) => {
 			config,
 			enablePreflight: cssFlags.enablePreflight,
 			enableFontFaceDeclarations: cssFlags.enableFontFaceDeclarations,
-			emit: options?.cssOptions?.emit
+			emit: options?.cssOptions?.emit,
+			utilities: options?.cssOptions?.utilities
 		}),
 		shouldPruneVars: cssFlags.shouldPruneVars,
 		safeVarPrefixes: options?.safeVarPrefixes ?? [],
@@ -105,6 +106,7 @@ const generateSimpleModeCSS = async (options) => {
 		scope: options.scope,
 		contentDir: entryDirs,
 		variantClassMaps: [options.variants, options.autoVariants],
+		cssOptions: { utilities: options.utilities },
 		safeVarPrefixes: [...getMotionVarPrefixes(options.componentData, [...allComponents]), ...getConfigurableCssVariables()]
 	});
 	const outputPath = path.isAbsolute(options.outFile) ? options.outFile : path.join(options.workspaceDir, options.outFile);

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

@@ -151,6 +151,7 @@ const runSimpleMode = async (options, context) => {
 			autoVariants: context.autoVariants,
 			componentData: context.componentData,
 			scope: options.scope,
+			utilities: options.utilities,
 			configPath,
 			isWatch: options.watch,
 			silent: options.silent,
@@ -348,6 +349,8 @@ const runThemeMode = async (options, context) => {
 				]);
 				const allMotionComponents = [...inheritedComponents];
 				const emit = options.emit ?? themeConfig.css?.emit ?? "exhaustive";
+				const utilities = options.utilities ?? themeConfig.css?.utilities ?? "emit";
+				if (utilities === "app-sheet" && scopedPackageTargets.length > 0) genLog.warn(`css.utilities 'app-sheet' ignored for scoped bundles (${scopedPackageTargets.map((target) => target.packageName).join(", ")}): package sources aren't in any app sheet's content scan; utilities still emitted (scoped).`);
 				const allBoundarySelectors = [...emit === "selective" ? scopedPackageTargets.map((target) => target.scopeClass) : [], ...themeConfig.css?.excludeBoundaries ?? []];
 				require_perf.captureMemory("before-gen");
 				const mainCssResult = await require_perf.measureAsync("gen", () => require_generate.generateCSS([...themeConfig.css?.safelist ?? [], ...mainSafelist], appConfig, {
@@ -355,7 +358,8 @@ const runThemeMode = async (options, context) => {
 					contentDir: entryDirs,
 					cssOptions: {
 						...themeConfig.css,
-						emit
+						emit,
+						utilities
 					},
 					otherBoundaryScopes: allBoundarySelectors,
 					variantClassMaps: [context.variants, context.autoVariants],
@@ -391,7 +395,8 @@ const runThemeMode = async (options, context) => {
 						contentDir: scopedPackageTarget.entryDirs,
 						cssOptions: {
 							...themeConfig.css,
-							emit
+							emit,
+							utilities: "emit"
 						},
 						otherBoundaryScopes: allBoundarySelectors.filter((selector) => selector !== scopedPackageTarget.scopeClass),
 						variantClassMaps: [context.variants, context.autoVariants],

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

@@ -149,6 +149,7 @@ const runSimpleMode = async (options, context) => {
 			autoVariants: context.autoVariants,
 			componentData: context.componentData,
 			scope: options.scope,
+			utilities: options.utilities,
 			configPath,
 			isWatch: options.watch,
 			silent: options.silent,
@@ -346,6 +347,8 @@ const runThemeMode = async (options, context) => {
 				]);
 				const allMotionComponents = [...inheritedComponents];
 				const emit = options.emit ?? themeConfig.css?.emit ?? "exhaustive";
+				const utilities = options.utilities ?? themeConfig.css?.utilities ?? "emit";
+				if (utilities === "app-sheet" && scopedPackageTargets.length > 0) genLog.warn(`css.utilities 'app-sheet' ignored for scoped bundles (${scopedPackageTargets.map((target) => target.packageName).join(", ")}): package sources aren't in any app sheet's content scan; utilities still emitted (scoped).`);
 				const allBoundarySelectors = [...emit === "selective" ? scopedPackageTargets.map((target) => target.scopeClass) : [], ...themeConfig.css?.excludeBoundaries ?? []];
 				captureMemory("before-gen");
 				const mainCssResult = await measureAsync("gen", () => generateCSS([...themeConfig.css?.safelist ?? [], ...mainSafelist], appConfig, {
@@ -353,7 +356,8 @@ const runThemeMode = async (options, context) => {
 					contentDir: entryDirs,
 					cssOptions: {
 						...themeConfig.css,
-						emit
+						emit,
+						utilities
 					},
 					otherBoundaryScopes: allBoundarySelectors,
 					variantClassMaps: [context.variants, context.autoVariants],
@@ -389,7 +393,8 @@ const runThemeMode = async (options, context) => {
 						contentDir: scopedPackageTarget.entryDirs,
 						cssOptions: {
 							...themeConfig.css,
-							emit
+							emit,
+							utilities: "emit"
 						},
 						otherBoundaryScopes: allBoundarySelectors.filter((selector) => selector !== scopedPackageTarget.scopeClass),
 						variantClassMaps: [context.variants, context.autoVariants],

package/dist/css/dist/purger/optimized/purgeFromCode.cjs

@@ -238,6 +238,37 @@ const purgeFromCodeOptimized = async (code, options) => {
 		if (!componentProps.has(imp)) componentProps.set(imp, /* @__PURE__ */ new Map());
 		if (!componentUnresolvedSpreadProps.has(imp)) componentUnresolvedSpreadProps.set(imp, /* @__PURE__ */ new Set());
 	});
+	imports.forEach((imp) => {
+		const factoryInfo = resolveComponentInfo(imp);
+		const targetName = factoryInfo?.factoryTarget;
+		const targetInfo = targetName ? resolveComponentInfo(targetName) : void 0;
+		if (!factoryInfo || !targetInfo) return;
+		referencedComponents.add(targetInfo.name);
+		const propsMap = componentProps.get(targetInfo.name) ?? /* @__PURE__ */ new Map();
+		const addPropValues = (propName, values) => {
+			if (values.length === 0) return;
+			const existing = propsMap.get(propName) ?? /* @__PURE__ */ new Set();
+			values.forEach((value) => existing.add(value));
+			propsMap.set(propName, existing);
+		};
+		Object.entries(factoryInfo.internalComponentProps[targetInfo.name] ?? {}).forEach(([propName, values]) => addPropValues(propName, values));
+		const localNames = getFactoryLocalNames(source, imp);
+		const apiNames = /* @__PURE__ */ new Set();
+		source.callExpressions.forEach((call) => {
+			if (call.callee.type !== "Identifier" || !localNames.has(call.callee.name)) return;
+			extractFactoryCallArgProps(call.arguments[0], source).forEach(([propName, values]) => addPropValues(propName, values));
+			const parent = source.parents.get(call);
+			if (parent?.type === "VariableDeclarator" && parent.id.type === "Identifier") apiNames.add(parent.id.name);
+			stats.expressionsResolved++;
+		});
+		if (apiNames.size > 0) source.callExpressions.forEach((call) => {
+			const callee = call.callee;
+			if (callee.type !== "MemberExpression" || callee.object.type !== "Identifier" || !apiNames.has(callee.object.name) || callee.property.type !== "Identifier" || callee.property.name !== "update") return;
+			extractFactoryCallArgProps(call.arguments[0], source).forEach(([propName, values]) => addPropValues(propName, values));
+		});
+		componentProps.set(targetInfo.name, propsMap);
+		if (!componentUnresolvedSpreadProps.has(targetInfo.name)) componentUnresolvedSpreadProps.set(targetInfo.name, /* @__PURE__ */ new Set());
+	});
 	const jsxAnalysisMs = performance.now() - jsxAnalysisStart;
 	const safelistGenStart = performance.now();
 	const allComponents = [];
@@ -392,6 +423,37 @@ const purgeFromCodeOptimized = async (code, options) => {
 	};
 };
 /**
+* Local aliases a UDS import is bound to in this file (handles `import { createToast as x }`)
+*/
+const getFactoryLocalNames = (source, importName) => {
+	const localNames = /* @__PURE__ */ new Set();
+	source.staticImports.forEach((staticImport) => {
+		if (!isUdsComponentModule(staticImport.moduleRequest.value)) return;
+		staticImport.entries.forEach((entry) => {
+			if (entry.importName.kind === "Name" && entry.importName.name === importName && !entry.isType) localNames.add(entry.localName.value);
+		});
+	});
+	return localNames;
+};
+/**
+* Extract prop literals from a factory call's first argument: an inline object
+* literal, or a same-file object variable (reuses spread tracing).
+*/
+const extractFactoryCallArgProps = (firstArg, source) => {
+	if (!firstArg) return [];
+	if (firstArg.type === "Identifier") return traceSpreadInFile(firstArg.name, source);
+	const props = [];
+	getSpreadObjectLiteralCandidates(firstArg).forEach((objLiteral) => {
+		objLiteral.properties.forEach((prop) => {
+			if (prop.type !== "Property") return;
+			const propName = require_oxc.getPropertyName(source, prop);
+			const values = prop.value ? require_expressions.extractStringLiterals(prop.value, source) : [];
+			props.push([propName, values]);
+		});
+	});
+	return props;
+};
+/**
 * Find JSX references for a component in the source file
 */
 const findComponentReferences = (source, componentName) => {

package/dist/css/dist/purger/optimized/purgeFromCode.js

@@ -238,6 +238,37 @@ const purgeFromCodeOptimized = async (code, options) => {
 		if (!componentProps.has(imp)) componentProps.set(imp, /* @__PURE__ */ new Map());
 		if (!componentUnresolvedSpreadProps.has(imp)) componentUnresolvedSpreadProps.set(imp, /* @__PURE__ */ new Set());
 	});
+	imports.forEach((imp) => {
+		const factoryInfo = resolveComponentInfo(imp);
+		const targetName = factoryInfo?.factoryTarget;
+		const targetInfo = targetName ? resolveComponentInfo(targetName) : void 0;
+		if (!factoryInfo || !targetInfo) return;
+		referencedComponents.add(targetInfo.name);
+		const propsMap = componentProps.get(targetInfo.name) ?? /* @__PURE__ */ new Map();
+		const addPropValues = (propName, values) => {
+			if (values.length === 0) return;
+			const existing = propsMap.get(propName) ?? /* @__PURE__ */ new Set();
+			values.forEach((value) => existing.add(value));
+			propsMap.set(propName, existing);
+		};
+		Object.entries(factoryInfo.internalComponentProps[targetInfo.name] ?? {}).forEach(([propName, values]) => addPropValues(propName, values));
+		const localNames = getFactoryLocalNames(source, imp);
+		const apiNames = /* @__PURE__ */ new Set();
+		source.callExpressions.forEach((call) => {
+			if (call.callee.type !== "Identifier" || !localNames.has(call.callee.name)) return;
+			extractFactoryCallArgProps(call.arguments[0], source).forEach(([propName, values]) => addPropValues(propName, values));
+			const parent = source.parents.get(call);
+			if (parent?.type === "VariableDeclarator" && parent.id.type === "Identifier") apiNames.add(parent.id.name);
+			stats.expressionsResolved++;
+		});
+		if (apiNames.size > 0) source.callExpressions.forEach((call) => {
+			const callee = call.callee;
+			if (callee.type !== "MemberExpression" || callee.object.type !== "Identifier" || !apiNames.has(callee.object.name) || callee.property.type !== "Identifier" || callee.property.name !== "update") return;
+			extractFactoryCallArgProps(call.arguments[0], source).forEach(([propName, values]) => addPropValues(propName, values));
+		});
+		componentProps.set(targetInfo.name, propsMap);
+		if (!componentUnresolvedSpreadProps.has(targetInfo.name)) componentUnresolvedSpreadProps.set(targetInfo.name, /* @__PURE__ */ new Set());
+	});
 	const jsxAnalysisMs = performance.now() - jsxAnalysisStart;
 	const safelistGenStart = performance.now();
 	const allComponents = [];
@@ -392,6 +423,37 @@ const purgeFromCodeOptimized = async (code, options) => {
 	};
 };
 /**
+* Local aliases a UDS import is bound to in this file (handles `import { createToast as x }`)
+*/
+const getFactoryLocalNames = (source, importName) => {
+	const localNames = /* @__PURE__ */ new Set();
+	source.staticImports.forEach((staticImport) => {
+		if (!isUdsComponentModule(staticImport.moduleRequest.value)) return;
+		staticImport.entries.forEach((entry) => {
+			if (entry.importName.kind === "Name" && entry.importName.name === importName && !entry.isType) localNames.add(entry.localName.value);
+		});
+	});
+	return localNames;
+};
+/**
+* Extract prop literals from a factory call's first argument: an inline object
+* literal, or a same-file object variable (reuses spread tracing).
+*/
+const extractFactoryCallArgProps = (firstArg, source) => {
+	if (!firstArg) return [];
+	if (firstArg.type === "Identifier") return traceSpreadInFile(firstArg.name, source);
+	const props = [];
+	getSpreadObjectLiteralCandidates(firstArg).forEach((objLiteral) => {
+		objLiteral.properties.forEach((prop) => {
+			if (prop.type !== "Property") return;
+			const propName = getPropertyName(source, prop);
+			const values = prop.value ? extractStringLiterals(prop.value, source) : [];
+			props.push([propName, values]);
+		});
+	});
+	return props;
+};
+/**
 * Find JSX references for a component in the source file
 */
 const findComponentReferences = (source, componentName) => {