weapp-tailwindcss 5.1.6 → 5.1.8

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-Baw9qNrc.js");
+const require_vite = require("./vite-GdzlG_lx.js");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-PdxjaqhO.mjs";
+import { t as WeappTailwindcss } from "./vite-vf2-cDdk.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/dist/weapp-tw-css-import-rewrite-loader.js

@@ -60,9 +60,13 @@ function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
 }
 //#endregion
 //#region src/bundlers/shared/generated-css-marker.ts
+const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
 function createBundlerGeneratedCssMarker(bundler, file) {
 	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
 }
+function stripBundlerGeneratedCssMarkers(source) {
+	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "");
+}
 //#endregion
 //#region src/bundlers/shared/generator-css/markers.ts
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
@@ -1406,6 +1410,18 @@ const TAILWIND_V4_DEFAULT_IGNORED_SOURCE_PATTERNS = [
 	"**/*.scss",
 	"**/*.styl",
 	"**/*.log",
+	"**/tailwind.config.js",
+	"**/tailwind.config.cjs",
+	"**/tailwind.config.mjs",
+	"**/tailwind.config.ts",
+	"**/tailwind.config.cts",
+	"**/tailwind.config.mts",
+	"**/tailwind.config.*.js",
+	"**/tailwind.config.*.cjs",
+	"**/tailwind.config.*.mjs",
+	"**/tailwind.config.*.ts",
+	"**/tailwind.config.*.cts",
+	"**/tailwind.config.*.mts",
 	"**/package-lock.json",
 	"**/pnpm-lock.yaml",
 	"**/bun.lockb",
@@ -2150,6 +2166,34 @@ function unwrapMiniProgramCascadeLayers(source) {
 		return source;
 	}
 }
+function hasClassSelector$1(selector) {
+	return /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i.test(selector);
+}
+function collectBareSelectorUserCss(source) {
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(source);
+		let changed = false;
+		root.walkAtRules("import", (rule) => {
+			rule.remove();
+			changed = true;
+		});
+		root.walkRules((rule) => {
+			if ((rule.selectors?.length ? rule.selectors : [rule.selector]).some((selector) => hasClassSelector$1(selector))) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkAtRules((rule) => {
+			if (rule.nodes !== void 0 && rule.nodes.length === 0) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return "";
+	}
+}
 function stripTailwindSourceMediaFragments(source) {
 	let removedSourceMediaStart = false;
 	return terminateTailwindSourceAtRulesBeforeNextDirective(removeTailwindSourceMediaBlocks(source)).split(/\r?\n/).filter((line) => {
@@ -2354,7 +2398,10 @@ async function transformGeneratorUserCss(source, options) {
 		...options.generatorStyleOptions,
 		...options.cssUserHandlerOptions
 	});
-	return removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(css));
+	const transformedCss = removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(css));
+	const bareSelectorUserCss = collectBareSelectorUserCss(userSource);
+	const missingBareSelectorUserCss = bareSelectorUserCss.trim().length > 0 ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(transformedCss, bareSelectorUserCss) : "";
+	return missingBareSelectorUserCss.trim().length > 0 ? `${transformedCss}\n${missingBareSelectorUserCss}` : transformedCss;
 }
 //#endregion
 //#region src/tailwindcss/runtime-options.ts
@@ -2972,7 +3019,7 @@ function isVueScopedStyleSource(from) {
 	const queryIndex = from.indexOf("?");
 	if (queryIndex === -1) return false;
 	const query = from.slice(queryIndex + 1);
-	return /(?:^|&)type=style(?:&|$)/.test(query) && /(?:^|&)scoped(?:=(?:true|1))?(?:&|$)/.test(query);
+	return /(?:^|&)type=style(?:&|$)/.test(query) && /(?:^|&)scoped(?:=[^&]*)?(?:&|$)/.test(query);
 }
 function hasMiniProgramTailwindV4PreflightReset(css) {
 	return /(?:^|[},])\s*view\s*,\s*text\s*,\s*::after\s*,\s*::before\s*\{[^}]*\bborder\s*:\s*0\s+solid\b/.test(css);
@@ -3194,6 +3241,13 @@ let lastEscapedCandidateCacheStore;
 function isUrlLikeCandidate(candidate) {
 	return candidate.startsWith("//") || candidate.startsWith("http://") || candidate.startsWith("https://");
 }
+function isPlainSlashPathCandidate(candidate) {
+	const slashIndex = candidate.indexOf("/");
+	if (slashIndex <= 0) return false;
+	if (isUrlLikeCandidate(candidate)) return true;
+	if (candidate.includes("[") || candidate.includes("]") || candidate.includes(":")) return false;
+	return !candidate.slice(0, slashIndex).includes("-");
+}
 function isArbitraryValueCandidate(candidate) {
 	let hasOpenBracket = false;
 	let hasCloseBracket = false;
@@ -3249,6 +3303,7 @@ function getEscapedCandidate(candidate, escapeMap, store = getEscapedCandidateCa
 function resolveClassNameTransformWithResult(candidate, { alwaysEscape, classNameSet, escapeMap, jsArbitraryValueFallback, jsPreserveClass, tailwindcssMajorVersion, classContext }) {
 	if (alwaysEscape) return DIRECT_RESULT;
 	if (jsPreserveClass?.(candidate)) return SKIP_RESULT;
+	if (!classContext && isPlainSlashPathCandidate(candidate)) return SKIP_RESULT;
 	if (classNameSet?.has(candidate)) return DIRECT_RESULT;
 	if (classNameSet && classNameSet.size > 0) {
 		const escapedCandidate = getEscapedCandidate(candidate, escapeMap);
@@ -5450,6 +5505,12 @@ function intersectCandidateSets(left, right) {
 	for (const candidate of small) if (large.has(candidate)) matched.add(candidate);
 	return matched;
 }
+function resolveScopedRuntimeCandidates(sourceCandidates, sourceScopedRuntime) {
+	if (!sourceCandidates) return sourceScopedRuntime;
+	if (!sourceScopedRuntime) return sourceCandidates;
+	if (sourceCandidates.size === 0) return sourceScopedRuntime;
+	return intersectCandidateSets(sourceCandidates, sourceScopedRuntime);
+}
 function parseCssSourceRoot(rawSource) {
 	try {
 		return _weapp_tailwindcss_postcss.postcss.parse(rawSource);
@@ -5582,7 +5643,7 @@ async function generateCssByGenerator(options) {
 			const generator = createWeappTailwindcssGenerator(source);
 			const sourceEntries = getSourceCandidatesForEntries ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
 			const sourceScopedRuntime = sourceEntries && sourceEntries.length > 0 ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
-			const scopedRuntime = options.sourceCandidates && sourceScopedRuntime ? intersectCandidateSets(options.sourceCandidates, sourceScopedRuntime) : options.sourceCandidates ?? sourceScopedRuntime;
+			const scopedRuntime = resolveScopedRuntimeCandidates(options.sourceCandidates, sourceScopedRuntime);
 			const isolateCssSource = shouldIsolateScopedCssSource(majorVersion, source, sourceEntries, {
 				cssHandlerOptions,
 				target: generatorOptions.target
@@ -5672,7 +5733,7 @@ async function generateCssByGenerator(options) {
 			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
 			const afterLayerUserCss = await transformGeneratorUserCss(afterLayerParts.layer, userCssOptions);
 			const afterUserCss = await transformGeneratorUserCss(afterLayerParts.rest, userCssOptions);
-			const fallbackLayerUserCss = generated.target === "weapp" && afterLayerParts.layer.trim().length === 0 && hasUserCssLayerBlocks(userCssRawSource) ? await transformGeneratorUserCss(splitUserCssLayerBlocks(userCssRawSource).layer, userCssOptions) : "";
+			const fallbackLayerUserCss = generated.target === "weapp" && hasUserCssLayerBlocks(userCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(afterLayerUserCss, await transformGeneratorUserCss(splitUserCssLayerBlocks(userCssRawSource).layer, userCssOptions)) : "";
 			css = createCssSourceOrderAppend$1(createCssSourceOrderAppend$1(createCssSourceOrderAppend$1(beforeUserCss, generated.target === "weapp" ? wrapUserLayerComponentsCss(createCssSourceOrderAppend$1(afterLayerUserCss, fallbackLayerUserCss)) : afterLayerUserCss), css), afterUserCss);
 			if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
@@ -7342,6 +7403,92 @@ function createSourceCandidateStore(options = {}) {
 	}
 }
 //#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets/pipeline-helpers.ts
+function removeTailwindV4StandaloneHostPreflightRule(source) {
+	if (!source.includes("--theme(")) return source;
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(source);
+		let changed = false;
+		root.walkRules((rule) => {
+			if (rule.selector.trim() !== ":host") return;
+			if (!rule.nodes?.some((node) => node.type === "decl" && node.value?.includes("--theme("))) return;
+			rule.remove();
+			changed = true;
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
+function stripTrailingLineWhitespace(source) {
+	return source.replace(/[ \t]+$/gm, "");
+}
+function hasWebpackClassSelector(selector) {
+	return /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i.test(selector);
+}
+function isWebpackKeyframesRule(rule) {
+	let parent = rule.parent;
+	while (parent) {
+		if (parent.type === "atrule" && parent.name.endsWith("keyframes")) return true;
+		parent = parent.parent;
+	}
+	return false;
+}
+function collectWebpackBareSelectorUserCss(source) {
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(removeTailwindSourceDirectives(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(source)), { importFallback: true }));
+		let changed = false;
+		root.walkAtRules((rule) => {
+			if (rule.name === "import" || rule.name === "font-face" || rule.name.endsWith("keyframes")) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkRules((rule) => {
+			if (isWebpackKeyframesRule(rule) || rule.selectors.some((selector) => hasWebpackClassSelector(selector))) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkAtRules((rule) => {
+			if (rule.nodes !== void 0 && rule.nodes.length === 0) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return "";
+	}
+}
+function finalizeMiniProgramUserCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
+	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
+	if (isWebGeneratorTarget) return source;
+	return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(removeTailwindV4StandaloneHostPreflightRule((0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(removeMiniProgramHoverSelectors(source, styleOptions.cssRemoveHoverPseudoClass), {
+		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(source) ? compilerOptions.cssPreflight : void 0,
+		isTailwindcssV4: true,
+		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
+	})));
+}
+function finalizeWebpackCssAssetSource(source, compilerOptions, isWebGeneratorTarget, options = {}) {
+	const styleOptions = resolveStyleOptionsFromContext(compilerOptions);
+	if (isWebGeneratorTarget) {
+		if (options.generatedCss === true) return stripTrailingLineWhitespace(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(stripBundlerGeneratedCssMarkers(source))));
+		return stripTrailingLineWhitespace(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true })))));
+	}
+	let finalized = removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+	if (options.generatedCss !== true) return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
+	try {
+		finalized = (0, _weapp_tailwindcss_postcss.pruneMiniProgramGeneratedCss)(finalized, { preservePreflight: options.cssPreflight !== false });
+	} catch {}
+	finalized = (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(finalized, {
+		cssPreflight: options.cssPreflight === false ? false : !hasMiniProgramTailwindV4PreflightReset(finalized) ? compilerOptions.cssPreflight : void 0,
+		isTailwindcssV4: true,
+		tailwindcssV4GradientFallback: styleOptions.tailwindcssV4GradientFallback
+	});
+	return (0, _weapp_tailwindcss_postcss.stripMiniProgramCssSpecificityPlaceholders)(removeMiniProgramHoverSelectors(finalized, styleOptions.cssRemoveHoverPseudoClass));
+}
+//#endregion
 //#region src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts
 function resolveLoaderOptions(options) {
 	const runtime = require_watch_dependencies.getWebpackLoaderRuntime(options?.tailwindcssImportRewriteRuntimeKey)?.cssImportRewrite;
@@ -7447,14 +7594,22 @@ async function generateCssForWebpackPipeline(source, loaderContext, options) {
 	});
 	if (!generated) return;
 	rewriteOptions.markGeneratedCssSource?.(file);
+	for (const dependency of generated.dependencies) require_watch_dependencies.registerWebpackWatchFile(loaderContext, dependency);
+	const generatedCss = removeTailwindSourceDirectives(generated.css, { importFallback: true });
+	const finalizedGeneratedCss = finalizeWebpackCssAssetSource(generatedCss, compilerOptions, generatorTarget === "web", {
+		cssPreflight: cssHandlerOptions.isMainChunk,
+		generatedCss: true
+	});
+	const bareUserCss = generatorTarget === "web" ? "" : collectWebpackBareSelectorUserCss(normalizedSource);
+	const finalizedBareUserCss = bareUserCss.trim().length === 0 ? "" : finalizeMiniProgramUserCssAssetSource(bareUserCss, compilerOptions, generatorTarget === "web", { cssPreflight: false });
+	const missingBareUserCss = finalizedBareUserCss.trim().length === 0 ? "" : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(finalizedGeneratedCss, finalizedBareUserCss);
+	const css = missingBareUserCss.trim().length === 0 ? generatedCss : `${generatedCss}\n${missingBareUserCss}`;
 	rewriteOptions.registerGeneratedCss?.({
 		classSet: generated.classSet,
-		css: generated.css,
+		css,
 		dependencies: generated.dependencies,
 		file
 	});
-	for (const dependency of generated.dependencies) require_watch_dependencies.registerWebpackWatchFile(loaderContext, dependency);
-	const css = removeTailwindSourceDirectives(generated.css, { importFallback: true });
 	return `${createBundlerGeneratedCssMarker("webpack", file)}\n${css}`;
 }
 function transformCssImportRewriteSource(source, options) {