weapp-tailwindcss 5.1.4 → 5.1.6

package/dist/{tailwindcss-D0JF0fuZ.mjs → tailwindcss-Bjr3aphG.mjs}

@@ -1,4 +1,4 @@
-import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, ct as omitUndefined, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, ot as resolveCssMacroTailwindV4Source, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, ut as loadTailwindV4DesignSystem, v as normalizeStringListOption } from "./v4-engine-BuuYDXt1.mjs";
+import { Ct as collectCssInlineSourceCandidates, Et as omitUndefined, _ as resolveTailwindcssOptions, _t as normalizeLegacyContentEntries, a as filterTailwindV4CssSourceRoots, c as groupCssEntriesByBase, d as normalizeCssEntries, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, ht as expandTailwindSourceEntries, i as resolveTailwindV4SourceOptionsFromRuntime, kt as loadTailwindV4DesignSystem, l as guessBasedirFromEntries, m as findWorkspaceRoot, mt as createTailwindSourceEntryMatcher, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, p as findWorkspacePackageDir, pt as FULL_SOURCE_SCAN_PATTERN, u as isTailwindV4CssEntry, v as normalizeStringListOption, vt as parseConfigParam, wt as resolveCssMacroTailwindV4Source, xt as resolveTailwindV4CssSourceBase, yt as resolveCssSourceEntries } from "./v4-engine-DRQaCFMm.mjs";
 import { n as defuOverrideArray$1 } from "./utils-DodxWHGz.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -12,6 +12,41 @@ import { logger } from "@weapp-tailwindcss/logger";
 import fg from "fast-glob";
 import { loadConfig } from "tailwindcss-config";
 import { fileURLToPath } from "node:url";
+//#region src/tailwindcss/v4/preflight.ts
+function parseCssImportSpecifier(params) {
+	const value = params.trim();
+	const quoted = /^(['"])(.*?)\1/.exec(value);
+	if (quoted) return quoted[2];
+	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
+	return url?.[2] ?? url?.[3];
+}
+function normalizeTailwindImportSpecifier(params) {
+	return parseCssImportSpecifier(params)?.replaceAll("\\", "/");
+}
+function isTailwindV4CssImportParam(params) {
+	const specifier = normalizeTailwindImportSpecifier(params);
+	return specifier === "tailwindcss" || specifier === "tailwindcss4" || specifier?.startsWith("tailwindcss/") === true || specifier?.startsWith("tailwindcss4/") === true || specifier?.endsWith("/tailwindcss/index.css") === true;
+}
+function isTailwindV4PreflightImportParam(params) {
+	const specifier = normalizeTailwindImportSpecifier(params);
+	return specifier === "tailwindcss" || specifier === "tailwindcss4" || specifier === "tailwindcss/preflight" || specifier === "tailwindcss/preflight.css" || specifier === "tailwindcss4/preflight" || specifier === "tailwindcss4/preflight.css" || specifier?.endsWith("/tailwindcss/index.css") === true || specifier?.endsWith("/tailwindcss/preflight.css") === true;
+}
+function includesTailwindV4PreflightDirective(css) {
+	try {
+		const root = postcss.parse(css);
+		let includesPreflight = false;
+		root.walkAtRules("import", (rule) => {
+			includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
+		});
+		root.walkAtRules("tailwind", (rule) => {
+			includesPreflight || (includesPreflight = rule.params.trim() === "base");
+		});
+		return includesPreflight;
+	} catch {
+		return /@import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/(?:preflight(?:\.css)?|index\.css))?["')\s;]/.test(css) || /@tailwind\s+base\b/.test(css);
+	}
+}
+//#endregion
 //#region src/bundlers/vite/static-config-content.ts
 function skipWhitespaceAndComments(source, start) {
 	let index = start;
@@ -194,17 +229,6 @@ function parseImportSourceParam(params) {
 		sourcePath: match[3]
 	};
 }
-function parseCssImportSpecifier(params) {
-	const value = params.trim();
-	const quoted = /^(['"])(.*?)\1/.exec(value);
-	if (quoted) return quoted[2];
-	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
-	return url?.[2] ?? url?.[3];
-}
-function isTailwindCssImport(params) {
-	const specifier = parseCssImportSpecifier(params);
-	return specifier === "tailwindcss" || specifier?.startsWith("tailwindcss/") || specifier?.replaceAll("\\", "/").endsWith("/tailwindcss/index.css");
-}
 function resolveSourceBase(base, sourcePath) {
 	return path.isAbsolute(sourcePath) ? sourcePath : path.resolve(base, sourcePath);
 }
@@ -294,17 +318,22 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 	let importSourceBase;
 	let hasSourceNone = false;
 	let hasTailwindCssImport = false;
+	let includesPreflight = false;
 	const [sourceEntries, configEntries] = await Promise.all([resolveCssSourceEntries(root, base, VITE_SOURCE_CANDIDATE_PATTERN), resolveConfigContentEntries(root, base)]);
 	const entries = [...configEntries.entries, ...sourceEntries];
 	const hasPositiveEntries = entries.some((entry) => !entry.negated);
 	const inlineCandidates = collectCssInlineSourceCandidates(root);
 	root.walkAtRules("import", (rule) => {
-		if (!isTailwindCssImport(rule.params)) return;
+		if (!isTailwindV4CssImportParam(rule.params)) return;
 		hasTailwindCssImport = true;
+		includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
 		const sourceParam = parseImportSourceParam(rule.params);
 		if (sourceParam?.none) hasSourceNone = true;
 		if (sourceParam?.sourcePath) importSourceBase = resolveSourceBase(base, sourceParam.sourcePath);
 	});
+	root.walkAtRules("tailwind", (rule) => {
+		includesPreflight || (includesPreflight = rule.params.trim() === "base");
+	});
 	if (importSourceBase) return {
 		entries: [{
 			base: importSourceBase,
@@ -312,30 +341,35 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 			pattern: VITE_SOURCE_CANDIDATE_PATTERN
 		}, ...entries],
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (hasSourceNone) return {
 		entries,
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (hasPositiveEntries) return {
 		entries,
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (inlineCandidates.included.size > 0 || inlineCandidates.excluded.size > 0) return {
 		entries: [],
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	return hasTailwindCssImport ? {
 		entries,
 		explicit: false,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	} : void 0;
@@ -940,6 +974,19 @@ function createEngineTailwindcssRuntime(options) {
 		if (typeof options.filter !== "function") return classSet;
 		return new Set([...classSet].filter((className) => options.filter?.(className) !== false));
 	}
+	function hasTailwindV4ApplyContext(css) {
+		if (!css.includes("@apply")) return false;
+		try {
+			const root = postcss.parse(css);
+			let hasContext = false;
+			root.walkAtRules((rule) => {
+				if (rule.name === "reference" || rule.name === "import" || rule.name === "tailwind" && rule.params.trim() === "utilities") hasContext = true;
+			});
+			return hasContext;
+		} catch {
+			return false;
+		}
+	}
 	async function collectClassSet() {
 		const report = await collectContentTokens();
 		const rawCandidates = new Set(report.entries.map((entry) => {
@@ -955,7 +1002,7 @@ function createEngineTailwindcssRuntime(options) {
 		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
-			if (!css.includes("@apply")) continue;
+			if (!hasTailwindV4ApplyContext(css)) continue;
 			try {
 				postcss.parse(css).walkAtRules("apply", (rule) => {
 					for (const candidate of rule.params.split(/\s+/)) {
@@ -1420,4 +1467,4 @@ function createTailwindcssRuntimeFromContext(ctx) {
 	return createTailwindcssRuntimeForBase(resolvedTailwindcssBasedir, normalizedCssEntries ?? rawCssEntries, runtimeOptions);
 }
 //#endregion
-export { resolveViteTailwindV4CssDependencies as _, findTailwindConfig as a, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, createViteSourceScanMatcher as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, resolveUniAppXOptions as i, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, resolveViteSourceScanEntries as p, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssRuntimeFromContext as t, getRuntimeClassSetSignatureWithSources as u };
+export { resolveViteTailwindV4CssDependencies as _, findTailwindConfig as a, getRuntimeClassSetCacheEntry as c, invalidateRuntimeClassSet as d, createViteSourceScanMatcher as f, resolveTailwindV4EntriesFromCssCached as g, resolveTailwindV4EntriesFromCss as h, resolveUniAppXOptions as i, getRuntimeClassSetSignature as l, discoverTailwindV4CssEntries as m, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, resolveViteSourceScanEntries as p, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssRuntimeFromContext as t, getRuntimeClassSetSignatureWithSources as u, includesTailwindV4PreflightDirective as v };

package/dist/{tailwindcss-D2xs4OEu.js → tailwindcss-DYJ3HZD2.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_v4_engine = require("./v4-engine-C9cmNlP8.js");
 require("./utils-D3h8j7Mk.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -16,6 +16,41 @@ let fast_glob = require("fast-glob");
 fast_glob = require_rolldown_runtime.__toESM(fast_glob);
 let tailwindcss_config = require("tailwindcss-config");
 let node_url = require("node:url");
+//#region src/tailwindcss/v4/preflight.ts
+function parseCssImportSpecifier(params) {
+	const value = params.trim();
+	const quoted = /^(['"])(.*?)\1/.exec(value);
+	if (quoted) return quoted[2];
+	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
+	return url?.[2] ?? url?.[3];
+}
+function normalizeTailwindImportSpecifier(params) {
+	return parseCssImportSpecifier(params)?.replaceAll("\\", "/");
+}
+function isTailwindV4CssImportParam(params) {
+	const specifier = normalizeTailwindImportSpecifier(params);
+	return specifier === "tailwindcss" || specifier === "tailwindcss4" || specifier?.startsWith("tailwindcss/") === true || specifier?.startsWith("tailwindcss4/") === true || specifier?.endsWith("/tailwindcss/index.css") === true;
+}
+function isTailwindV4PreflightImportParam(params) {
+	const specifier = normalizeTailwindImportSpecifier(params);
+	return specifier === "tailwindcss" || specifier === "tailwindcss4" || specifier === "tailwindcss/preflight" || specifier === "tailwindcss/preflight.css" || specifier === "tailwindcss4/preflight" || specifier === "tailwindcss4/preflight.css" || specifier?.endsWith("/tailwindcss/index.css") === true || specifier?.endsWith("/tailwindcss/preflight.css") === true;
+}
+function includesTailwindV4PreflightDirective(css) {
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
+		let includesPreflight = false;
+		root.walkAtRules("import", (rule) => {
+			includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
+		});
+		root.walkAtRules("tailwind", (rule) => {
+			includesPreflight || (includesPreflight = rule.params.trim() === "base");
+		});
+		return includesPreflight;
+	} catch {
+		return /@import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/(?:preflight(?:\.css)?|index\.css))?["')\s;]/.test(css) || /@tailwind\s+base\b/.test(css);
+	}
+}
+//#endregion
 //#region src/bundlers/vite/static-config-content.ts
 function skipWhitespaceAndComments(source, start) {
 	let index = start;
@@ -198,17 +233,6 @@ function parseImportSourceParam(params) {
 		sourcePath: match[3]
 	};
 }
-function parseCssImportSpecifier(params) {
-	const value = params.trim();
-	const quoted = /^(['"])(.*?)\1/.exec(value);
-	if (quoted) return quoted[2];
-	const url = /^url\(\s*(?:(['"])(.*?)\1|([^'")\s]+))\s*\)/.exec(value);
-	return url?.[2] ?? url?.[3];
-}
-function isTailwindCssImport(params) {
-	const specifier = parseCssImportSpecifier(params);
-	return specifier === "tailwindcss" || specifier?.startsWith("tailwindcss/") || specifier?.replaceAll("\\", "/").endsWith("/tailwindcss/index.css");
-}
 function resolveSourceBase(base, sourcePath) {
 	return node_path.default.isAbsolute(sourcePath) ? sourcePath : node_path.default.resolve(base, sourcePath);
 }
@@ -298,17 +322,22 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 	let importSourceBase;
 	let hasSourceNone = false;
 	let hasTailwindCssImport = false;
+	let includesPreflight = false;
 	const [sourceEntries, configEntries] = await Promise.all([require_v4_engine.resolveCssSourceEntries(root, base, VITE_SOURCE_CANDIDATE_PATTERN), resolveConfigContentEntries(root, base)]);
 	const entries = [...configEntries.entries, ...sourceEntries];
 	const hasPositiveEntries = entries.some((entry) => !entry.negated);
 	const inlineCandidates = require_v4_engine.collectCssInlineSourceCandidates(root);
 	root.walkAtRules("import", (rule) => {
-		if (!isTailwindCssImport(rule.params)) return;
+		if (!isTailwindV4CssImportParam(rule.params)) return;
 		hasTailwindCssImport = true;
+		includesPreflight || (includesPreflight = isTailwindV4PreflightImportParam(rule.params));
 		const sourceParam = parseImportSourceParam(rule.params);
 		if (sourceParam?.none) hasSourceNone = true;
 		if (sourceParam?.sourcePath) importSourceBase = resolveSourceBase(base, sourceParam.sourcePath);
 	});
+	root.walkAtRules("tailwind", (rule) => {
+		includesPreflight || (includesPreflight = rule.params.trim() === "base");
+	});
 	if (importSourceBase) return {
 		entries: [{
 			base: importSourceBase,
@@ -316,30 +345,35 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 			pattern: VITE_SOURCE_CANDIDATE_PATTERN
 		}, ...entries],
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (hasSourceNone) return {
 		entries,
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (hasPositiveEntries) return {
 		entries,
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	if (inlineCandidates.included.size > 0 || inlineCandidates.excluded.size > 0) return {
 		entries: [],
 		explicit: true,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
 	return hasTailwindCssImport ? {
 		entries,
 		explicit: false,
+		includesPreflight,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	} : void 0;
@@ -944,6 +978,19 @@ function createEngineTailwindcssRuntime(options) {
 		if (typeof options.filter !== "function") return classSet;
 		return new Set([...classSet].filter((className) => options.filter?.(className) !== false));
 	}
+	function hasTailwindV4ApplyContext(css) {
+		if (!css.includes("@apply")) return false;
+		try {
+			const root = _weapp_tailwindcss_postcss.postcss.parse(css);
+			let hasContext = false;
+			root.walkAtRules((rule) => {
+				if (rule.name === "reference" || rule.name === "import" || rule.name === "tailwind" && rule.params.trim() === "utilities") hasContext = true;
+			});
+			return hasContext;
+		} catch {
+			return false;
+		}
+	}
 	async function collectClassSet() {
 		const report = await collectContentTokens();
 		const rawCandidates = new Set(report.entries.map((entry) => {
@@ -959,7 +1006,7 @@ function createEngineTailwindcssRuntime(options) {
 		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
-			if (!css.includes("@apply")) continue;
+			if (!hasTailwindV4ApplyContext(css)) continue;
 			try {
 				_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules("apply", (rule) => {
 					for (const candidate of rule.params.split(/\s+/)) {
@@ -1472,6 +1519,12 @@ Object.defineProperty(exports, "getRuntimeClassSetSignatureWithSources", {
 		return getRuntimeClassSetSignatureWithSources;
 	}
 });
+Object.defineProperty(exports, "includesTailwindV4PreflightDirective", {
+	enumerable: true,
+	get: function() {
+		return includesTailwindV4PreflightDirective;
+	}
+});
 Object.defineProperty(exports, "invalidateRuntimeClassSet", {
 	enumerable: true,
 	get: function() {

package/dist/{transform-BP86eSZp.mjs → transform--155BmeJ.mjs}

@@ -1,4 +1,4 @@
-import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-Bkpmt3ja.mjs";
+import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-3GGqW9vw.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";

package/dist/{transform-CXCQ28Tc.js → transform-B6_y_yCB.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_context = require("./context-DCVMkTRj.js");
+const require_context = require("./context-BCSk_YnL.js");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let magic_string = require("magic-string");
 magic_string = require_rolldown_runtime.__toESM(magic_string);

package/dist/typedoc.export.d.ts

@@ -1,3 +1,4 @@
 export type { WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, WeappTailwindcssPostcssPluginOptions, } from './index';
+export type { WeappTailwindcssStyleInjectorOptions } from './types';
 export type { ApplyOptions, CacheOptions, ExtractOptions, TailwindCssOptions, TailwindCssRuntimeOptions, TailwindV4Options, } from './types/typedoc-tailwindcss-runtime';
 export type { UserDefinedOptions } from './types/user-defined-options';

package/dist/types/index.d.ts

@@ -7,8 +7,9 @@ import type { AppType, IArbitraryValues, ICustomAttributesEntities } from './sha
 import type { UniAppXComponentLocalStylesOptions, UniAppXOptions as UniAppXUserDefinedOptions, UserDefinedOptions } from './user-defined-options';
 import type { LengthUnitsRuntimeOptions, TailwindContentTokenReport, TailwindcssExtractOptions, TailwindcssExtractResult, TailwindCssOptions, TailwindCssRuntimeOptions, TailwindPackageInfo } from '../tailwindcss/runtime-types';
 export type { TailwindCssOptions, TailwindCssRuntimeOptions, UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
-export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
 export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities, IUnocssCompatibilityOptions } from './shared';
+export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
+export type { WeappTailwindcssStyleInjectorOptions } from '../style-injector/internal';
 export type RequiredDefined<T> = {
     [K in keyof T]-?: Exclude<T[K], undefined>;
 };

package/dist/types/user-defined-options/general.d.ts

@@ -2,6 +2,7 @@ import type { ParserOptions } from '@babel/parser';
 import type { CssOptions, LoadedPostcssOptions } from '@weapp-tailwindcss/postcss/types';
 import type { ICreateCacheReturnType } from '../../cache';
 import type { WeappTailwindcssGeneratorUserOptions } from '../../generator';
+import type { WeappTailwindcssStyleInjectorUserOptions } from '../../style-injector/internal';
 import type { AppType, IArbitraryValues, IUnocssCompatibilityOptions } from '../shared';
 import type { LengthUnitsRuntimeOptions, TailwindCssRuntimeOptions } from '../../tailwindcss/runtime-types';
 export interface CssSourceTraceOptions {
@@ -18,6 +19,7 @@ export interface UserDefinedOptionsGeneralPart {
     replaceRuntimePackages?: boolean | Record<string, string> | undefined;
     rewriteCssImports?: boolean | undefined;
     generator?: WeappTailwindcssGeneratorUserOptions | undefined;
+    styleInjector?: WeappTailwindcssStyleInjectorUserOptions | undefined;
     cssSourceTrace?: CssSourceTraceUserOptions | undefined;
     disabledDefaultTemplateHandler?: boolean | undefined;
     runtimeLoaderPath?: string | undefined;