weapp-tailwindcss 5.0.0-next.25 → 5.0.0-next.27

package/dist/{incremental-runtime-class-set-BlJ86j-A.mjs → incremental-runtime-class-set-C4JgSgRY.mjs}

@@ -1,11 +1,11 @@
-import { B as createDebug, D as loadTailwindV4DesignSystem, E as filterUnsupportedMiniProgramTailwindV4Candidates, R as resolveTailwindV4CssSourceBase, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, q as omitUndefined, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-COw08vWd.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CtqzN9L-.mjs";
-import { f as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-B4CpMt_w.mjs";
+import { B as createDebug, D as loadTailwindV4DesignSystem, E as filterUnsupportedMiniProgramTailwindV4Candidates, R as resolveTailwindV4CssSourceBase, S as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, q as omitUndefined, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1 } from "./v3-engine-DcvCCHfs.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CbpjNxJh.mjs";
+import { p as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-uG16Cqaj.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
 import path from "node:path";
 import process from "node:process";
-import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
+import { extractRawCandidatesWithPositions, extractSourceCandidates, extractValidCandidates } from "tailwindcss-patch";
 import { finalizeMiniProgramCss, removeUnsupportedMiniProgramAtRules } from "@weapp-tailwindcss/postcss";
 //#region src/bundlers/shared/generator-css/markers.ts
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
@@ -1308,6 +1308,16 @@ function mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, options) {
 function shouldIsolateMatchedCssSource(source, sourceEntries) {
 	return Boolean(source.__weappTailwindcssMeta?.matchedCssSourceFile && sourceEntries !== void 0);
 }
+function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
+	if (majorVersion !== 4 || isolateCssSource) return false;
+	return target === "web" || generatorRuntime.size === 0;
+}
+function shouldAppendWebBundleCssFallback(target, options) {
+	return target === "web" && !options.hasMatchedCssSourceFile && !options.hasSourceDirectives;
+}
+function isEmptyCssSourceOrderParts(parts) {
+	return parts.before.trim().length === 0 && parts.after.trim().length === 0;
+}
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
 	const preflightStyleOptions = {
 		cssPreflight: opts.cssPreflight,
@@ -1447,9 +1457,11 @@ async function generateCssByGenerator(options) {
 	if (!SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || !shouldGenerateCurrentCss || majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers) return;
 	try {
 		await runtimeState.readyPromise;
+		const currentCssCandidates = majorVersion === 4 ? await extractSourceCandidates(effectiveRawSource, "css") : [];
+		const runtimeWithCurrentCss = currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
 		const sources = await resolveGeneratorSources(majorVersion, runtimeState, effectiveRawSource, file, cssHandlerOptions, generatorOptions, {
 			getSourceCandidatesForEntries,
-			runtime
+			runtime: runtimeWithCurrentCss
 		});
 		const generatorStyleOptions = resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorOptions.styleOptions);
 		const configuredContainerCompat = hasConfiguredContainerCompatSources(sources);
@@ -1458,15 +1470,15 @@ async function generateCssByGenerator(options) {
 			const sourceEntries = getSourceCandidatesForEntries && majorVersion === 4 ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
 			const scopedRuntime = sourceEntries ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
 			const isolateCssSource = shouldIsolateMatchedCssSource(source, sourceEntries);
-			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, {
+			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtimeWithCurrentCss, {
 				cssHandlerOptions,
 				isolateCssSource
-			}) : runtime;
+			}) : runtimeWithCurrentCss;
 			const generatorRuntime = majorVersion === 4 && generatorOptions.target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(sourceRuntime) : sourceRuntime;
 			return generator.generate({
 				candidates: generatorRuntime,
 				incrementalCache: majorVersion === 3 || majorVersion === 4,
-				scanSources: majorVersion === 4 && generatorRuntime.size === 0 && !isolateCssSource,
+				scanSources: shouldScanTailwindV4Sources(majorVersion, generatorOptions.target, generatorRuntime, isolateCssSource),
 				styleOptions: generatorStyleOptions,
 				tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
 				target: generatorOptions.target
@@ -1512,6 +1524,13 @@ async function generateCssByGenerator(options) {
 			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
 			const afterUserCss = await transformGeneratorUserCss(orderedExtraCss.after, userCssOptions);
 			css = createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, css), afterUserCss);
+			if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
+				hasSourceDirectives,
+				hasMatchedCssSourceFile
+			})) {
+				const userCss = await transformGeneratorUserCss(effectiveRawSource, userCssOptions);
+				css = createCssSourceOrderAppend(css, userCss);
+			}
 			if (generated.target === "weapp") {
 				css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
@@ -1526,12 +1545,27 @@ async function generateCssByGenerator(options) {
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = stripTailwindBanner(generated.css);
 		if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
-		if (hasMatchedCssSourceFile || generated.target === "web") return {
-			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
-			target: generated.target,
-			source: "generator",
-			dependencies: generated.dependencies
-		};
+		if (hasMatchedCssSourceFile || generated.target === "web") {
+			if (shouldAppendWebBundleCssFallback(generated.target, {
+				hasSourceDirectives,
+				hasMatchedCssSourceFile
+			})) {
+				const userCss = await transformGeneratorUserCss(effectiveRawSource, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback
+				});
+				css = createCssSourceOrderAppend(css, userCss);
+			}
+			return {
+				css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
+				target: generated.target,
+				source: "generator",
+				dependencies: generated.dependencies
+			};
+		}
 		css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		return {

package/dist/index.d.ts

@@ -5,5 +5,5 @@ export { weappTailwindcssPostcssPlugin } from './postcss';
 export type { WeappTailwindcssPostcssPluginOptions } from './postcss';
 export type * from './types';
 export { WeappTailwindcss } from './vite';
-export { UnifiedWebpackPluginV5, weappTailwindcssPackageDir } from './webpack';
+export { weappTailwindcssPackageDir } from './webpack';
 export { unitConversionComposeRules, unitConversionPresets, } from '@weapp-tailwindcss/postcss';

package/dist/index.js

@@ -1,12 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./chunk-8l464Juk.js");
-const require_generator = require("./generator-DTPePQZ9.js");
+const require_generator = require("./generator-DRNbzjx5.js");
 const require_gulp = require("./gulp.js");
-const require_postcss = require("./postcss-BAO9tGi5.js");
-const require_vite = require("./vite-DE8Vfzal.js");
-const require_webpack = require("./webpack-CTJcw_sX.js");
+const require_postcss = require("./postcss-Br1eOaFd.js");
+const require_vite = require("./vite-Bg18XZZc.js");
+const require_webpack = require("./webpack-BzPDhzSz.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
-exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-CtqzN9L-.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CbpjNxJh.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-CYPHxj7a.mjs";
-import { t as WeappTailwindcss } from "./vite-hZsQAY1a.mjs";
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-c2WJnCJI.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-YetooK6S.mjs";
+import { t as WeappTailwindcss } from "./vite-DOmiMftw.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-BdrjJf41.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
-export { UnifiedWebpackPluginV5, WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };
+export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{postcss-BAO9tGi5.js → postcss-Br1eOaFd.js}

@@ -1,6 +1,6 @@
-const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
-const require_generator = require("./generator-DTPePQZ9.js");
+const require_chunk = require("./chunk-D6vf50IK.js");
+const require_v3_engine = require("./v3-engine-B_33V3Lu.js");
+const require_generator = require("./generator-DRNbzjx5.js");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
 let node_path = require("node:path");

package/dist/{postcss-DYktK8_T.mjs → postcss-C7BMYpEF.mjs}

@@ -84,10 +84,10 @@ const creator = () => {
 				];
 				atRule.replaceWith(nextNodes);
 				startComment.raws.before = hasPreviousNode ? "\n" : "";
-				startComment.raws.after = "\n";
+				startComment.raws["after"] = "\n";
 				if (clonedNodes[0]) clonedNodes[0].raws.before = "\n";
 				endComment.raws.before = "\n";
-				endComment.raws.after = "\n";
+				endComment.raws["after"] = "\n";
 				const nextNode = endComment?.next();
 				if (nextNode) nextNode.raws.before = "\n";
 			}
@@ -122,10 +122,10 @@ const creator = () => {
 				if ((parentRule.nodes?.length ?? 0) === 0) parentRule.replaceWith(nextNodes);
 				else parentRule.after(nextNodes);
 				startComment.raws.before = hasPreviousNode ? "\n" : "";
-				startComment.raws.after = "\n";
+				startComment.raws["after"] = "\n";
 				conditionalRule.raws.before = "\n";
 				endComment.raws.before = "\n";
-				endComment.raws.after = "\n";
+				endComment.raws["after"] = "\n";
 				const nextNode = endComment.next();
 				if (nextNode) nextNode.raws.before = "\n";
 				return true;

package/dist/{postcss-DXkxsPNg.js → postcss-CiYLsqZn.js}

@@ -84,10 +84,10 @@ const creator = () => {
 				];
 				atRule.replaceWith(nextNodes);
 				startComment.raws.before = hasPreviousNode ? "\n" : "";
-				startComment.raws.after = "\n";
+				startComment.raws["after"] = "\n";
 				if (clonedNodes[0]) clonedNodes[0].raws.before = "\n";
 				endComment.raws.before = "\n";
-				endComment.raws.after = "\n";
+				endComment.raws["after"] = "\n";
 				const nextNode = endComment?.next();
 				if (nextNode) nextNode.raws.before = "\n";
 			}
@@ -122,10 +122,10 @@ const creator = () => {
 				if ((parentRule.nodes?.length ?? 0) === 0) parentRule.replaceWith(nextNodes);
 				else parentRule.after(nextNodes);
 				startComment.raws.before = hasPreviousNode ? "\n" : "";
-				startComment.raws.after = "\n";
+				startComment.raws["after"] = "\n";
 				conditionalRule.raws.before = "\n";
 				endComment.raws.before = "\n";
-				endComment.raws.after = "\n";
+				endComment.raws["after"] = "\n";
 				const nextNode = endComment.next();
 				if (nextNode) nextNode.raws.before = "\n";
 				return true;

package/dist/{postcss-CYPHxj7a.mjs → postcss-YetooK6S.mjs}

@@ -1,5 +1,5 @@
-import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-COw08vWd.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CtqzN9L-.mjs";
+import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-DcvCCHfs.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CbpjNxJh.mjs";
 import postcss from "postcss";
 import path from "node:path";
 import process from "node:process";

package/dist/postcss-html-transform.js

@@ -1,4 +1,4 @@
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_chunk = require("./chunk-D6vf50IK.js");
 let _weapp_tailwindcss_postcss_html_transform = require("@weapp-tailwindcss/postcss/html-transform");
 _weapp_tailwindcss_postcss_html_transform = require_chunk.__toESM(_weapp_tailwindcss_postcss_html_transform);
 //#region src/postcss-html-transform.ts

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-BAO9tGi5.js");
+const require_postcss = require("./postcss-Br1eOaFd.js");
 exports.default = require_postcss.weappTailwindcssPostcssPlugin;
 exports.weappTailwindcssPostcssPlugin = require_postcss.weappTailwindcssPostcssPlugin;

package/dist/postcss.mjs

@@ -1,2 +1,2 @@
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-CYPHxj7a.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-YetooK6S.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };