weapp-tailwindcss 5.1.4 → 5.1.6

package/dist/{webpack-Bg6pefpb.mjs → webpack-BffTDmod.mjs}

@@ -1,10 +1,10 @@
-import { C as hasTailwindRootDirectives, F as hasTailwindGeneratedCssMarkers, G as getTailwindV4IncrementalGenerateCacheStats, O as parseImportRequest, P as hasTailwindGeneratedCss, T as normalizeTailwindConfigDirectives, _ as resolveTailwindcssOptions, k as removeTailwindSourceDirectives, lt as inferGeneratorTargetFromEnv, nt as resolveSourceScanPath, o as hasConfiguredTailwindV4CssRoots, s as upsertTailwindV4CssSource, w as hasTailwindSourceDirectives, x as hasTailwindApplyDirective } from "./v4-engine-BuuYDXt1.mjs";
-import { o as resolveRuntimeBranch } from "./generator-24-HgU9F.mjs";
+import { $ as hasTailwindGeneratedCssMarkers, A as stripTailwindSourceMediaFragments, D as removeTailwindV4GeneratorAtRules, Dt as inferGeneratorTargetFromEnv, E as removeTailwindV4GeneratedUserCssArtifacts, F as pruneMiniProgramGeneratedCss, H as hasTailwindSourceDirectives, K as parseImportRequest, L as stripMiniProgramCssSpecificityPlaceholders, N as finalizeMiniProgramCss, Q as hasTailwindGeneratedCss, T as removeMiniProgramHoverSelectors, U as normalizeTailwindConfigDirectives, V as hasTailwindRootDirectives, _ as resolveTailwindcssOptions, bt as resolveSourceScanPath, j as stripUnmatchedTailwindSourceMediaCloseFragments, lt as getTailwindV4IncrementalGenerateCacheStats, o as hasConfiguredTailwindV4CssRoots, q as removeTailwindSourceDirectives, s as upsertTailwindV4CssSource, z as hasTailwindApplyDirective } from "./v4-engine-DRQaCFMm.mjs";
+import { o as resolveRuntimeBranch } from "./generator-CoT5vu9w.mjs";
 import { r as getGroupedEntries } from "./utils-DodxWHGz.mjs";
-import { S as createDebug, b as ensureRuntimeClassSet, f as _defineProperty, i as pluginName, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, r as resolveStyleOptionsFromContext, t as getCompilerContext, w as md5Hash, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-Bkpmt3ja.mjs";
-import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-D0JF0fuZ.mjs";
-import { C as stripTailwindSourceMediaFragments, D as createCssSourceOrderAppend, E as removeGeneratedSelectorCompatCss, F as createCssTokenSourceMap, I as isCssSourceTraceEnabled, L as processCachedTask, M as stripMiniProgramCssSpecificityPlaceholders, N as annotateCssSourceTrace, O as hasMiniProgramTailwindV4PreflightReset, P as createCssSourceTraceCacheSignature, S as removeTailwindV4GeneratorAtRules, T as scoreTailwindV4CssSourceFileMatch, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as removeMiniProgramHoverSelectors, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, j as pruneMiniProgramGeneratedCss, k as finalizeMiniProgramCss, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as stripUnmatchedTailwindSourceMediaCloseFragments, x as removeTailwindV4GeneratedUserCssArtifacts } from "./hmr-timing-BRNaz8Od.mjs";
-import { A as isSourceStyleRequest, C as resolvePluginDisabledState, N as resolveOutputSpecifier, P as toAbsoluteOutputPath, S as resolvePackageDir, _ as generateTailwindV4Css, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, j as stripRequestQuery, m as createRuntimeAffectingSourceSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-BB1hvW68.mjs";
+import { S as createDebug, b as ensureRuntimeClassSet, f as _defineProperty, i as pluginName, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, r as resolveStyleOptionsFromContext, t as getCompilerContext, w as md5Hash, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-3GGqW9vw.mjs";
+import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-Bjr3aphG.mjs";
+import { C as hasMiniProgramTailwindV4PreflightReset, D as isCssSourceTraceEnabled, E as createCssTokenSourceMap, O as processCachedTask, S as createCssSourceOrderAppend, T as createCssSourceTraceCacheSignature, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as scoreTailwindV4CssSourceFileMatch, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as annotateCssSourceTrace, x as removeGeneratedSelectorCompatCss } from "./hmr-timing-Cfu-4Bnf.mjs";
+import { A as isSourceStyleRequest, C as resolvePluginDisabledState, I as createBuiltinWebpackStyleInjectorPlugin, N as resolveOutputSpecifier, P as toAbsoluteOutputPath, S as resolvePackageDir, _ as generateTailwindV4Css, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, j as stripRequestQuery, m as createRuntimeAffectingSourceSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-BbCmW975.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -717,14 +717,33 @@ function resolveWebpackMemoryDebugStats(context) {
 		tailwind: { v4: getTailwindV4IncrementalGenerateCacheStats() }
 	};
 }
-function shouldInjectWebpackCssTracePreflight(appType, cssHandlerOptions) {
-	return appType !== "mpx" || cssHandlerOptions.isMainChunk !== false;
+function shouldInjectWebpackCssTracePreflight(_appType, cssHandlerOptions) {
+	if (includesTailwindPreflightImport(cssHandlerOptions.sourceOptions?.sourceCss)) return true;
+	return cssHandlerOptions.isMainChunk !== false;
+}
+function includesTailwindPreflightImport(source) {
+	if (!source) return false;
+	try {
+		let includesPreflight = false;
+		postcss.parse(source).walkAtRules((rule) => {
+			if (rule.name === "tailwind") {
+				includesPreflight || (includesPreflight = rule.params.trim() === "base");
+				return;
+			}
+			if (rule.name !== "import") return;
+			const request = parseImportRequest(rule.params)?.replaceAll("\\", "/");
+			includesPreflight || (includesPreflight = request === "tailwindcss" || request === "tailwindcss/preflight.css" || request?.endsWith("/tailwindcss/index.css") === true || request?.endsWith("/tailwindcss/preflight.css") === true);
+		});
+		return includesPreflight;
+	} catch {
+		return false;
+	}
 }
 function finalizeMiniProgramUserCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
 	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
 	if (isWebGeneratorTarget) return source;
 	return stripMiniProgramCssSpecificityPlaceholders(removeTailwindV4StandaloneHostPreflightRule(finalizeMiniProgramCss(removeMiniProgramHoverSelectors(source, styleOptions.cssRemoveHoverPseudoClass), {
-		cssPreflight: options.cssPreflight !== false && !hasMiniProgramTailwindV4PreflightReset(source) ? compilerOptions.cssPreflight : void 0,
+		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(source) ? compilerOptions.cssPreflight : void 0,
 		isTailwindcssV4: true,
 		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
 	})));
@@ -802,14 +821,13 @@ function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTa
 	let finalized = removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
 	if (options.generatedCss !== true) return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 	try {
-		finalized = pruneMiniProgramGeneratedCss(finalized, { preservePreflight: true });
-	} catch {
-		finalized = finalizeMiniProgramCss(finalized, {
-			cssPreflight: !hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
-			isTailwindcssV4: true,
-			tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
-		});
-	}
+		finalized = pruneMiniProgramGeneratedCss(finalized, { preservePreflight: options.cssPreflight !== false });
+	} catch {}
+	finalized = finalizeMiniProgramCss(finalized, {
+		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
+		isTailwindcssV4: true,
+		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
+	});
 	return stripMiniProgramCssSpecificityPlaceholders(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 }
 function collectWebpackJsRuntimeCandidatesFromAssets(options) {
@@ -857,19 +875,31 @@ function createWebpackCssSourceResolvers(options) {
 		const tailwindOptions = resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 		return (tailwindOptions?.v4?.cssEntries?.length ?? 0) > 0 || (tailwindOptions?.v4?.cssSources?.length ?? 0) > 0;
 	};
-	const configuredMainCssEntryFiles = (() => {
-		return [...resolveTailwindcssOptions(runtimeState.tailwindRuntime.options)?.v4?.cssEntries ?? []].filter((file) => typeof file === "string" && file.length > 0).map((file) => path.resolve(file));
+	const configuredCssEntryFiles = (() => {
+		const tailwindOptions = resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
+		const entries = [...compilerOptions.cssEntries ?? [], ...tailwindOptions?.v4?.cssEntries ?? []].filter((file) => typeof file === "string" && file.length > 0).map((file) => path.resolve(file));
+		return [...new Set(entries)];
 	})();
+	const configuredMainCssEntryFiles = configuredCssEntryFiles.slice(0, 1);
 	const inferredMainCssFiles = inferWebpackMainCssFiles(compilation.chunks, compilerOptions.cssMatcher, {
 		mainSourceFiles: new Set(configuredMainCssEntryFiles),
 		resourcesByAsset: cssAssetResources
 	});
 	const singleConfiguredCssAsset = isWebGeneratorTarget && configuredMainCssEntryFiles.length > 0 && groupedCssEntriesLength === 1 ? singleCssAssetFile : void 0;
-	const isMainCssChunk = (file) => compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file) || file === singleConfiguredCssAsset;
+	const isMainCssChunk = (file) => {
+		const resources = cssAssetResources.get(file);
+		if (resources && configuredCssEntryFiles.length > 0) for (const resource of resources) {
+			const index = configuredCssEntryFiles.findIndex((entry) => path.resolve(entry) === path.resolve(resource));
+			if (index >= 0) return index === 0;
+		}
+		if (configuredCssEntryFiles.length > 1) return false;
+		return compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file) || file === singleConfiguredCssAsset;
+	};
 	const activeWebpackCssSourceFiles = /* @__PURE__ */ new Set();
 	const resolveConfiguredMainCssSourceFile = (file) => {
 		if (!isMainCssChunk(file)) return;
 		if (configuredMainCssEntryFiles.length !== 1) return;
+		if (groupedCssEntriesLength !== 1 && file !== singleCssAssetFile) return;
 		for (const sourceFile of configuredMainCssEntryFiles) if (cssSources.has(sourceFile)) {
 			activeWebpackCssSourceFiles.add(sourceFile);
 			return sourceFile;
@@ -1728,7 +1758,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							},
 							transform: async () => {
 								const source = readCurrentProcessedRawSource();
-								const nextCss = stripTrailingLineWhitespace(finalizeCssAssetSource(hasTailwindGeneratedAssetCss && !hasGeneratedCssMarker ? isWebGeneratorTarget ? source : (await compilerOptions.styleHandler(source, cssHandlerOptionsForProcessedAsset)).css : source, { generatedCss: hasGeneratedCssMarker || hasTailwindGeneratedAssetCss }));
+								const nextCss = stripTrailingLineWhitespace(finalizeCssAssetSource(hasTailwindGeneratedAssetCss && !hasGeneratedCssMarker ? isWebGeneratorTarget ? source : (await compilerOptions.styleHandler(source, cssHandlerOptionsForProcessedAsset)).css : source, {
+									cssPreflight: cssHandlerOptionsForProcessedAsset.isMainChunk,
+									generatedCss: hasGeneratedCssMarker || hasTailwindGeneratedAssetCss
+								}));
 								debug("css skip webpack-loader-pipeline asset: %s", file);
 								return { result: new ConcatSource(finalizeTracedCss(nextCss, cssHandlerOptionsForProcessedAsset)) };
 							}
@@ -1814,7 +1847,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								}, {
 									css: currentAssetUserCss,
 									processed: true
-								}).css, { generatedCss: true }), cssHandlerOptions);
+								}).css, {
+									cssPreflight: cssHandlerOptions.isMainChunk,
+									generatedCss: true
+								}), cssHandlerOptions);
 								debug("css consume webpack loader generation: %s <- %s", file, sourceFile);
 								return { result: new ConcatSource(css) };
 							}
@@ -1848,7 +1884,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const fallbackGeneratorRuntimeSet = getGeneratorRuntimeSet();
 							const hasExplicitTailwindV4SourceCss = sourceCss !== void 0 && (hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || sourceCss.includes("@config"));
 							const currentAssetHasTailwindDirectives = hasTailwindRootDirectives(generatorRawSource, { importFallback: true }) || hasTailwindSourceDirectives(generatorRawSource, { importFallback: true }) || hasTailwindApplyDirective(generatorRawSource);
-							const shouldForceTailwindV4Generation = cssHandlerOptions.isMainChunk && hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 || currentAssetHasTailwindDirectives || hasExplicitTailwindV4SourceCss);
+							const shouldForceTailwindV4Generation = hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 && sourceFile !== void 0 || currentAssetHasTailwindDirectives || hasExplicitTailwindV4SourceCss);
 							const shouldSkipUnmatchedMainCssGeneration = !isWebGeneratorTarget && cssHandlerOptions.isMainChunk && sourceFile === void 0 && configuredMainCssEntryFiles.length > 0 && !currentAssetHasTailwindDirectives;
 							const resolvedScopedGeneratorRuntimeSet = await createScopedGeneratorRuntime({
 								cssHandlerOptions,
@@ -1911,7 +1947,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							}, {
 								css: removeWebpackTailwindGeneratedAssetCss(currentRawSource),
 								processed: true
-							})?.css ?? generated.css : generated.css, { generatedCss: true }) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false }), cssHandlerOptions));
+							})?.css ?? generated.css : generated.css, {
+								cssPreflight: cssHandlerOptions.isMainChunk,
+								generatedCss: true
+							}) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false }), cssHandlerOptions));
 							if (generated) {
 								for (const className of generated.classSet) generatorRuntimeSet.add(className);
 								debug("css handle via tailwind v%s engine(%s): %s", runtimeState.tailwindRuntime.majorVersion, generated.target, file);
@@ -1959,7 +1998,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	});
 }
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.22.3_oxc-resolver@11.20.0_tsx@4.22.4_typescript@6.0.3_unrun@0.2.37_synckit@0.1_6cbb3bb94bab8b3379a6056ffc71c3e9/node_modules/tsdown/esm-shims.js
+//#region ../../node_modules/.pnpm/tsdown@0.22.3_oxc-resolver@11.20.0_tsx@4.22.4_typescript@6.0.3_unrun@0.2.37_synckit@0.1_0beb1ab7e72f5f18144e3bcca1caefc0/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -2195,7 +2234,7 @@ var WeappTailwindcss = class {
 	}
 	apply(compiler) {
 		compiler.options = compiler.options || {};
-		const { disabled, onLoad, runtimeLoaderPath, tailwindRuntime, refreshTailwindcssRuntime } = this.options;
+		const { disabled, onLoad, runtimeLoaderPath, tailwindRuntime, refreshTailwindcssRuntime, styleInjector } = this.options;
 		const initialTailwindRuntime = tailwindRuntime;
 		const refreshTailwindRuntime = refreshTailwindcssRuntime;
 		const disabledOptions = resolvePluginDisabledState(disabled);
@@ -2315,6 +2354,7 @@ var WeappTailwindcss = class {
 		const pruneWebpackCssSources = (activeSourceFiles, _options = {}) => {
 			const tailwindOptions = resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 			const configuredSourceFiles = /* @__PURE__ */ new Set();
+			for (const entry of this.options.cssEntries ?? []) configuredSourceFiles.add(path.resolve(entry));
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) configuredSourceFiles.add(path.resolve(entry));
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file) configuredSourceFiles.add(path.resolve(source.file));
 			for (const file of webpackCssSources.keys()) if (!activeSourceFiles.has(file) && !configuredSourceFiles.has(file)) webpackCssSources.delete(file);
@@ -2323,6 +2363,7 @@ var WeappTailwindcss = class {
 		const prepareWebpackCssSources = (activeAssetResources = /* @__PURE__ */ new Set()) => {
 			const tailwindOptions = resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 			const configuredSourceFiles = /* @__PURE__ */ new Set();
+			for (const entry of this.options.cssEntries ?? []) configuredSourceFiles.add(path.resolve(entry));
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) configuredSourceFiles.add(path.resolve(entry));
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file) configuredSourceFiles.add(path.resolve(source.file));
 			const activeSourceFiles = /* @__PURE__ */ new Set([
@@ -2339,6 +2380,7 @@ var WeappTailwindcss = class {
 		const isWebpackProcessedTailwindEntryAsset = (isMainCssChunk) => {
 			if (isMainCssChunk !== true || webpackProcessedCssSourceFiles.size === 0) return false;
 			const tailwindOptions = resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
+			for (const entry of this.options.cssEntries ?? []) if (webpackProcessedCssSourceFiles.has(path.resolve(entry))) return true;
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) if (webpackProcessedCssSourceFiles.has(path.resolve(entry))) return true;
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file && webpackProcessedCssSourceFiles.has(path.resolve(source.file))) return true;
 			return false;
@@ -2419,6 +2461,7 @@ var WeappTailwindcss = class {
 			prepareWebpackCssSources,
 			debug
 		});
+		createBuiltinWebpackStyleInjectorPlugin(styleInjector, this.appType)?.apply(compiler);
 	}
 };
 //#endregion

package/dist/{webpack-khSwkXP5.js → webpack-C9u7mfGE.js}

@@ -1,11 +1,11 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
-const require_generator = require("./generator-CilgHtxb.js");
+const require_v4_engine = require("./v4-engine-C9cmNlP8.js");
+const require_generator = require("./generator-CqWzj2Z1.js");
 const require_utils = require("./utils-D3h8j7Mk.js");
-const require_context = require("./context-DCVMkTRj.js");
-const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
-const require_hmr_timing = require("./hmr-timing-BV6nFPoT.js");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-CaDT0gkj.js");
+const require_context = require("./context-BCSk_YnL.js");
+const require_tailwindcss = require("./tailwindcss-DYJ3HZD2.js");
+const require_hmr_timing = require("./hmr-timing-Df4203aI.js");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-5Uk6U72B.js");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs);
 let node_path = require("node:path");
@@ -481,7 +481,7 @@ function parseWebpackCssLayerNames(params) {
 	return params.split(",").map((name) => name.trim()).filter(Boolean);
 }
 function removeWebpackTailwindGeneratedAssetCss(source) {
-	const cleaned = require_hmr_timing.removeTailwindV4GeneratedUserCssArtifacts(source);
+	const cleaned = require_v4_engine.removeTailwindV4GeneratedUserCssArtifacts(source);
 	try {
 		const root = _weapp_tailwindcss_postcss.postcss.parse(cleaned);
 		let changed = false;
@@ -723,14 +723,33 @@ function resolveWebpackMemoryDebugStats(context) {
 		tailwind: { v4: require_v4_engine.getTailwindV4IncrementalGenerateCacheStats() }
 	};
 }
-function shouldInjectWebpackCssTracePreflight(appType, cssHandlerOptions) {
-	return appType !== "mpx" || cssHandlerOptions.isMainChunk !== false;
+function shouldInjectWebpackCssTracePreflight(_appType, cssHandlerOptions) {
+	if (includesTailwindPreflightImport(cssHandlerOptions.sourceOptions?.sourceCss)) return true;
+	return cssHandlerOptions.isMainChunk !== false;
+}
+function includesTailwindPreflightImport(source) {
+	if (!source) return false;
+	try {
+		let includesPreflight = false;
+		_weapp_tailwindcss_postcss.postcss.parse(source).walkAtRules((rule) => {
+			if (rule.name === "tailwind") {
+				includesPreflight || (includesPreflight = rule.params.trim() === "base");
+				return;
+			}
+			if (rule.name !== "import") return;
+			const request = require_v4_engine.parseImportRequest(rule.params)?.replaceAll("\\", "/");
+			includesPreflight || (includesPreflight = request === "tailwindcss" || request === "tailwindcss/preflight.css" || request?.endsWith("/tailwindcss/index.css") === true || request?.endsWith("/tailwindcss/preflight.css") === true);
+		});
+		return includesPreflight;
+	} catch {
+		return false;
+	}
 }
 function finalizeMiniProgramUserCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
 	const styleOptions = require_context.resolveStyleOptionsFromContext(compilerOptions);
 	if (isWebGeneratorTarget) return source;
-	return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(removeTailwindV4StandaloneHostPreflightRule((0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(require_hmr_timing.removeMiniProgramHoverSelectors(source, styleOptions.cssRemoveHoverPseudoClass), {
-		cssPreflight: options.cssPreflight !== false && !require_hmr_timing.hasMiniProgramTailwindV4PreflightReset(source) ? compilerOptions.cssPreflight : void 0,
+	return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(removeTailwindV4StandaloneHostPreflightRule((0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(require_v4_engine.removeMiniProgramHoverSelectors(source, styleOptions.cssRemoveHoverPseudoClass), {
+		cssPreflight: options.cssPreflight === false ? false : !require_hmr_timing.hasMiniProgramTailwindV4PreflightReset(source) ? compilerOptions.cssPreflight : void 0,
 		isTailwindcssV4: true,
 		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
 	})));
@@ -802,21 +821,20 @@ function finalizeTracedWebpackCssAsset(css, cssHandlerOptions, options) {
 function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
 	const styleOptions = require_context.resolveStyleOptionsFromContext(compilerOptions);
 	if (isWebGeneratorTarget) {
-		if (options.generatedCss === true) return stripTrailingLineWhitespace(require_hmr_timing.stripUnmatchedTailwindSourceMediaCloseFragments(require_hmr_timing.stripTailwindSourceMediaFragments(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(source))));
-		return stripTrailingLineWhitespace(require_hmr_timing.stripUnmatchedTailwindSourceMediaCloseFragments(require_hmr_timing.stripTailwindSourceMediaFragments(require_hmr_timing.removeTailwindV4GeneratorAtRules(require_v4_engine.removeTailwindSourceDirectives(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(source), { importFallback: true })))));
+		if (options.generatedCss === true) return stripTrailingLineWhitespace(require_v4_engine.stripUnmatchedTailwindSourceMediaCloseFragments(require_v4_engine.stripTailwindSourceMediaFragments(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(source))));
+		return stripTrailingLineWhitespace(require_v4_engine.stripUnmatchedTailwindSourceMediaCloseFragments(require_v4_engine.stripTailwindSourceMediaFragments(require_v4_engine.removeTailwindV4GeneratorAtRules(require_v4_engine.removeTailwindSourceDirectives(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(source), { importFallback: true })))));
 	}
 	let finalized = require_v4_engine.removeTailwindSourceDirectives(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(source), { importFallback: true });
-	if (options.generatedCss !== true) return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_hmr_timing.removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
+	if (options.generatedCss !== true) return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_v4_engine.removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 	try {
-		finalized = (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(finalized, { preservePreflight: true });
-	} catch {
-		finalized = (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(finalized, {
-			cssPreflight: !require_hmr_timing.hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
-			isTailwindcssV4: true,
-			tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
-		});
-	}
-	return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_hmr_timing.removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
+		finalized = (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(finalized, { preservePreflight: options.cssPreflight !== false });
+	} catch {}
+	finalized = (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(finalized, {
+		cssPreflight: options.cssPreflight === false ? false : !require_hmr_timing.hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
+		isTailwindcssV4: true,
+		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
+	});
+	return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(require_v4_engine.removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
 }
 function collectWebpackJsRuntimeCandidatesFromAssets(options) {
 	if (options.isWebGeneratorTarget) return;
@@ -863,19 +881,31 @@ function createWebpackCssSourceResolvers(options) {
 		const tailwindOptions = require_v4_engine.resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 		return (tailwindOptions?.v4?.cssEntries?.length ?? 0) > 0 || (tailwindOptions?.v4?.cssSources?.length ?? 0) > 0;
 	};
-	const configuredMainCssEntryFiles = (() => {
-		return [...require_v4_engine.resolveTailwindcssOptions(runtimeState.tailwindRuntime.options)?.v4?.cssEntries ?? []].filter((file) => typeof file === "string" && file.length > 0).map((file) => node_path.default.resolve(file));
+	const configuredCssEntryFiles = (() => {
+		const tailwindOptions = require_v4_engine.resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
+		const entries = [...compilerOptions.cssEntries ?? [], ...tailwindOptions?.v4?.cssEntries ?? []].filter((file) => typeof file === "string" && file.length > 0).map((file) => node_path.default.resolve(file));
+		return [...new Set(entries)];
 	})();
+	const configuredMainCssEntryFiles = configuredCssEntryFiles.slice(0, 1);
 	const inferredMainCssFiles = inferWebpackMainCssFiles(compilation.chunks, compilerOptions.cssMatcher, {
 		mainSourceFiles: new Set(configuredMainCssEntryFiles),
 		resourcesByAsset: cssAssetResources
 	});
 	const singleConfiguredCssAsset = isWebGeneratorTarget && configuredMainCssEntryFiles.length > 0 && groupedCssEntriesLength === 1 ? singleCssAssetFile : void 0;
-	const isMainCssChunk = (file) => compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file) || file === singleConfiguredCssAsset;
+	const isMainCssChunk = (file) => {
+		const resources = cssAssetResources.get(file);
+		if (resources && configuredCssEntryFiles.length > 0) for (const resource of resources) {
+			const index = configuredCssEntryFiles.findIndex((entry) => node_path.default.resolve(entry) === node_path.default.resolve(resource));
+			if (index >= 0) return index === 0;
+		}
+		if (configuredCssEntryFiles.length > 1) return false;
+		return compilerOptions.mainCssChunkMatcher(file, appType) || inferredMainCssFiles.has(file) || file === singleConfiguredCssAsset;
+	};
 	const activeWebpackCssSourceFiles = /* @__PURE__ */ new Set();
 	const resolveConfiguredMainCssSourceFile = (file) => {
 		if (!isMainCssChunk(file)) return;
 		if (configuredMainCssEntryFiles.length !== 1) return;
+		if (groupedCssEntriesLength !== 1 && file !== singleCssAssetFile) return;
 		for (const sourceFile of configuredMainCssEntryFiles) if (cssSources.has(sourceFile)) {
 			activeWebpackCssSourceFiles.add(sourceFile);
 			return sourceFile;
@@ -1734,7 +1764,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							},
 							transform: async () => {
 								const source = readCurrentProcessedRawSource();
-								const nextCss = stripTrailingLineWhitespace(finalizeCssAssetSource(hasTailwindGeneratedAssetCss && !hasGeneratedCssMarker ? isWebGeneratorTarget ? source : (await compilerOptions.styleHandler(source, cssHandlerOptionsForProcessedAsset)).css : source, { generatedCss: hasGeneratedCssMarker || hasTailwindGeneratedAssetCss }));
+								const nextCss = stripTrailingLineWhitespace(finalizeCssAssetSource(hasTailwindGeneratedAssetCss && !hasGeneratedCssMarker ? isWebGeneratorTarget ? source : (await compilerOptions.styleHandler(source, cssHandlerOptionsForProcessedAsset)).css : source, {
+									cssPreflight: cssHandlerOptionsForProcessedAsset.isMainChunk,
+									generatedCss: hasGeneratedCssMarker || hasTailwindGeneratedAssetCss
+								}));
 								debug("css skip webpack-loader-pipeline asset: %s", file);
 								return { result: new ConcatSource(finalizeTracedCss(nextCss, cssHandlerOptionsForProcessedAsset)) };
 							}
@@ -1820,7 +1853,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								}, {
 									css: currentAssetUserCss,
 									processed: true
-								}).css, { generatedCss: true }), cssHandlerOptions);
+								}).css, {
+									cssPreflight: cssHandlerOptions.isMainChunk,
+									generatedCss: true
+								}), cssHandlerOptions);
 								debug("css consume webpack loader generation: %s <- %s", file, sourceFile);
 								return { result: new ConcatSource(css) };
 							}
@@ -1854,7 +1890,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const fallbackGeneratorRuntimeSet = getGeneratorRuntimeSet();
 							const hasExplicitTailwindV4SourceCss = sourceCss !== void 0 && (require_v4_engine.hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || sourceCss.includes("@config"));
 							const currentAssetHasTailwindDirectives = require_v4_engine.hasTailwindRootDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindSourceDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindApplyDirective(generatorRawSource);
-							const shouldForceTailwindV4Generation = cssHandlerOptions.isMainChunk && hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 || currentAssetHasTailwindDirectives || hasExplicitTailwindV4SourceCss);
+							const shouldForceTailwindV4Generation = hasConfiguredTailwindV4SourceRoots() && (configuredMainCssEntryFiles.length > 0 && sourceFile !== void 0 || currentAssetHasTailwindDirectives || hasExplicitTailwindV4SourceCss);
 							const shouldSkipUnmatchedMainCssGeneration = !isWebGeneratorTarget && cssHandlerOptions.isMainChunk && sourceFile === void 0 && configuredMainCssEntryFiles.length > 0 && !currentAssetHasTailwindDirectives;
 							const resolvedScopedGeneratorRuntimeSet = await require_source_candidate_scan_signature.createScopedGeneratorRuntime({
 								cssHandlerOptions,
@@ -1917,7 +1953,10 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							}, {
 								css: removeWebpackTailwindGeneratedAssetCss(currentRawSource),
 								processed: true
-							})?.css ?? generated.css : generated.css, { generatedCss: true }) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false }), cssHandlerOptions));
+							})?.css ?? generated.css : generated.css, {
+								cssPreflight: cssHandlerOptions.isMainChunk,
+								generatedCss: true
+							}) : isWebGeneratorTarget ? finalizeCssAssetSource(generatorRawSource, { generatedCss: false }) : finalizeCssAssetSource((await compilerOptions.styleHandler(generatorRawSource, cssHandlerOptions)).css, { generatedCss: false }), cssHandlerOptions));
 							if (generated) {
 								for (const className of generated.classSet) generatorRuntimeSet.add(className);
 								debug("css handle via tailwind v%s engine(%s): %s", runtimeState.tailwindRuntime.majorVersion, generated.target, file);
@@ -2196,7 +2235,7 @@ var WeappTailwindcss = class {
 	}
 	apply(compiler) {
 		compiler.options = compiler.options || {};
-		const { disabled, onLoad, runtimeLoaderPath, tailwindRuntime, refreshTailwindcssRuntime } = this.options;
+		const { disabled, onLoad, runtimeLoaderPath, tailwindRuntime, refreshTailwindcssRuntime, styleInjector } = this.options;
 		const initialTailwindRuntime = tailwindRuntime;
 		const refreshTailwindRuntime = refreshTailwindcssRuntime;
 		const disabledOptions = require_source_candidate_scan_signature.resolvePluginDisabledState(disabled);
@@ -2316,6 +2355,7 @@ var WeappTailwindcss = class {
 		const pruneWebpackCssSources = (activeSourceFiles, _options = {}) => {
 			const tailwindOptions = require_v4_engine.resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 			const configuredSourceFiles = /* @__PURE__ */ new Set();
+			for (const entry of this.options.cssEntries ?? []) configuredSourceFiles.add(node_path.default.resolve(entry));
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) configuredSourceFiles.add(node_path.default.resolve(entry));
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file) configuredSourceFiles.add(node_path.default.resolve(source.file));
 			for (const file of webpackCssSources.keys()) if (!activeSourceFiles.has(file) && !configuredSourceFiles.has(file)) webpackCssSources.delete(file);
@@ -2324,6 +2364,7 @@ var WeappTailwindcss = class {
 		const prepareWebpackCssSources = (activeAssetResources = /* @__PURE__ */ new Set()) => {
 			const tailwindOptions = require_v4_engine.resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
 			const configuredSourceFiles = /* @__PURE__ */ new Set();
+			for (const entry of this.options.cssEntries ?? []) configuredSourceFiles.add(node_path.default.resolve(entry));
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) configuredSourceFiles.add(node_path.default.resolve(entry));
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file) configuredSourceFiles.add(node_path.default.resolve(source.file));
 			const activeSourceFiles = /* @__PURE__ */ new Set([
@@ -2340,6 +2381,7 @@ var WeappTailwindcss = class {
 		const isWebpackProcessedTailwindEntryAsset = (isMainCssChunk) => {
 			if (isMainCssChunk !== true || webpackProcessedCssSourceFiles.size === 0) return false;
 			const tailwindOptions = require_v4_engine.resolveTailwindcssOptions(runtimeState.tailwindRuntime.options);
+			for (const entry of this.options.cssEntries ?? []) if (webpackProcessedCssSourceFiles.has(node_path.default.resolve(entry))) return true;
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) if (webpackProcessedCssSourceFiles.has(node_path.default.resolve(entry))) return true;
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) if (source.file && webpackProcessedCssSourceFiles.has(node_path.default.resolve(source.file))) return true;
 			return false;
@@ -2420,6 +2462,7 @@ var WeappTailwindcss = class {
 			prepareWebpackCssSources,
 			debug
 		});
+		require_source_candidate_scan_signature.createBuiltinWebpackStyleInjectorPlugin(styleInjector, this.appType)?.apply(compiler);
 	}
 };
 //#endregion

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-khSwkXP5.js");
+const require_webpack = require("./webpack-C9u7mfGE.js");
 exports.WeappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-Bg6pefpb.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-BffTDmod.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.1.4",
+  "version": "5.1.6",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -172,16 +172,26 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
+  "tsd": {
+    "compilerOptions": {
+      "module": "NodeNext",
+      "moduleResolution": "NodeNext",
+      "paths": {
+        "@/*": [
+          "./src/*"
+        ]
+      }
+    }
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@ast-core/escape": "~1.0.1",
     "@babel/parser": "~7.29.7",
     "@babel/traverse": "~7.29.7",
     "@babel/types": "~7.29.7",
-    "@tailwindcss-mangle/engine": "0.1.1",
+    "@tailwindcss-mangle/engine": "0.1.2",
     "@vue/compiler-dom": "^3.5.39",
     "@weapp-core/escape": "~8.0.0",
     "comment-json": "^5.0.0",
@@ -194,10 +204,11 @@
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.1.4",
+    "@weapp-tailwindcss/postcss": "3.1.6",
     "@weapp-tailwindcss/reset": "0.1.1",
     "@weapp-tailwindcss/shared": "2.0.0",
-    "tailwindcss-config": "2.0.1"
+    "tailwindcss-config": "2.0.1",
+    "weapp-style-injector": "1.0.1"
   },
   "devDependencies": {
     "htmlparser2": "12.0.0"