weapp-tailwindcss 5.0.4 → 5.0.6

package/dist/{postcss-CJrmfXvi.mjs → postcss-BgINK7Nm.mjs}

@@ -1,6 +1,6 @@
-import { $ as createSourceScanPattern, Q as collectCssInlineSourceCandidates, X as DEFAULT_SOURCE_SCAN_EXTENSIONS, et as expandTailwindSourceEntries, it as resolveCssSourceEntries, nt as normalizeLegacyContentEntries, rt as parseConfigParam, t as resolveTailwindV3Source, ut as readInstalledPackageMajorVersion, y as resolveTailwindV4Source$1 } from "./v3-engine-BCUGX3gX.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DRHWC1t-.mjs";
-import postcss from "postcss";
+import { $ as collectCssInlineSourceCandidates, T as hasTailwindRootDirectives, Z as DEFAULT_SOURCE_SCAN_EXTENSIONS, at as resolveCssSourceEntries, dt as readInstalledPackageMajorVersion, et as createSourceScanPattern, it as parseConfigParam, rt as normalizeLegacyContentEntries, t as resolveTailwindV3Source, tt as expandTailwindSourceEntries, w as hasTailwindApplyDirective, y as resolveTailwindV4Source$1 } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Bgn4m8An.mjs";
+import postcss$1 from "postcss";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
 import process from "node:process";
 import path from "node:path";
@@ -38,7 +38,7 @@ function resolvePostcssProjectRoot(result, options) {
 function replaceRootCss(root, css, result) {
 	root.removeAll();
 	try {
-		const nextRoot = postcss.parse(css, { from: resolveInputFile(result) });
+		const nextRoot = postcss$1.parse(css, { from: resolveInputFile(result) });
 		root.append(nextRoot.nodes);
 	} catch {
 		root.raws = { after: css };
@@ -61,6 +61,9 @@ function addSourceDependencyMessages(result, files) {
 //#endregion
 //#region src/postcss/source-files.ts
 const POSTCSS_SOURCE_PATTERN = createSourceScanPattern(DEFAULT_SOURCE_SCAN_EXTENSIONS);
+function isTailwindV4ApplyOnlyCss$1(root, options) {
+	return options.version === 4 && hasTailwindApplyDirective(root.toString()) && !hasTailwindRootDirectives(root.toString(), { importFallback: true });
+}
 function getSourceExtension(file) {
 	return path.extname(file).slice(1) || void 0;
 }
@@ -118,10 +121,11 @@ async function collectAutoTailwindCandidates(root, result, options) {
 	const projectRoot = resolvePostcssProjectRoot(result, options);
 	const sourceEntries = [];
 	const hasSourceNone = root.toString().includes("source(none)");
+	const shouldSkipAutoScan = isTailwindV4ApplyOnlyCss$1(root, options);
 	const inlineCandidates = collectCssInlineSourceCandidates(root);
 	const configuredContentEntries = options.version === 3 ? await collectConfiguredContentEntries(root, base, options) : [];
 	if (configuredContentEntries.length > 0) sourceEntries.push(...configuredContentEntries);
-	else if (!hasSourceNone) sourceEntries.push({
+	else if (!hasSourceNone && !shouldSkipAutoScan) sourceEntries.push({
 		base,
 		negated: false,
 		pattern: POSTCSS_SOURCE_PATTERN
@@ -175,6 +179,47 @@ function resolvePostcssTailwindVersion(root, result, options) {
 //#endregion
 //#region src/postcss.ts
 const PLUGIN_NAME = "weapp-tailwindcss";
+function isTailwindV4ApplyOnlyCss(css) {
+	return hasTailwindApplyDirective(css) && !hasTailwindRootDirectives(css, { importFallback: true });
+}
+function resolveTailwindV4PostcssSourceCss(css, sourceOptions) {
+	return isTailwindV4ApplyOnlyCss(css) ? `@import "${sourceOptions.packageName ?? "tailwindcss"}" source(none);\n${css}` : css;
+}
+function normalizeSelector(selector) {
+	return selector.replace(/:not\(#\\#\)/g, "").trim();
+}
+function collectApplyOnlyCssSelectors(css) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(css).walkRules((rule) => {
+			if (!rule.nodes?.some((node) => node.type === "atrule" && node.name === "apply")) return;
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = normalizeSelector(selector);
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function ruleMatchesApplyOnlySelector(rule, selectors) {
+	return (rule.selectors ?? [rule.selector]).some((selector) => selectors.has(normalizeSelector(selector)));
+}
+function filterApplyOnlyGeneratedCss(css, rawCss) {
+	const selectors = collectApplyOnlyCssSelectors(rawCss);
+	if (selectors.size === 0) return css;
+	try {
+		const root = postcss.parse(css);
+		root.walkRules((rule) => {
+			if (!ruleMatchesApplyOnlySelector(rule, selectors) && !rule.nodes?.some((node) => node.type === "decl" && node.prop.startsWith("--"))) rule.remove();
+		});
+		root.walkAtRules((rule) => {
+			if (rule.nodes !== void 0 && rule.nodes.length === 0) rule.remove();
+		});
+		return root.toString();
+	} catch {
+		return css;
+	}
+}
 const weappTailwindcssPostcssPlugin = (options = {}) => {
 	return {
 		postcssPlugin: PLUGIN_NAME,
@@ -184,9 +229,11 @@ const weappTailwindcssPostcssPlugin = (options = {}) => {
 			const tailwindVersion = resolvePostcssTailwindVersion(root, result, options);
 			const [collectedSources, autoCandidates] = await Promise.all([collectPostcssLocalSources(root, result, options), collectAutoTailwindCandidates(root, result, options)]);
 			const generatorConfig = generatorOptions.config ?? options.config;
+			const rawCss = sourceOptions.css ?? root.toString();
+			const isApplyOnlyTailwindV4Css = tailwindVersion === 4 && isTailwindV4ApplyOnlyCss(rawCss);
 			const generator = createWeappTailwindcssGenerator(tailwindVersion === 3 ? await resolveTailwindV3Source({
 				config: generatorConfig,
-				css: sourceOptions.css ?? root.toString(),
+				css: rawCss,
 				base: resolvePostcssBase(result, options),
 				cwd: resolvePostcssProjectRoot(result, options),
 				projectRoot: resolvePostcssProjectRoot(result, options),
@@ -194,7 +241,7 @@ const weappTailwindcssPostcssPlugin = (options = {}) => {
 				postcssPlugin: options.postcssPlugin
 			}) : await resolveTailwindV4Source$1({
 				...sourceOptions,
-				css: prependConfigDirective(sourceOptions.css ?? root.toString(), generatorConfig),
+				css: prependConfigDirective(resolveTailwindV4PostcssSourceCss(rawCss, sourceOptions), generatorConfig),
 				base: resolvePostcssBase(result, options),
 				projectRoot: resolvePostcssProjectRoot(result, options)
 			}));
@@ -210,7 +257,7 @@ const weappTailwindcssPostcssPlugin = (options = {}) => {
 				target: generatorOptions.target
 			};
 			const generated = await generator.generate(generateOptions);
-			replaceRootCss(root, generated.css, result);
+			replaceRootCss(root, isApplyOnlyTailwindV4Css ? filterApplyOnlyGeneratedCss(generated.css, rawCss) : generated.css, result);
 			addDependencyMessages(result, generated);
 			addSourceDependencyMessages(result, collectedSources.files);
 			result.messages.push({

package/dist/postcss-html-transform.js

@@ -1,4 +1,4 @@
-const require_chunk = require("./chunk-D6vf50IK.js");
+const require_chunk = require("./chunk-emK7D4bc.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-Du8hY-MN.js");
+const require_postcss = require("./postcss-B7QNe78h.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-CJrmfXvi.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BgINK7Nm.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-lfenbOTF.mjs → precheck-Copn2SqE.mjs}

@@ -1,7 +1,7 @@
-import { G as createTailwindV4Engine$1, c as getRuntimeClassSetCacheEntry, ct as createDebug, d as invalidateRuntimeClassSet, ht as omitUndefined, mt as resolveBooleanObjectOption, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-BCUGX3gX.mjs";
+import { K as createTailwindV4Engine$1, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, gt as omitUndefined, ht as resolveBooleanObjectOption, lt as createDebug, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-Ji6AXPh2.mjs";
 import { a as resolveDefaultCssPreflight, i as getDefaultOptions, o as DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH, s as HARD_PARSE_CACHE_MAX_ENTRIES } from "./defaults-8xrgzxFY.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-D5RogwtV.mjs";
+import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-C0Zgo3Es.mjs";
 import { splitCandidateTokens } from "tailwindcss-patch";
 import process from "node:process";
 import path from "node:path";
@@ -4594,6 +4594,17 @@ function applyLoggerLevel(logLevel) {
 }
 //#endregion
 //#region src/context/index.ts
+function resolveContextCssPreflight(opts, ctx, majorVersion) {
+	const cssPreflight = resolveDefaultCssPreflight(opts?.cssPreflight, majorVersion);
+	if (majorVersion !== 4 || cssPreflight === false || !resolveUniAppXOptions(ctx.uniAppX).enabled) return cssPreflight;
+	const userCssPreflight = opts?.cssPreflight && typeof opts.cssPreflight === "object" ? opts.cssPreflight : void 0;
+	return {
+		...cssPreflight,
+		"border-width": userCssPreflight && "border-width" in userCssPreflight ? cssPreflight["border-width"] ?? false : "0",
+		"border-style": userCssPreflight && "border-style" in userCssPreflight ? cssPreflight["border-style"] ?? false : false,
+		"border": userCssPreflight && "border" in userCssPreflight ? cssPreflight["border"] ?? false : false
+	};
+}
 async function clearTailwindcssPatcherCache(patcher, options) {
 	if (!patcher) return;
 	const cacheOptions = patcher.options?.cache;
@@ -4631,7 +4642,7 @@ function createInternalCompilerContext(opts) {
 	logTailwindcssTarget(twPatcher, ctx.tailwindcssBasedir);
 	logRuntimeTailwindcssVersion(ctx.tailwindcssBasedir, twPatcher.packageInfo?.rootPath, twPatcher.packageInfo?.version);
 	if (opts?.__internalDeferMissingCssEntriesWarning !== true) warnMissingCssEntries(ctx, twPatcher);
-	ctx.cssPreflight = resolveDefaultCssPreflight(opts?.cssPreflight, twPatcher.majorVersion);
+	ctx.cssPreflight = resolveContextCssPreflight(opts, ctx, twPatcher.majorVersion);
 	const cssCalcOptions = applyV4CssCalcDefaults(ctx.cssCalc, twPatcher);
 	ctx.cssCalc = cssCalcOptions;
 	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, toCustomAttributesEntities(ctx.customAttributes), cssCalcOptions, twPatcher.majorVersion);

package/dist/{precheck-DgpVCvYk.js → precheck-CyPbGn38.js}

@@ -1,8 +1,8 @@
-const require_chunk = require("./chunk-D6vf50IK.js");
-const require_v3_engine = require("./v3-engine-CBahpuIg.js");
-const require_defaults = require("./defaults-C5w9OOrj.js");
-require("./utils-nta4tfFs.js");
-const require_tailwindcss = require("./tailwindcss-26ZFr5kv.js");
+const require_chunk = require("./chunk-emK7D4bc.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_defaults = require("./defaults-BPUuNYcD.js");
+require("./utils-Dolmt8EO.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
 let tailwindcss_patch = require("tailwindcss-patch");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
@@ -4601,6 +4601,17 @@ function applyLoggerLevel(logLevel) {
 }
 //#endregion
 //#region src/context/index.ts
+function resolveContextCssPreflight(opts, ctx, majorVersion) {
+	const cssPreflight = require_defaults.resolveDefaultCssPreflight(opts?.cssPreflight, majorVersion);
+	if (majorVersion !== 4 || cssPreflight === false || !require_tailwindcss.resolveUniAppXOptions(ctx.uniAppX).enabled) return cssPreflight;
+	const userCssPreflight = opts?.cssPreflight && typeof opts.cssPreflight === "object" ? opts.cssPreflight : void 0;
+	return {
+		...cssPreflight,
+		"border-width": userCssPreflight && "border-width" in userCssPreflight ? cssPreflight["border-width"] ?? false : "0",
+		"border-style": userCssPreflight && "border-style" in userCssPreflight ? cssPreflight["border-style"] ?? false : false,
+		"border": userCssPreflight && "border" in userCssPreflight ? cssPreflight["border"] ?? false : false
+	};
+}
 async function clearTailwindcssPatcherCache(patcher, options) {
 	if (!patcher) return;
 	const cacheOptions = patcher.options?.cache;
@@ -4638,7 +4649,7 @@ function createInternalCompilerContext(opts) {
 	logTailwindcssTarget(twPatcher, ctx.tailwindcssBasedir);
 	logRuntimeTailwindcssVersion(ctx.tailwindcssBasedir, twPatcher.packageInfo?.rootPath, twPatcher.packageInfo?.version);
 	if (opts?.__internalDeferMissingCssEntriesWarning !== true) require_tailwindcss.warnMissingCssEntries(ctx, twPatcher);
-	ctx.cssPreflight = require_defaults.resolveDefaultCssPreflight(opts?.cssPreflight, twPatcher.majorVersion);
+	ctx.cssPreflight = resolveContextCssPreflight(opts, ctx, twPatcher.majorVersion);
 	const cssCalcOptions = require_tailwindcss.applyV4CssCalcDefaults(ctx.cssCalc, twPatcher);
 	ctx.cssCalc = cssCalcOptions;
 	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, toCustomAttributesEntities(ctx.customAttributes), cssCalcOptions, twPatcher.majorVersion);

package/dist/presets.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_chunk = require("./chunk-D6vf50IK.js");
-const require_v3_engine = require("./v3-engine-CBahpuIg.js");
-const require_utils = require("./utils-nta4tfFs.js");
-const require_tailwindcss = require("./tailwindcss-26ZFr5kv.js");
+const require_chunk = require("./chunk-emK7D4bc.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_utils = require("./utils-Dolmt8EO.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
 require("./logger-TlKT3xmR.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
@@ -132,7 +132,11 @@ function uniAppX(options) {
 			...installedTailwindDefaults ?? {},
 			resolve: resolvedResolve
 		},
-		cssPreflight: { "border-style": false },
+		cssPreflight: {
+			"border-width": "0",
+			"border-style": false,
+			"border": false
+		},
 		cssPresetEnv: { features: { "custom-properties": { preserve: false } } },
 		...options.customAttributes ? { customAttributes: options.customAttributes } : {}
 	});

package/dist/presets.mjs

@@ -1,6 +1,6 @@
-import { ht as omitUndefined } from "./v3-engine-BCUGX3gX.mjs";
+import { gt as omitUndefined } from "./v3-engine-Ji6AXPh2.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-D5RogwtV.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C0Zgo3Es.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import process from "node:process";
 import path from "node:path";
@@ -126,7 +126,11 @@ function uniAppX(options) {
 			...installedTailwindDefaults ?? {},
 			resolve: resolvedResolve
 		},
-		cssPreflight: { "border-style": false },
+		cssPreflight: {
+			"border-width": "0",
+			"border-style": false,
+			"border": false
+		},
 		cssPresetEnv: { features: { "custom-properties": { preserve: false } } },
 		...options.customAttributes ? { customAttributes: options.customAttributes } : {}
 	});

package/dist/reset.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_chunk = require("./chunk-D6vf50IK.js");
+const require_chunk = require("./chunk-emK7D4bc.js");
 let _weapp_tailwindcss_reset = require("@weapp-tailwindcss/reset");
 _weapp_tailwindcss_reset = require_chunk.__toESM(_weapp_tailwindcss_reset);
 Object.defineProperty(exports, "default", {

package/dist/{source-candidates-D7b-Jzsx.mjs → source-candidates-BODCmzz5.mjs}

@@ -1,4 +1,4 @@
-import { Z as FULL_SOURCE_SCAN_EXTENSION_RE, at as resolveSourceScanPath, st as toPosixPath, tt as isFileMatchedByTailwindSourceEntries } from "./v3-engine-BCUGX3gX.mjs";
+import { Q as FULL_SOURCE_SCAN_EXTENSION_RE, ct as toPosixPath, nt as isFileMatchedByTailwindSourceEntries, ot as resolveSourceScanPath } from "./v3-engine-Ji6AXPh2.mjs";
 import { createRequire } from "node:module";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import path from "node:path";

package/dist/{source-candidates-B4NvId_j.js → source-candidates-Caf2GDvx.js}

@@ -1,5 +1,5 @@
-const require_chunk = require("./chunk-D6vf50IK.js");
-const require_v3_engine = require("./v3-engine-CBahpuIg.js");
+const require_chunk = require("./chunk-emK7D4bc.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
 let node_module = require("node:module");
 let tailwindcss_patch = require("tailwindcss-patch");
 let node_path = require("node:path");

package/dist/{tailwindcss-D5RogwtV.mjs → tailwindcss-C0Zgo3Es.mjs}

@@ -1,4 +1,4 @@
-import { _t as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, gt as findNearestPackageRoot, ht as omitUndefined, lt as createTailwindcssPatcher, pt as normalizeStringListOption, ut as readInstalledPackageMajorVersion, vt as findWorkspaceRoot } from "./v3-engine-BCUGX3gX.mjs";
+import { _t as findNearestPackageRoot, dt as readInstalledPackageMajorVersion, f as runtimeSignaturePatchersSymbol, gt as omitUndefined, mt as normalizeStringListOption, ut as createTailwindcssPatcher, vt as findWorkspacePackageDir, yt as findWorkspaceRoot } from "./v3-engine-Ji6AXPh2.mjs";
 import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";

package/dist/{tailwindcss-26ZFr5kv.js → tailwindcss-Tw6CSVHL.js}

@@ -1,6 +1,6 @@
-const require_chunk = require("./chunk-D6vf50IK.js");
-const require_v3_engine = require("./v3-engine-CBahpuIg.js");
-require("./utils-nta4tfFs.js");
+const require_chunk = require("./chunk-emK7D4bc.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+require("./utils-Dolmt8EO.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");
 let node_process = require("node:process");