weapp-tailwindcss 5.1.3 → 5.1.5

package/dist/index.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.js");
-const require_generator = require("./generator-CV_0irKO.js");
-const require_gulp = require("./gulp-B_u8NjQL.js");
+const require_generator = require("./generator-CilgHtxb.js");
+const require_gulp = require("./gulp-CuVsZdO9.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-CkVMSDDp.js");
-const require_webpack = require("./webpack-hvSFaicc.js");
+const require_vite = require("./vite-Yp14HNyS.js");
+const require_webpack = require("./webpack-DN3tgLbF.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
-import { t as createWeappTailwindcssGenerator } from "./generator-DNs6ekoC.mjs";
-import { t as createPlugins } from "./gulp-aQMZ0M7c.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-24-HgU9F.mjs";
+import { t as createPlugins } from "./gulp-ygWfmOqh.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-5Wn0PIzJ.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-DEag6ueE.mjs";
+import { t as WeappTailwindcss } from "./vite-cH0tTMHc.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-DBhmJ-_P.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/js/js-string-escape.d.ts

@@ -0,0 +1 @@
+export declare function jsStringEscape(value: unknown): string;

package/dist/postcss.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
-const require_generator = require("./generator-CV_0irKO.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_generator = require("./generator-CilgHtxb.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-import { t as resolveTailwindV4Source } from "./v4-engine-BklH3CpJ.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DNs6ekoC.mjs";
+import { t as resolveTailwindV4Source } from "./v4-engine-BuuYDXt1.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-24-HgU9F.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
 require("./utils-D3h8j7Mk.js");
-const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
+const require_tailwindcss = require("./tailwindcss-BwoNQ3t8.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);

package/dist/presets.mjs

@@ -1,7 +1,7 @@
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
-import { st as omitUndefined } from "./v4-engine-BklH3CpJ.mjs";
+import { ct as omitUndefined } from "./v4-engine-BuuYDXt1.mjs";
 import { n as defuOverrideArray } from "./utils-DodxWHGz.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-BwV3_Ryc.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C-uM4rB8.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";
 import process from "node:process";

package/dist/rspack.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_webpack = require("./webpack-hvSFaicc.js");
+const require_webpack = require("./webpack-DN3tgLbF.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 //#region src/bundlers/rspack/index.ts

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-DEag6ueE.mjs";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-DBhmJ-_P.mjs";
 import path from "node:path";
 //#region src/bundlers/rspack/index.ts
 const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";

package/dist/{source-candidate-scan-signature-pS87mdHZ.mjs → source-candidate-scan-signature-DATRnS1X.mjs}

@@ -1,11 +1,153 @@
-import { g as traverse, h as babelParse, o as Parser } from "./context-B07Vf584.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-BwV3_Ryc.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-DLYQTCDb.mjs";
+import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
+import { g as traverse, h as babelParse, o as Parser } from "./context-rrYZuUBU.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-C-uM4rB8.mjs";
+import { u as generateCssByGenerator } from "./hmr-timing-Dh_nn3w5.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
 import { cleanUrl, ensurePosix } from "@weapp-tailwindcss/shared";
 import { Buffer } from "node:buffer";
+import { weappStyleInjector } from "weapp-style-injector/vite";
+import { StyleInjector } from "weapp-style-injector/vite/taro";
+import { StyleInjector as StyleInjector$1 } from "weapp-style-injector/vite/uni-app";
+import { weappStyleInjectorWebpack } from "weapp-style-injector/webpack";
+import { StyleInjector as StyleInjector$2 } from "weapp-style-injector/webpack/mpx";
+import { StyleInjector as StyleInjector$3 } from "weapp-style-injector/webpack/taro";
+import { StyleInjector as StyleInjector$4 } from "weapp-style-injector/webpack/uni-app";
+//#region src/style-injector/options.ts
+function normalizeStyleInjectorOptions(options) {
+	if (options === true) return {};
+	if (!options) return;
+	return options;
+}
+//#endregion
+//#region src/style-injector/internal.ts
+function toPluginArray(pluginOrPlugins) {
+	return Array.isArray(pluginOrPlugins) ? pluginOrPlugins : [pluginOrPlugins];
+}
+function isUniAppViteStyleInjectorApp(appType) {
+	return appType === "uni-app-vite" || appType === "uni-app-x";
+}
+function isUniAppWebpackStyleInjectorApp(appType) {
+	return appType === "uni-app" || appType === "uni-app-vite" || appType === "uni-app-x";
+}
+function normalizeWebpackStyleInjectorOptions(options) {
+	const normalized = normalizeStyleInjectorOptions(options);
+	if (!normalized) return;
+	const { generateSubpackageStyle, loadSubpackageTargetStyle, ...rest } = normalized;
+	const webpackOptions = { ...rest };
+	if (generateSubpackageStyle) webpackOptions.generateSubpackageStyle = (context) => {
+		const generated = generateSubpackageStyle(context);
+		if (generated && typeof generated.then === "function") throw new TypeError("[weapp-style-injector] Webpack subpackage style generators must return synchronously.");
+		return generated;
+	};
+	if (loadSubpackageTargetStyle) webpackOptions.loadSubpackageTargetStyle = (fileName, sourceAbsolutePath) => {
+		const loaded = loadSubpackageTargetStyle(fileName, sourceAbsolutePath);
+		if (loaded && typeof loaded.then === "function") throw new TypeError("[weapp-style-injector] Webpack subpackage target style loaders must return synchronously.");
+		return loaded;
+	};
+	return webpackOptions;
+}
+function getTransformHandler(hook) {
+	if (typeof hook === "function") return hook;
+	if (hook && typeof hook === "object" && typeof hook.handler === "function") return hook.handler;
+}
+function getGenerateBundleHandler(hook) {
+	if (typeof hook === "function") return hook;
+	if (hook && typeof hook === "object" && typeof hook.handler === "function") return hook.handler;
+}
+function createBuiltinViteStyleInjectorPlugins(options, getAppType) {
+	const normalized = normalizeStyleInjectorOptions(options);
+	if (!normalized) return [];
+	let config;
+	let delegates;
+	let delegatesConfigured = false;
+	let delegatesBuildStarted = false;
+	const resolveDelegates = () => {
+		if (delegates) return delegates;
+		const appType = getAppType();
+		if (isUniAppViteStyleInjectorApp(appType)) delegates = toPluginArray(StyleInjector$1(normalized));
+		else if (appType === "taro") delegates = toPluginArray(StyleInjector(normalized));
+		else delegates = [weappStyleInjector(normalized)];
+		return delegates;
+	};
+	const configureDelegates = async () => {
+		if (delegatesConfigured || !config) return;
+		delegatesConfigured = true;
+		for (const plugin of resolveDelegates()) if (typeof plugin.configResolved === "function") await plugin.configResolved(config);
+	};
+	const startDelegates = async (context) => {
+		if (delegatesBuildStarted) return;
+		await configureDelegates();
+		delegatesBuildStarted = true;
+		for (const plugin of resolveDelegates()) if (typeof plugin.buildStart === "function") await plugin.buildStart.call(context, {});
+	};
+	return [{
+		name: "weapp-tailwindcss:style-injector-pre",
+		apply: "build",
+		enforce: "pre",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		async buildStart() {
+			await startDelegates(this);
+		},
+		async load(id, options) {
+			await configureDelegates();
+			for (const plugin of resolveDelegates()) {
+				if (typeof plugin.load !== "function") continue;
+				const result = await plugin.load.call(this, id, options);
+				if (result != null) return result;
+			}
+		},
+		async transform(code, id, options) {
+			await configureDelegates();
+			let currentCode = code;
+			let changed = false;
+			for (const plugin of resolveDelegates()) {
+				const handler = getTransformHandler(plugin.transform);
+				if (!handler) continue;
+				const result = await handler.call(this, currentCode, id, options);
+				if (!result) continue;
+				if (typeof result === "string") {
+					currentCode = result;
+					changed = true;
+				} else if (typeof result === "object" && typeof result.code === "string") {
+					currentCode = result.code;
+					changed = true;
+				}
+			}
+			if (changed) return {
+				code: currentCode,
+				map: null
+			};
+		}
+	}, {
+		name: "weapp-tailwindcss:style-injector",
+		apply: "build",
+		enforce: "post",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		async generateBundle(outputOptions, bundle, isWrite) {
+			await configureDelegates();
+			for (const plugin of resolveDelegates()) {
+				const handler = getGenerateBundleHandler(plugin.generateBundle);
+				if (!handler) continue;
+				await handler.call(this, outputOptions, bundle, isWrite);
+			}
+		}
+	}];
+}
+function createBuiltinWebpackStyleInjectorPlugin(options, appType) {
+	const normalized = normalizeWebpackStyleInjectorOptions(options);
+	if (!normalized) return;
+	if (isUniAppWebpackStyleInjectorApp(appType)) return StyleInjector$4(normalized);
+	if (appType === "taro") return StyleInjector$3(normalized);
+	if (appType === "mpx") return StyleInjector$2(normalized);
+	return weappStyleInjectorWebpack(normalized);
+}
+//#endregion
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -501,6 +643,17 @@ function intersectCandidates(first, second) {
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
+function mergeCandidates(first, second) {
+	return /* @__PURE__ */ new Set([...first, ...second]);
+}
+function intersectExplicitSourceCandidates(scopedCandidates, localCandidates) {
+	if (localCandidates.size === 0 && scopedCandidates.size > 0) return scopedCandidates;
+	return intersectCandidates(scopedCandidates, localCandidates);
+}
+function resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates) {
+	if (scopedCandidates.size === 0 && localCandidates.size === 0 && fallbackCandidates?.size) return fallbackCandidates;
+	return intersectExplicitSourceCandidates(scopedCandidates, localCandidates);
+}
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
@@ -521,7 +674,7 @@ async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fa
 	const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 	if (entries === void 0) return fallbackSignature;
 	const scopedCandidates = getSourceCandidatesForEntries(entries);
-	const scopedSignature = createCandidateSignature(localEntries ? intersectCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries)) : scopedCandidates);
+	const scopedSignature = createCandidateSignature(localEntries ? resolveExplicitSourceCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries), getSourceCandidatesForEntries(void 0)) : scopedCandidates);
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
 async function createScopedGeneratorRuntime(options) {
@@ -530,12 +683,16 @@ async function createScopedGeneratorRuntime(options) {
 		const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
 			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			if (!localEntries) return scopedCandidates;
-			return intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			const shouldMergeFallbackRuntime = hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource);
+			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
+			const localCandidates = scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries);
+			const fallbackCandidates = scopedSourceCandidateGetter?.(void 0);
+			const scopedLocalCandidates = resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates);
+			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
-	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return scopedCandidates;
+	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions) ? scopedCandidates : mergeCandidates(scopedCandidates, fallbackRuntime);
 	if (!shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions)) return fallbackRuntime;
 	return fallbackRuntime;
 }
@@ -569,4 +726,4 @@ function createSourceCandidateScanSignature(input) {
 	});
 }
 //#endregion
-export { isSourceStyleRequest as A, resolvePluginDisabledState as C, isHTMLRequest as D, isCSSRequest as E, normalizeOutputPathKey as M, resolveOutputSpecifier as N, normalizePath as O, toAbsoluteOutputPath as P, resolvePackageDir as S, formatPostcssSourceMap as T, generateTailwindV4Css as _, createJsHashSalt as a, parseBundlerGeneratedCssMarkerBlocks as b, hasRuntimeAffectingSourceChanges as c, classifyBundleEntry as d, createBundleBuildState as f, createBundleModuleGraphOptions as g, applyLinkedResults as h, createCandidateSignature as i, stripRequestQuery as j, slash as k, summarizeStringDiff as l, createRuntimeAffectingSourceSignature as m, createScopedGeneratorCandidateSignature as n, createLinkedImpactSignature as o, updateBundleBuildState as p, createScopedGeneratorRuntime as r, getSnapshotHash as s, createSourceCandidateScanSignature as t, buildBundleSnapshot as u, createBundlerGeneratedCssMarker as v, cleanUrl as w, stripBundlerGeneratedCssMarkers as x, hasBundlerGeneratedCssMarker as y };
+export { isSourceStyleRequest as A, resolvePluginDisabledState as C, isHTMLRequest as D, isCSSRequest as E, createBuiltinViteStyleInjectorPlugins as F, createBuiltinWebpackStyleInjectorPlugin as I, normalizeOutputPathKey as M, resolveOutputSpecifier as N, normalizePath as O, toAbsoluteOutputPath as P, resolvePackageDir as S, formatPostcssSourceMap as T, generateTailwindV4Css as _, createJsHashSalt as a, parseBundlerGeneratedCssMarkerBlocks as b, hasRuntimeAffectingSourceChanges as c, classifyBundleEntry as d, createBundleBuildState as f, createBundleModuleGraphOptions as g, applyLinkedResults as h, createCandidateSignature as i, stripRequestQuery as j, slash as k, summarizeStringDiff as l, createRuntimeAffectingSourceSignature as m, createScopedGeneratorCandidateSignature as n, createLinkedImpactSignature as o, updateBundleBuildState as p, createScopedGeneratorRuntime as r, getSnapshotHash as s, createSourceCandidateScanSignature as t, buildBundleSnapshot as u, createBundlerGeneratedCssMarker as v, cleanUrl as w, stripBundlerGeneratedCssMarkers as x, hasBundlerGeneratedCssMarker as y };

package/dist/{source-candidate-scan-signature-DzwebZrf.js → source-candidate-scan-signature-DIj9m4wB.js}

@@ -1,7 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_context = require("./context-D75pwtBW.js");
-const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
-const require_hmr_timing = require("./hmr-timing-DOoHun3i.js");
+require("./auto-DtU6f3X6.js");
+const require_context = require("./context-BziwyWy1.js");
+const require_tailwindcss = require("./tailwindcss-BwoNQ3t8.js");
+const require_hmr_timing = require("./hmr-timing-BKdCeIrn.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
@@ -9,6 +10,148 @@ node_process = require_rolldown_runtime.__toESM(node_process);
 let node_module = require("node:module");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let node_buffer = require("node:buffer");
+let weapp_style_injector_vite = require("weapp-style-injector/vite");
+let weapp_style_injector_vite_taro = require("weapp-style-injector/vite/taro");
+let weapp_style_injector_vite_uni_app = require("weapp-style-injector/vite/uni-app");
+let weapp_style_injector_webpack = require("weapp-style-injector/webpack");
+let weapp_style_injector_webpack_mpx = require("weapp-style-injector/webpack/mpx");
+let weapp_style_injector_webpack_taro = require("weapp-style-injector/webpack/taro");
+let weapp_style_injector_webpack_uni_app = require("weapp-style-injector/webpack/uni-app");
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
+//#region src/style-injector/options.ts
+function normalizeStyleInjectorOptions(options) {
+	if (options === true) return {};
+	if (!options) return;
+	return options;
+}
+//#endregion
+//#region src/style-injector/internal.ts
+function toPluginArray(pluginOrPlugins) {
+	return Array.isArray(pluginOrPlugins) ? pluginOrPlugins : [pluginOrPlugins];
+}
+function isUniAppViteStyleInjectorApp(appType) {
+	return appType === "uni-app-vite" || appType === "uni-app-x";
+}
+function isUniAppWebpackStyleInjectorApp(appType) {
+	return appType === "uni-app" || appType === "uni-app-vite" || appType === "uni-app-x";
+}
+function normalizeWebpackStyleInjectorOptions(options) {
+	const normalized = normalizeStyleInjectorOptions(options);
+	if (!normalized) return;
+	const { generateSubpackageStyle, loadSubpackageTargetStyle, ...rest } = normalized;
+	const webpackOptions = { ...rest };
+	if (generateSubpackageStyle) webpackOptions.generateSubpackageStyle = (context) => {
+		const generated = generateSubpackageStyle(context);
+		if (generated && typeof generated.then === "function") throw new TypeError("[weapp-style-injector] Webpack subpackage style generators must return synchronously.");
+		return generated;
+	};
+	if (loadSubpackageTargetStyle) webpackOptions.loadSubpackageTargetStyle = (fileName, sourceAbsolutePath) => {
+		const loaded = loadSubpackageTargetStyle(fileName, sourceAbsolutePath);
+		if (loaded && typeof loaded.then === "function") throw new TypeError("[weapp-style-injector] Webpack subpackage target style loaders must return synchronously.");
+		return loaded;
+	};
+	return webpackOptions;
+}
+function getTransformHandler(hook) {
+	if (typeof hook === "function") return hook;
+	if (hook && typeof hook === "object" && typeof hook.handler === "function") return hook.handler;
+}
+function getGenerateBundleHandler(hook) {
+	if (typeof hook === "function") return hook;
+	if (hook && typeof hook === "object" && typeof hook.handler === "function") return hook.handler;
+}
+function createBuiltinViteStyleInjectorPlugins(options, getAppType) {
+	const normalized = normalizeStyleInjectorOptions(options);
+	if (!normalized) return [];
+	let config;
+	let delegates;
+	let delegatesConfigured = false;
+	let delegatesBuildStarted = false;
+	const resolveDelegates = () => {
+		if (delegates) return delegates;
+		const appType = getAppType();
+		if (isUniAppViteStyleInjectorApp(appType)) delegates = toPluginArray((0, weapp_style_injector_vite_uni_app.StyleInjector)(normalized));
+		else if (appType === "taro") delegates = toPluginArray((0, weapp_style_injector_vite_taro.StyleInjector)(normalized));
+		else delegates = [(0, weapp_style_injector_vite.weappStyleInjector)(normalized)];
+		return delegates;
+	};
+	const configureDelegates = async () => {
+		if (delegatesConfigured || !config) return;
+		delegatesConfigured = true;
+		for (const plugin of resolveDelegates()) if (typeof plugin.configResolved === "function") await plugin.configResolved(config);
+	};
+	const startDelegates = async (context) => {
+		if (delegatesBuildStarted) return;
+		await configureDelegates();
+		delegatesBuildStarted = true;
+		for (const plugin of resolveDelegates()) if (typeof plugin.buildStart === "function") await plugin.buildStart.call(context, {});
+	};
+	return [{
+		name: "weapp-tailwindcss:style-injector-pre",
+		apply: "build",
+		enforce: "pre",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		async buildStart() {
+			await startDelegates(this);
+		},
+		async load(id, options) {
+			await configureDelegates();
+			for (const plugin of resolveDelegates()) {
+				if (typeof plugin.load !== "function") continue;
+				const result = await plugin.load.call(this, id, options);
+				if (result != null) return result;
+			}
+		},
+		async transform(code, id, options) {
+			await configureDelegates();
+			let currentCode = code;
+			let changed = false;
+			for (const plugin of resolveDelegates()) {
+				const handler = getTransformHandler(plugin.transform);
+				if (!handler) continue;
+				const result = await handler.call(this, currentCode, id, options);
+				if (!result) continue;
+				if (typeof result === "string") {
+					currentCode = result;
+					changed = true;
+				} else if (typeof result === "object" && typeof result.code === "string") {
+					currentCode = result.code;
+					changed = true;
+				}
+			}
+			if (changed) return {
+				code: currentCode,
+				map: null
+			};
+		}
+	}, {
+		name: "weapp-tailwindcss:style-injector",
+		apply: "build",
+		enforce: "post",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		async generateBundle(outputOptions, bundle, isWrite) {
+			await configureDelegates();
+			for (const plugin of resolveDelegates()) {
+				const handler = getGenerateBundleHandler(plugin.generateBundle);
+				if (!handler) continue;
+				await handler.call(this, outputOptions, bundle, isWrite);
+			}
+		}
+	}];
+}
+function createBuiltinWebpackStyleInjectorPlugin(options, appType) {
+	const normalized = normalizeWebpackStyleInjectorOptions(options);
+	if (!normalized) return;
+	if (isUniAppWebpackStyleInjectorApp(appType)) return (0, weapp_style_injector_webpack_uni_app.StyleInjector)(normalized);
+	if (appType === "taro") return (0, weapp_style_injector_webpack_taro.StyleInjector)(normalized);
+	if (appType === "mpx") return (0, weapp_style_injector_webpack_mpx.StyleInjector)(normalized);
+	return (0, weapp_style_injector_webpack.weappStyleInjectorWebpack)(normalized);
+}
+//#endregion
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -504,6 +647,17 @@ function intersectCandidates(first, second) {
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
+function mergeCandidates(first, second) {
+	return /* @__PURE__ */ new Set([...first, ...second]);
+}
+function intersectExplicitSourceCandidates(scopedCandidates, localCandidates) {
+	if (localCandidates.size === 0 && scopedCandidates.size > 0) return scopedCandidates;
+	return intersectCandidates(scopedCandidates, localCandidates);
+}
+function resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates) {
+	if (scopedCandidates.size === 0 && localCandidates.size === 0 && fallbackCandidates?.size) return fallbackCandidates;
+	return intersectExplicitSourceCandidates(scopedCandidates, localCandidates);
+}
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
@@ -524,7 +678,7 @@ async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fa
 	const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 	if (entries === void 0) return fallbackSignature;
 	const scopedCandidates = getSourceCandidatesForEntries(entries);
-	const scopedSignature = createCandidateSignature(localEntries ? intersectCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries)) : scopedCandidates);
+	const scopedSignature = createCandidateSignature(localEntries ? resolveExplicitSourceCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries), getSourceCandidatesForEntries(void 0)) : scopedCandidates);
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
 async function createScopedGeneratorRuntime(options) {
@@ -533,12 +687,16 @@ async function createScopedGeneratorRuntime(options) {
 		const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
 			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			if (!localEntries) return scopedCandidates;
-			return intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			const shouldMergeFallbackRuntime = (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource);
+			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
+			const localCandidates = scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries);
+			const fallbackCandidates = scopedSourceCandidateGetter?.(void 0);
+			const scopedLocalCandidates = resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates);
+			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
-	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return scopedCandidates;
+	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions) ? scopedCandidates : mergeCandidates(scopedCandidates, fallbackRuntime);
 	if (!shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions)) return fallbackRuntime;
 	return fallbackRuntime;
 }
@@ -590,6 +748,18 @@ Object.defineProperty(exports, "classifyBundleEntry", {
 		return classifyBundleEntry;
 	}
 });
+Object.defineProperty(exports, "createBuiltinViteStyleInjectorPlugins", {
+	enumerable: true,
+	get: function() {
+		return createBuiltinViteStyleInjectorPlugins;
+	}
+});
+Object.defineProperty(exports, "createBuiltinWebpackStyleInjectorPlugin", {
+	enumerable: true,
+	get: function() {
+		return createBuiltinWebpackStyleInjectorPlugin;
+	}
+});
 Object.defineProperty(exports, "createBundleBuildState", {
 	enumerable: true,
 	get: function() {

package/dist/style-injector/internal.d.ts

@@ -0,0 +1,7 @@
+import type { Plugin } from 'vite';
+import type { WebpackObjectPluginInstance } from 'weapp-style-injector/webpack';
+import type { WeappTailwindcssStyleInjectorUserOptions } from './options';
+import type { AppType } from '../types/shared';
+export declare function createBuiltinViteStyleInjectorPlugins(options: WeappTailwindcssStyleInjectorUserOptions | undefined, getAppType: () => AppType | undefined): Plugin[];
+export declare function createBuiltinWebpackStyleInjectorPlugin(options: WeappTailwindcssStyleInjectorUserOptions | undefined, appType: AppType | undefined): WebpackObjectPluginInstance | undefined;
+export type { WeappTailwindcssStyleInjectorOptions, WeappTailwindcssStyleInjectorUserOptions } from './options';

package/dist/style-injector/options.d.ts

@@ -0,0 +1,25 @@
+import type { MpxSubPackageConfig, ResolvedSubpackageStyleScope, SubpackageStyleGenerateContext, SubpackageStyleGenerator, SubpackageStyleRules, TaroSubPackageConfig, UniAppManualStyleConfig, UniAppStyleScopeInput, UniAppSubPackageConfig, WeappStyleInjectorOptions } from 'weapp-style-injector';
+export type WeappTailwindcssStyleInjectorUserOptions = boolean | WeappTailwindcssStyleInjectorOptions;
+export interface WeappTailwindcssStyleInjectorOptions extends WeappStyleInjectorOptions {
+    pagesJsonPath?: string | string[] | undefined;
+    appConfigPath?: string | string[] | undefined;
+    appPath?: string | string[] | undefined;
+    sourceRoot?: string | undefined;
+    subPackages?: UniAppSubPackageConfig | UniAppSubPackageConfig[] | TaroSubPackageConfig | TaroSubPackageConfig[] | MpxSubPackageConfig | MpxSubPackageConfig[] | undefined;
+    uniAppSubPackages?: UniAppSubPackageConfig | UniAppSubPackageConfig[] | undefined;
+    uniAppStyleScopes?: UniAppManualStyleConfig | UniAppManualStyleConfig[] | undefined;
+    subpackageStyleScopes?: ResolvedSubpackageStyleScope[] | undefined;
+    generateSubpackageStyle?: SubpackageStyleGenerator | ((context: SubpackageStyleGenerateContext) => string | Uint8Array | null | undefined | Promise<string | Uint8Array | null | undefined>) | undefined;
+    loadSubpackageTargetStyle?: ((fileName: string, sourceAbsolutePath: string) => string | Uint8Array | null | undefined | Promise<string | Uint8Array | null | undefined>) | undefined;
+    sourceFileName?: string | string[] | undefined;
+    outputName?: string | undefined;
+    files?: string | string[] | undefined;
+    include?: WeappStyleInjectorOptions['include'];
+    exclude?: WeappStyleInjectorOptions['exclude'];
+    indexFileName?: string | string[] | undefined;
+    indexFileNames?: string | string[] | undefined;
+    styleScopes?: UniAppStyleScopeInput | UniAppStyleScopeInput[] | undefined;
+    rules?: SubpackageStyleRules | undefined;
+    preprocess?: boolean | undefined;
+}
+export declare function normalizeStyleInjectorOptions(options: WeappTailwindcssStyleInjectorUserOptions | undefined): WeappTailwindcssStyleInjectorOptions | undefined;

package/dist/tailwindcss/v4/preflight.d.ts

@@ -0,0 +1,4 @@
+export declare function parseCssImportSpecifier(params: string): string | undefined;
+export declare function isTailwindV4CssImportParam(params: string): boolean;
+export declare function isTailwindV4PreflightImportParam(params: string): boolean;
+export declare function includesTailwindV4PreflightDirective(css: string): boolean;

package/dist/tailwindcss/v4-engine/css-macro-source.d.ts

@@ -0,0 +1,2 @@
+import type { TailwindV4ResolvedSource } from './types';
+export declare function resolveCssMacroTailwindV4Source(source: TailwindV4ResolvedSource): TailwindV4ResolvedSource;