weapp-tailwindcss 5.0.0-next.8 → 5.0.0-next.9

package/dist/bundlers/shared/generator-css/directives.d.ts

@@ -2,6 +2,7 @@ export declare function parseImportRequest(params: string): string | undefined;
 export declare function removeTailwindSourceDirectives(rawSource: string): string;
 export declare function hasTailwindSourceDirectives(rawSource: string): boolean;
 export declare function hasTailwindRootDirectives(rawSource: string): boolean;
+export declare function hasTailwindApplyDirective(rawSource: string): boolean;
 export declare function resolveCssEntrySource(rawSource: string, base: string, options?: {
     removeConfig?: boolean;
 }): {

package/dist/{generator-css-Mksw8PgB.js → generator-css-Bwp3nbrl.js}

@@ -147,6 +147,20 @@ function hasTailwindRootDirectives(rawSource) {
 		return true;
 	}
 }
+function hasTailwindApplyDirective(rawSource) {
+	if (!rawSource.includes("@apply")) return false;
+	try {
+		const root = postcss.default.parse(rawSource);
+		let found = false;
+		root.walkAtRules("apply", () => {
+			found = true;
+			return false;
+		});
+		return found;
+	} catch {
+		return false;
+	}
+}
 function resolveCssEntrySource(rawSource, base, options = {}) {
 	try {
 		const root = postcss.default.parse(rawSource);
@@ -905,6 +919,10 @@ function tryResolveTailwindV4SourceOptions(runtimeState) {
 function hasConfiguredTailwindV4CssSource(sourceOptions) {
 	return Boolean(sourceOptions?.css) || Boolean(sourceOptions?.cssSources?.length);
 }
+function createTailwindV4ApplyReferenceSource(css, sourceOptions) {
+	if (!hasTailwindApplyDirective(css) || hasTailwindRootDirectives(css)) return css;
+	return `@reference "${sourceOptions.packageName ?? "tailwindcss"}";\n${css}`;
+}
 async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions) {
 	const cssEntrySource = resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), { removeConfig: majorVersion === 3 });
 	if (majorVersion === 3) {
@@ -953,10 +971,11 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 	}
 	const resolvedSourceOptions = sourceOptions ?? {};
 	const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, resolvedSourceOptions);
+	const css = createTailwindV4ApplyReferenceSource(normalizeConfigDirective(prependConfigDirective(resolvedEntrySource.css, generatorOptions?.config), config), resolvedSourceOptions);
 	return require_generator.resolveTailwindV4Source({
 		...resolvedSourceOptions,
 		base: resolvedEntrySource.base,
-		css: normalizeConfigDirective(prependConfigDirective(resolvedEntrySource.css, generatorOptions?.config), config)
+		css
 	});
 }
 async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions) {

package/dist/{generator-css-BIapP56i.mjs → generator-css-DeLLmp2N.mjs}

@@ -143,6 +143,20 @@ function hasTailwindRootDirectives(rawSource) {
 		return true;
 	}
 }
+function hasTailwindApplyDirective(rawSource) {
+	if (!rawSource.includes("@apply")) return false;
+	try {
+		const root = postcss.parse(rawSource);
+		let found = false;
+		root.walkAtRules("apply", () => {
+			found = true;
+			return false;
+		});
+		return found;
+	} catch {
+		return false;
+	}
+}
 function resolveCssEntrySource(rawSource, base, options = {}) {
 	try {
 		const root = postcss.parse(rawSource);
@@ -901,6 +915,10 @@ function tryResolveTailwindV4SourceOptions(runtimeState) {
 function hasConfiguredTailwindV4CssSource(sourceOptions) {
 	return Boolean(sourceOptions?.css) || Boolean(sourceOptions?.cssSources?.length);
 }
+function createTailwindV4ApplyReferenceSource(css, sourceOptions) {
+	if (!hasTailwindApplyDirective(css) || hasTailwindRootDirectives(css)) return css;
+	return `@reference "${sourceOptions.packageName ?? "tailwindcss"}";\n${css}`;
+}
 async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions) {
 	const cssEntrySource = resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), { removeConfig: majorVersion === 3 });
 	if (majorVersion === 3) {
@@ -949,10 +967,11 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 	}
 	const resolvedSourceOptions = sourceOptions ?? {};
 	const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, resolvedSourceOptions);
+	const css = createTailwindV4ApplyReferenceSource(normalizeConfigDirective(prependConfigDirective(resolvedEntrySource.css, generatorOptions?.config), config), resolvedSourceOptions);
 	return resolveTailwindV4Source({
 		...resolvedSourceOptions,
 		base: resolvedEntrySource.base,
-		css: normalizeConfigDirective(prependConfigDirective(resolvedEntrySource.css, generatorOptions?.config), config)
+		css
 	});
 }
 async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions) {

package/dist/gulp.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
 const require_cache = require("./cache-BVAiJV3J.js");
 const require_runtime_patch = require("./runtime-patch-D6mBo_KB.js");
-const require_generator_css = require("./generator-css-Mksw8PgB.js");
+const require_generator_css = require("./generator-css-Bwp3nbrl.js");
 const require_precheck = require("./precheck-B32p-gLI.js");
 const require_tailwindcss = require("./tailwindcss-Bu-RWIHx.js");
 let node_path = require("node:path");

package/dist/gulp.mjs

@@ -1,6 +1,6 @@
 import { n as getRuntimeClassSetSignature } from "./cache-CHs4DXui.mjs";
 import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
-import { i as hasTailwindRootDirectives, r as processCachedTask, t as generateCssByGenerator } from "./generator-css-BIapP56i.mjs";
+import { i as hasTailwindRootDirectives, r as processCachedTask, t as generateCssByGenerator } from "./generator-css-DeLLmp2N.mjs";
 import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-B4RH6ZNN.mjs";
 import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C5IgPlQ0.mjs";
 import path from "node:path";

package/dist/index.js

@@ -2,8 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_generator = require("./generator-DKkhJbOg.js");
 const require_gulp = require("./gulp.js");
 const require_postcss = require("./postcss-QIXwT40c.js");
-const require_vite = require("./vite-DyZuiyap.js");
-const require_webpack = require("./webpack-CNV2dx3Q.js");
+const require_vite = require("./vite-By5KQi9s.js");
+const require_webpack = require("./webpack-BzN2ly34.js");
 exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { t as createWeappTailwindcssGenerator } from "./generator-UBmfduYg.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
 import { t as weappTailwindcssPostcssPlugin } from "./postcss-w48mGIhe.mjs";
-import { t as WeappTailwindcss } from "./vite-BwgRVgxH.mjs";
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-CT6EEENx.mjs";
+import { t as WeappTailwindcss } from "./vite-Cyp42bBf.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-DJazm5sT.mjs";
 export { UnifiedWebpackPluginV5, WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{vite-DyZuiyap.js → vite-By5KQi9s.js}

@@ -2,7 +2,7 @@ const require_chunk = require("./chunk-8l464Juk.js");
 const require_cache = require("./cache-BVAiJV3J.js");
 const require_runtime_patch = require("./runtime-patch-D6mBo_KB.js");
 const require_generator = require("./generator-DKkhJbOg.js");
-const require_generator_css = require("./generator-css-Mksw8PgB.js");
+const require_generator_css = require("./generator-css-Bwp3nbrl.js");
 const require_precheck = require("./precheck-B32p-gLI.js");
 const require_utils = require("./utils-BiShvil9.js");
 const require_tailwindcss = require("./tailwindcss-Bu-RWIHx.js");
@@ -1232,7 +1232,7 @@ function createGenerateBundleHook(context) {
 						let unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
 						if (unresolvedDynamicCandidates.length > 0) {
 							_weapp_tailwindcss_logger.logger.warn("检测到 WXML 动态类名未完成转译，已回退到完整 runtimeSet 重试: %s -> %O", file, unresolvedDynamicCandidates);
-							transformed = await templateHandler(rawSource, { runtimeSet: await context.ensureRuntimeClassSet(true) });
+							transformed = await templateHandler(rawSource, { runtimeSet: new Set([...await context.ensureRuntimeClassSet(true), ...unresolvedDynamicCandidates]) });
 							unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
 							if (unresolvedDynamicCandidates.length > 0) _weapp_tailwindcss_logger.logger.warn("WXML 动态类名在完整 runtimeSet 重试后仍未完成转译: %s -> %O", file, unresolvedDynamicCandidates);
 						}
@@ -1706,9 +1706,10 @@ function collectChangedRuntimeFiles(snapshot) {
 	return new Set([...snapshot.runtimeAffectingChangedByType.html, ...snapshot.runtimeAffectingChangedByType.js]);
 }
 function resolveEntryExtension(entry) {
+	if (entry.type === "html") return "html";
 	const ext = entry.file.split(/[?#]/, 1)[0]?.split(".").pop()?.replace(EXTENSION_DOT_PREFIX_RE, "") ?? "";
 	if (ext.length > 0) return ext;
-	return entry.type === "html" ? "html" : "js";
+	return "js";
 }
 function createCandidateValidationSource(candidates) {
 	return [...new Set(candidates)].sort().join("\n");

package/dist/{vite-BwgRVgxH.mjs → vite-Cyp42bBf.mjs}

@@ -1,7 +1,7 @@
 import { c as resolveTailwindcssOptions, l as findNearestPackageRoot, n as getRuntimeClassSetSignature, s as findTailwindConfig } from "./cache-CHs4DXui.mjs";
 import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
 import { d as filterUnsupportedMiniProgramTailwindV4Candidates, f as loadTailwindV4DesignSystem, i as normalizeWeappTailwindcssGeneratorOptions, s as resolveTailwindV4SourceFromPatcher } from "./generator-UBmfduYg.mjs";
-import { a as hasTailwindSourceDirectives, i as hasTailwindRootDirectives, n as validateCandidatesByGenerator, o as hasTailwindGeneratedCssMarkers, r as processCachedTask, t as generateCssByGenerator } from "./generator-css-BIapP56i.mjs";
+import { a as hasTailwindSourceDirectives, i as hasTailwindRootDirectives, n as validateCandidatesByGenerator, o as hasTailwindGeneratedCssMarkers, r as processCachedTask, t as generateCssByGenerator } from "./generator-css-DeLLmp2N.mjs";
 import { a as analyzeSource, c as isClassContextLiteralPath, d as traverse$1, g as createTailwindRuntimeReadyPromise, h as collectRuntimeClassSet, i as createAttributeMatcher, l as replaceWxml, m as toCustomAttributesEntities, n as getCompilerContext, o as JsTokenUpdater, p as vitePluginName, r as generateCode, s as _defineProperty, t as shouldSkipJsTransform, u as babelParse, v as refreshTailwindRuntimeState } from "./precheck-B4RH6ZNN.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-Btw1iOVV.mjs";
 import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C5IgPlQ0.mjs";
@@ -1224,7 +1224,7 @@ function createGenerateBundleHook(context) {
 						let unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
 						if (unresolvedDynamicCandidates.length > 0) {
 							logger.warn("检测到 WXML 动态类名未完成转译，已回退到完整 runtimeSet 重试: %s -> %O", file, unresolvedDynamicCandidates);
-							transformed = await templateHandler(rawSource, { runtimeSet: await context.ensureRuntimeClassSet(true) });
+							transformed = await templateHandler(rawSource, { runtimeSet: new Set([...await context.ensureRuntimeClassSet(true), ...unresolvedDynamicCandidates]) });
 							unresolvedDynamicCandidates = collectUnescapedDynamicCandidates(transformed);
 							if (unresolvedDynamicCandidates.length > 0) logger.warn("WXML 动态类名在完整 runtimeSet 重试后仍未完成转译: %s -> %O", file, unresolvedDynamicCandidates);
 						}
@@ -1698,9 +1698,10 @@ function collectChangedRuntimeFiles(snapshot) {
 	return new Set([...snapshot.runtimeAffectingChangedByType.html, ...snapshot.runtimeAffectingChangedByType.js]);
 }
 function resolveEntryExtension(entry) {
+	if (entry.type === "html") return "html";
 	const ext = entry.file.split(/[?#]/, 1)[0]?.split(".").pop()?.replace(EXTENSION_DOT_PREFIX_RE, "") ?? "";
 	if (ext.length > 0) return ext;
-	return entry.type === "html" ? "html" : "js";
+	return "js";
 }
 function createCandidateValidationSource(candidates) {
 	return [...new Set(candidates)].sort().join("\n");

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-DyZuiyap.js");
+const require_vite = require("./vite-By5KQi9s.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-BwgRVgxH.mjs";
+import { t as WeappTailwindcss } from "./vite-Cyp42bBf.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/dist/{webpack-CNV2dx3Q.js → webpack-BzN2ly34.js}

@@ -1,7 +1,7 @@
 const require_chunk = require("./chunk-8l464Juk.js");
 const require_cache = require("./cache-BVAiJV3J.js");
 const require_runtime_patch = require("./runtime-patch-D6mBo_KB.js");
-const require_generator_css = require("./generator-css-Mksw8PgB.js");
+const require_generator_css = require("./generator-css-Bwp3nbrl.js");
 const require_precheck = require("./precheck-B32p-gLI.js");
 const require_utils = require("./utils-BiShvil9.js");
 const require_tailwindcss = require("./tailwindcss-Bu-RWIHx.js");

package/dist/{webpack-CT6EEENx.mjs → webpack-DJazm5sT.mjs}

@@ -1,6 +1,6 @@
 import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-CHs4DXui.mjs";
 import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
-import { r as processCachedTask, t as generateCssByGenerator } from "./generator-css-BIapP56i.mjs";
+import { r as processCachedTask, t as generateCssByGenerator } from "./generator-css-DeLLmp2N.mjs";
 import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-B4RH6ZNN.mjs";
 import { r as getGroupedEntries } from "./utils-Btw1iOVV.mjs";
 import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C5IgPlQ0.mjs";

package/dist/webpack.js

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

package/dist/webpack.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.8",
+  "version": "5.0.0-next.9",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -189,9 +189,9 @@
     "tailwindcss-patch": "9.3.3",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "1.1.0",
-    "@weapp-tailwindcss/postcss": "2.2.1-next.1",
     "@weapp-tailwindcss/reset": "0.1.1-next.0",
     "@weapp-tailwindcss/shared": "1.1.3",
+    "@weapp-tailwindcss/postcss": "2.2.1-next.1",
     "tailwindcss-config": "1.1.6-next.1"
   },
   "scripts": {