weapp-tailwindcss 5.3.2 → 5.3.3

package/dist/{v4-generation-core-BfeXEc6R.cjs → v4-generation-core-8YMXikPd.cjs}

@@ -2,9 +2,9 @@ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
 const require_generator = require("./generator-DKiYbTFR.cjs");
 require("./auto-DtU6f3X6.cjs");
 const require_object = require("./object-DbHtAXRk.cjs");
-const require_options = require("./options-CKZW99r4.cjs");
+const require_options = require("./options-BJrtIQbH.cjs");
 const require_wxml = require("./wxml-CQmBCjOR.cjs");
-const require_style_options = require("./style-options-PCgz2ywM.cjs");
+const require_style_options = require("./style-options-DW30H5PV.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -312,9 +312,11 @@ function createSourceCandidateStore(options = {}) {
 	const scanCandidatesById = /* @__PURE__ */ new Map();
 	const transformCandidatesById = /* @__PURE__ */ new Map();
 	const cssCandidatesById = /* @__PURE__ */ new Map();
+	const moduleCandidatesById = /* @__PURE__ */ new Map();
 	const scanSourceById = /* @__PURE__ */ new Map();
 	const transformSourceById = /* @__PURE__ */ new Map();
 	const cssSourceById = /* @__PURE__ */ new Map();
+	const moduleSourceById = /* @__PURE__ */ new Map();
 	const candidateCount = /* @__PURE__ */ new Map();
 	let inlineIncludedCandidates = /* @__PURE__ */ new Set();
 	let inlineExcludedCandidates = /* @__PURE__ */ new Set();
@@ -345,6 +347,13 @@ function createSourceCandidateStore(options = {}) {
 		cssSourceById.set(normalizedId, source);
 		replaceCssLayer(normalizedId, await resolveCandidates(source, "css"));
 	}
+	async function syncModuleSource(id, source) {
+		const normalizedId = cleanUrl(id);
+		moduleSourceById.set(normalizedId, source);
+		const candidates = await resolveCandidates(source, resolveSourceCandidateExtension(normalizedId));
+		replaceModuleLayer(normalizedId, candidates);
+		return new Set(candidates);
+	}
 	async function merge(id, source) {
 		const normalizedId = cleanUrl(id);
 		transformSourceById.set(normalizedId, source);
@@ -372,8 +381,10 @@ function createSourceCandidateStore(options = {}) {
 		if (extension !== "css") {
 			transformCandidatesById.delete(normalizedId);
 			cssCandidatesById.delete(normalizedId);
+			moduleCandidatesById.delete(normalizedId);
 			transformSourceById.delete(normalizedId);
 			cssSourceById.delete(normalizedId);
+			moduleSourceById.delete(normalizedId);
 		}
 		scanSourceById.set(normalizedId, source);
 		replaceScanLayer(normalizedId, nextCandidates);
@@ -431,12 +442,19 @@ function createSourceCandidateStore(options = {}) {
 		else cssCandidatesById.set(normalizedId, nextCandidates);
 		recompute(normalizedId);
 	}
+	function replaceModuleLayer(id, nextCandidates) {
+		const normalizedId = cleanUrl(id);
+		if (nextCandidates.size === 0) moduleCandidatesById.delete(normalizedId);
+		else moduleCandidatesById.set(normalizedId, nextCandidates);
+		recompute(normalizedId);
+	}
 	function recompute(id) {
 		const normalizedId = cleanUrl(id);
 		replaceFinal(normalizedId, /* @__PURE__ */ new Set([
 			...scanCandidatesById.get(normalizedId) ?? [],
 			...transformCandidatesById.get(normalizedId) ?? [],
-			...cssCandidatesById.get(normalizedId) ?? []
+			...cssCandidatesById.get(normalizedId) ?? [],
+			...moduleCandidatesById.get(normalizedId) ?? []
 		]));
 	}
 	function syncInline(inlineCandidates) {
@@ -450,9 +468,11 @@ function createSourceCandidateStore(options = {}) {
 		scanCandidatesById.delete(normalizedId);
 		transformCandidatesById.delete(normalizedId);
 		cssCandidatesById.delete(normalizedId);
+		moduleCandidatesById.delete(normalizedId);
 		scanSourceById.delete(normalizedId);
 		transformSourceById.delete(normalizedId);
 		cssSourceById.delete(normalizedId);
+		moduleSourceById.delete(normalizedId);
 		const previousCandidates = candidatesById.get(normalizedId);
 		if (!previousCandidates) return diffCandidateSets(previousVisibleCandidates, /* @__PURE__ */ new Set());
 		removeCandidateSet(candidateCount, previousCandidates);
@@ -461,7 +481,7 @@ function createSourceCandidateStore(options = {}) {
 	}
 	function source(id) {
 		const normalizedId = cleanUrl(id);
-		return scanSourceById.get(normalizedId) ?? cssSourceById.get(normalizedId) ?? transformSourceById.get(normalizedId);
+		return scanSourceById.get(normalizedId) ?? cssSourceById.get(normalizedId) ?? transformSourceById.get(normalizedId) ?? moduleSourceById.get(normalizedId);
 	}
 	function sources() {
 		return mergeSourcesByPriority().entries();
@@ -475,10 +495,10 @@ function createSourceCandidateStore(options = {}) {
 		if (entries === void 0) {
 			if (!options.excludeEntries?.length) return values();
 		}
-		if (entries?.length === 0) return new Set(inlineIncludedCandidates);
 		const filtered = /* @__PURE__ */ new Set();
 		for (const [id, candidates] of candidatesById) {
-			if (entries !== void 0 && !require_generator.isFileMatchedByTailwindSourceEntries(id, entries)) continue;
+			const isActiveModule = moduleCandidatesById.has(id);
+			if (entries !== void 0 && (isActiveModule ? require_generator.isFileExcludedByTailwindSourceEntries(id, entries) : entries.length === 0 || !require_generator.isFileMatchedByTailwindSourceEntries(id, entries))) continue;
 			if (options.excludeEntries?.length && require_generator.isFileMatchedByTailwindSourceEntries(id, options.excludeEntries)) continue;
 			for (const candidate of candidates) filtered.add(candidate);
 		}
@@ -496,13 +516,9 @@ function createSourceCandidateStore(options = {}) {
 			}
 			if (id) candidateSources.add(id);
 		};
-		if (entries?.length === 0) {
-			for (const candidate of inlineIncludedCandidates) addCandidateSource(candidate, void 0);
-			for (const candidate of inlineExcludedCandidates) sources.delete(candidate);
-			return sources;
-		}
 		for (const [id, candidates] of candidatesById) {
-			if (entries !== void 0 && !require_generator.isFileMatchedByTailwindSourceEntries(id, entries)) continue;
+			const isActiveModule = moduleCandidatesById.has(id);
+			if (entries !== void 0 && (isActiveModule ? require_generator.isFileExcludedByTailwindSourceEntries(id, entries) : entries.length === 0 || !require_generator.isFileMatchedByTailwindSourceEntries(id, entries))) continue;
 			if (options.excludeEntries?.length && require_generator.isFileMatchedByTailwindSourceEntries(id, options.excludeEntries)) continue;
 			for (const candidate of candidates) addCandidateSource(candidate, id);
 		}
@@ -515,9 +531,11 @@ function createSourceCandidateStore(options = {}) {
 		scanCandidatesById.clear();
 		transformCandidatesById.clear();
 		cssCandidatesById.clear();
+		moduleCandidatesById.clear();
 		scanSourceById.clear();
 		transformSourceById.clear();
 		cssSourceById.clear();
+		moduleSourceById.clear();
 		candidateCount.clear();
 		inlineIncludedCandidates.clear();
 		inlineExcludedCandidates.clear();
@@ -539,6 +557,8 @@ function createSourceCandidateStore(options = {}) {
 			candidatesById: [...candidatesById.entries()].map(([id, candidates]) => [id, [...candidates]]),
 			cssCandidatesById: [...cssCandidatesById.entries()].map(([id, candidates]) => [id, [...candidates]]),
 			cssSourceById: [...cssSourceById.entries()],
+			moduleCandidatesById: [...moduleCandidatesById.entries()].map(([id, candidates]) => [id, [...candidates]]),
+			moduleSourceById: [...moduleSourceById.entries()],
 			scanCandidatesById: [...scanCandidatesById.entries()].map(([id, candidates]) => [id, [...candidates]]),
 			scanSourceById: [...scanSourceById.entries()],
 			sourceById: [...mergeSourcesByPriority().entries()],
@@ -568,13 +588,20 @@ function createSourceCandidateStore(options = {}) {
 			if (candidateSet.size === 0) continue;
 			cssCandidatesById.set(id, candidateSet);
 		}
+		for (const [id, candidates] of snapshot.moduleCandidatesById ?? []) {
+			const candidateSet = new Set(candidates);
+			if (candidateSet.size === 0) continue;
+			moduleCandidatesById.set(id, candidateSet);
+		}
 		for (const [id, source] of snapshot.scanSourceById ?? snapshot.sourceById ?? []) scanSourceById.set(id, source);
 		for (const [id, source] of snapshot.transformSourceById ?? []) transformSourceById.set(id, source);
 		for (const [id, source] of snapshot.cssSourceById ?? []) cssSourceById.set(id, source);
+		for (const [id, source] of snapshot.moduleSourceById ?? []) moduleSourceById.set(id, source);
 		const ids = /* @__PURE__ */ new Set([
 			...scanCandidatesById.keys(),
 			...transformCandidatesById.keys(),
-			...cssCandidatesById.keys()
+			...cssCandidatesById.keys(),
+			...moduleCandidatesById.keys()
 		]);
 		for (const id of ids) recompute(id);
 	}
@@ -582,6 +609,7 @@ function createSourceCandidateStore(options = {}) {
 		syncSource: sync,
 		sync,
 		syncCss,
+		syncModuleSource,
 		merge,
 		syncFile,
 		syncCurrentSource,
@@ -603,6 +631,7 @@ function createSourceCandidateStore(options = {}) {
 	};
 	function mergeSourcesByPriority() {
 		const sources = /* @__PURE__ */ new Map();
+		for (const [id, source] of moduleSourceById) sources.set(id, source);
 		for (const [id, source] of transformSourceById) sources.set(id, source);
 		for (const [id, source] of cssSourceById) sources.set(id, source);
 		for (const [id, source] of scanSourceById) sources.set(id, source);

package/dist/{vite-Dy6THt54.cjs → vite-CeyMHgzQ.cjs}

@@ -2,17 +2,17 @@ const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
 const require_framework = require("./framework.cjs");
 const require_generator = require("./generator-DKiYbTFR.cjs");
 const require_object = require("./object-DbHtAXRk.cjs");
-const require_options = require("./options-CKZW99r4.cjs");
+const require_options = require("./options-BJrtIQbH.cjs");
 require("./utils-CuKLf1Zv.cjs");
-const require_v4_generation_core = require("./v4-generation-core-BfeXEc6R.cjs");
+const require_v4_generation_core = require("./v4-generation-core-8YMXikPd.cjs");
 const require_wxml = require("./wxml-CQmBCjOR.cjs");
-const require_hmr_timing = require("./hmr-timing-W3kro20F.cjs");
-const require_context = require("./context-CB4Ef9U0.cjs");
-const require_tailwindcss = require("./tailwindcss-jKzY37Sk.cjs");
-const require_style_options = require("./style-options-PCgz2ywM.cjs");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-BSad7bMQ.cjs");
+const require_hmr_timing = require("./hmr-timing-DyiiYupC.cjs");
+const require_context = require("./context-Ulhcd5lF.cjs");
+const require_tailwindcss = require("./tailwindcss-CexDJBhx.cjs");
+const require_style_options = require("./style-options-DW30H5PV.cjs");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-bJFr7L8T.cjs");
+const require_local_style_matcher = require("./local-style-matcher-DRpFEu1s.cjs");
 require("./logger-TlKT3xmR.cjs");
-const require_component_local_style = require("./component-local-style-CNhEhd2B.cjs");
 const require_css_imports = require("./css-imports-BFMU7Hpd.cjs");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
@@ -507,6 +507,18 @@ const APP_JS_RE$1 = /(?:^|\/)App\.js$/;
 const COMPONENT_JS_RE = /(?:^|\/)components\/.+\.js$/;
 const STYLE_DECL_RE = /const\s+(_style_\d+)\s*=\s*\{/g;
 const EXPORT_SFC_RE = /_export_sfc\(_sfc_main\s*,\s*\[/;
+function resolveSfcSourceId(code) {
+	const match = code.match(/\[\s*["']__file["']\s*,\s*(["'])(.*?)\1\s*\]/);
+	return match?.[2] ? require_local_style_matcher.normalizeUniAppXLocalStyleId(match[2]) : void 0;
+}
+function shouldExcludeComponent(file, code, options) {
+	if (!options.excludeComponents) return false;
+	const sourceId = resolveSfcSourceId(code);
+	if (sourceId) return require_local_style_matcher.shouldEnableComponentLocalStyle(sourceId, options.componentMatcher);
+	const normalizedFile = require_local_style_matcher.normalizeUniAppXLocalStyleId(file);
+	if (options.componentMatcher?.(normalizedFile)) return true;
+	return COMPONENT_JS_RE.test(normalizedFile);
+}
 function resolveStyleAssetFile(file) {
 	if (!UVUE_TS_RE.test(file)) return;
 	return file.replace(/\.uvue\.ts$/, ".uvue");
@@ -610,7 +622,7 @@ function injectStyleOption(code, styleVarName) {
 }
 function injectUniAppXHarmonyGlobalStyles(file, code, getBundleSource, options = {}) {
 	if (!JS_RE.test(file) || APP_JS_RE$1.test(file)) return code;
-	if (options.excludeComponents && COMPONENT_JS_RE.test(file)) return code;
+	if (shouldExcludeComponent(file, code, options)) return code;
 	const appSource = getBundleSource?.("assets/App.js") ?? getBundleSource?.("App.js");
 	const appStyle = appSource ? mergeStyleValues(...findStyleObjectDecls(appSource).map((decl) => parseStyleObject(decl.objectText))) : void 0;
 	const parseableLocalStyles = findStyleObjectDecls(code).flatMap((decl) => {
@@ -6315,7 +6327,7 @@ function createUniAppXWebLocalStyleBridge(isEnabled) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-CgohToUV.cjs")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-BQjg2T2T.cjs")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const UVUE_NVUE_QUERY_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;
@@ -6324,7 +6336,7 @@ function resolveUniAppXJsTransformEnabled(uniAppX) {
 	return uniAppX === void 0 ? true : require_options.isUniAppXEnabled(uniAppX);
 }
 function createUniAppXPlugins(options) {
-	const { appType, customAttributesEntities, disabledDefaultTemplateHandler, isIosPlatform: providedIosPlatform, mainCssChunkMatcher, runtimeState, styleHandler, syncSourceCandidatesForHotUpdate, tailwindRootCssModuleIds = [], generateCss, jsHandler, ensureRuntimeClassSet, getResolvedConfig, isEnabled = () => true, isNativeAppStyleTarget = () => false, isWebGeneratorTarget = () => require_generator.resolveUniUtsPlatform().isWeb, uniAppX, viteProcessedCssSourceFiles = [] } = options;
+	const { appType, customAttributesEntities, disabledDefaultTemplateHandler, isIosPlatform: providedIosPlatform, mainCssChunkMatcher, registerModuleGraphCandidates, runtimeState, styleHandler, syncSourceCandidatesForHotUpdate, tailwindRootCssModuleIds = [], generateCss, jsHandler, ensureRuntimeClassSet, getResolvedConfig, isEnabled = () => true, isNativeAppStyleTarget = () => false, isWebGeneratorTarget = () => require_generator.resolveUniUtsPlatform().isWeb, uniAppX, viteProcessedCssSourceFiles = [] } = options;
 	const resolvedUniAppXOptions = require_options.resolveUniAppXOptions(uniAppX);
 	const utsPlatform = require_generator.resolveUniUtsPlatform();
 	const isIosPlatform = providedIosPlatform ?? utsPlatform.isAppIos;
@@ -6356,7 +6368,7 @@ function createUniAppXPlugins(options) {
 		return componentLocalStyleEnabled;
 	}
 	function shouldEnablePageLocalStyleForFile(id) {
-		return resolvedUniAppXOptions.componentLocalStyles.enabled && (isNativeAppBuildTarget(id) || require_component_local_style.shouldEnablePageLocalStyle(id));
+		return resolvedUniAppXOptions.componentLocalStyles.enabled && (isNativeAppBuildTarget(id) || require_local_style_matcher.shouldEnablePageLocalStyle(id, resolvedUniAppXOptions.componentLocalStyles.pageMatcher));
 	}
 	function isHarmonyBuildTarget() {
 		if (require_generator.resolveUniUtsPlatform().isAppHarmony) return true;
@@ -6461,18 +6473,22 @@ function createUniAppXPlugins(options) {
 			nativeLocalStyleModuleIds.add((0, _weapp_tailwindcss_shared.cleanUrl)(id));
 		}
 		harmonyApply.rememberSource(code, id, true);
+		const enableComponentLocalStyle = shouldEnableComponentLocalStyle();
+		const enablePageLocalStyle = shouldEnablePageLocalStyleForFile(id);
 		const resolvedConfig = getResolvedConfig();
 		const shouldForceRefresh = resolvedConfig?.command === "serve" || resolvedConfig?.command === "build";
-		const currentRuntimeSet = await ensureRuntimeClassSet(shouldForceRefresh);
+		const moduleGraphCandidates = enableComponentLocalStyle || enablePageLocalStyle ? await registerModuleGraphCandidates?.(id, code) : void 0;
+		const runtimeSet = await ensureRuntimeClassSet(shouldForceRefresh);
+		const currentRuntimeSet = moduleGraphCandidates?.size ? /* @__PURE__ */ new Set([...runtimeSet, ...moduleGraphCandidates]) : runtimeSet;
 		nativeHmrReloader.remember(currentRuntimeSet);
 		const transformUVue = await loadTransformUVue();
-		const enableComponentLocalStyle = shouldEnableComponentLocalStyle();
-		const enablePageLocalStyle = shouldEnablePageLocalStyleForFile(id);
 		const transformOptions = require_object.omitUndefined({
+			componentMatcher: resolvedUniAppXOptions.componentLocalStyles.componentMatcher,
 			...customAttributesEntities.length > 0 ? { customAttributesEntities } : {},
 			...disabledDefaultTemplateHandler ? { disabledDefaultTemplateHandler } : {},
 			...enableComponentLocalStyle ? { enableComponentLocalStyle } : {},
 			...enablePageLocalStyle ? { enablePageLocalStyle } : {},
+			pageMatcher: resolvedUniAppXOptions.componentLocalStyles.pageMatcher,
 			...isWebGeneratorTarget() && customAttributesEntities.length > 0 ? { webCustomAttributeDeep: true } : {},
 			...isWebGeneratorTarget() ? { onWebLocalStyleRules: (rules) => webLocalStyle.remember(id, rules) } : {}
 		});
@@ -6545,6 +6561,7 @@ function createUniAppXPlugins(options) {
 					}
 					injectUniAppXHarmonyBundleStyles(bundle, {
 						cssSources,
+						componentMatcher: resolvedUniAppXOptions.componentLocalStyles.componentMatcher,
 						excludeComponents: shouldEnableComponentLocalStyle()
 					});
 				}
@@ -9476,6 +9493,29 @@ function createViteHmrCandidateState(options) {
 	};
 }
 //#endregion
+//#region src/bundlers/vite/shared/framework-module-candidates.ts
+function createFrameworkModuleCandidateRegistrar(options) {
+	return async (id, source) => {
+		await options.runtimeState.readyPromise;
+		const candidates = await options.sourceCandidateCollector.syncModuleSource(id, source);
+		options.invalidateRecordedGeneratorCandidates();
+		options.cacheCurrent();
+		const cssHandlerOptions = options.getCssHandlerOptions(id);
+		return require_v4_generation_core.validateCandidatesByGenerator({
+			candidates,
+			cssHandlerOptions,
+			cssUserHandlerOptions: cssHandlerOptions,
+			debug: options.debug,
+			file: (0, _weapp_tailwindcss_shared.cleanUrl)(id),
+			generatorPlatform: options.getGeneratorPlatform(),
+			opts: options.opts,
+			rawSource: "",
+			runtimeState: options.runtimeState,
+			styleHandler: options.styleHandler
+		});
+	};
+}
+//#endregion
 //#region src/bundlers/vite/shared/framework-plugin-order.ts
 function orderFrameworkSourceCandidatePlugins(extraPlugins, rewritePlugins, sourceCandidatesPlugin, beforeExtraPlugin) {
 	const anchor = beforeExtraPlugin ? extraPlugins.findIndex(beforeExtraPlugin) : -1;
@@ -10783,6 +10823,17 @@ ${tracedCss}`;
 	});
 	const extraPluginPlatform = frameworkBranch.getExtraPluginPlatform?.() ?? {};
 	const syncSourceCandidatesForHotUpdate = (ctx) => syncFrameworkSourceCandidatesForHotUpdate(sourceScanSession, ctx);
+	const registerModuleGraphCandidates = createFrameworkModuleCandidateRegistrar({
+		cacheCurrent: sourceScanSession.cacheCurrent,
+		debug,
+		getCssHandlerOptions: transformCssHandlerOptions.getCssHandlerOptions,
+		getGeneratorPlatform: resolveGeneratorPlatform,
+		invalidateRecordedGeneratorCandidates,
+		opts,
+		runtimeState,
+		sourceCandidateCollector,
+		styleHandler
+	});
 	const prepareTailwindGeneration = async () => {
 		if (sourceScanSession.shouldDiscoverAutoCssSources(autoCssSourcesDiscovered)) await discoverAndRegisterAutoCssSources();
 		await sourceScanSession.sync();
@@ -10799,6 +10850,7 @@ ${tracedCss}`;
 		isWebGeneratorTarget: () => resolveCurrentGeneratorBranch().isWeb,
 		jsHandler,
 		mainCssChunkMatcher,
+		registerModuleGraphCandidates,
 		runtimeState,
 		styleHandler,
 		syncSourceCandidatesForHotUpdate,
@@ -11220,6 +11272,7 @@ function createUniAppXVitePlugins(options = {}) {
 			isWebGeneratorTarget: context.isWebGeneratorTarget,
 			jsHandler: context.jsHandler,
 			mainCssChunkMatcher: context.mainCssChunkMatcher,
+			registerModuleGraphCandidates: context.registerModuleGraphCandidates,
 			runtimeState: context.runtimeState,
 			styleHandler: context.styleHandler,
 			syncSourceCandidatesForHotUpdate: context.syncSourceCandidatesForHotUpdate,