weapp-tailwindcss 5.1.12 → 5.1.14

package/dist/bundlers/vite/css-finalizer.d.ts

@@ -37,6 +37,7 @@ interface CssFinalizerContext {
     rememberMainCssSource?: (file: string, rawSource: string) => void;
     getRememberedMainCssSource?: (file: string) => RememberedMainCssSource | undefined;
     isViteProcessedCssAsset?: (asset: OutputAsset, file?: string) => boolean;
+    frameworkRootImportShellTargetByFile?: ReadonlyMap<string, string> | undefined;
 }
 export declare function createViteCssFinalizerOutputPlugin(context: CssFinalizerContext): Plugin;
 export {};

package/dist/bundlers/vite/frameworks/taro/index.d.ts

@@ -1,2 +1,4 @@
+import type { ViteFrameworkCssPipelineStrategy } from '../../shared/framework-strategy';
 import type { InternalUserDefinedOptions, UserDefinedOptions } from '../../../../types';
+export declare const taroCssPipelineStrategy: ViteFrameworkCssPipelineStrategy;
 export declare function createTaroVitePlugins(options?: UserDefinedOptions | InternalUserDefinedOptions): any[];

package/dist/bundlers/vite/frameworks/uni-app/index.d.ts

@@ -1,2 +1,4 @@
+import type { ViteFrameworkCssPipelineStrategy } from '../../shared/framework-strategy';
 import type { InternalUserDefinedOptions, UserDefinedOptions } from '../../../../types';
+export declare const uniAppCssPipelineStrategy: ViteFrameworkCssPipelineStrategy;
 export declare function createUniAppVitePlugins(options?: UserDefinedOptions | InternalUserDefinedOptions): import("../..").WeappTailwindcssVitePlugin[] | undefined;

package/dist/bundlers/vite/frameworks/uni-app-x/index.d.ts

@@ -1,2 +1,4 @@
+import type { ViteFrameworkCssPipelineStrategy } from '../../shared/framework-strategy';
 import type { InternalUserDefinedOptions, UserDefinedOptions } from '../../../../types';
+export declare const uniAppXCssPipelineStrategy: ViteFrameworkCssPipelineStrategy;
 export declare function createUniAppXVitePlugins(options?: UserDefinedOptions | InternalUserDefinedOptions): import("../..").WeappTailwindcssVitePlugin[] | undefined;

package/dist/bundlers/vite/generate-bundle/remembered-css-replay.d.ts

@@ -1,4 +1,5 @@
 import type { OutputAsset, OutputChunk } from 'rollup';
+import type { ViteFrameworkCssPipelineContext, ViteFrameworkCssPipelineStrategy } from '../shared/framework-strategy';
 import type { BundleMetrics } from './metrics';
 import type { GenerateBundleContext, RememberedCssSource } from './types';
 interface ProcessRememberedCssReplayOptions {
@@ -17,6 +18,8 @@ interface ProcessRememberedCssReplayOptions {
         isMainChunk?: boolean | undefined;
     }) => GenerateBundleContext['getSourceCandidateSourcesForEntries'];
     cssTaskFactories: Array<() => Promise<void>>;
+    cssPipelineContext: ViteFrameworkCssPipelineContext;
+    cssPipelineStrategy?: ViteFrameworkCssPipelineStrategy | undefined;
     debug: GenerateBundleContext['debug'];
     defaultStyleOutputExtension: string;
     emitOrReplayCssAsset: (fileName: string, source: string) => OutputAsset | undefined;

package/dist/bundlers/vite/generate-bundle/root-style-output.d.ts

@@ -1,6 +1,24 @@
+import type { OutputBundle } from 'rollup';
 export declare function isRootMiniProgramStyleOutputFile(file: string): boolean;
 export declare function createRelativeCssImportRequest(targetFile: string, importedFile: string): string;
 export declare function createCssImportShell(targetFile: string, importedFile: string): string;
+export declare function resolveSingleCssImportOutputFile(targetFile: string, css: string): string | undefined;
 export declare function createRootMiniProgramOriginStyleOutputFile(file: string): string;
 export declare function shouldKeepRootMiniProgramStyleAsImportShell(enabled: boolean | undefined): enabled is true;
+export declare function shouldPreserveFrameworkRootMiniProgramImportShell(options: {
+    css: string;
+    file: string;
+    isWebGeneratorTarget: boolean;
+    matchesCss: boolean;
+    shouldKeep: () => boolean | undefined;
+}): boolean;
+export declare function restoreFrameworkRootMiniProgramImportShellAssets(bundle: OutputBundle, options: {
+    debug?: ((format: string, ...args: unknown[]) => void) | undefined;
+    isWebGeneratorTarget: boolean;
+    matchesCss: (file: string) => boolean;
+    onUpdate?: ((file: string, oldVal: string, newVal: string) => void) | undefined;
+    recordCssAssetResult?: ((file: string, css: string) => void) | undefined;
+    shouldKeep: (file: string, css: string) => boolean | undefined;
+    targetByFile: ReadonlyMap<string, string>;
+}): number;
 export declare function shouldMoveRootMiniProgramStyleToImportShellOrigin(enabled: boolean | undefined): enabled is true;

package/dist/bundlers/vite/generate-bundle/types.d.ts

@@ -52,6 +52,7 @@ export interface GenerateBundleContext {
     setRememberedCssSignature?: (file: string, cssRuntimeSignature: string) => void;
     getKnownCssSource?: (file: string) => string | undefined;
     getKnownSfcSource?: (file: string) => string | undefined;
+    getOriginalCssLayerSource?: (file: string) => string | undefined;
     recordGeneratorCandidates?: (candidates: Set<string>) => void;
     pruneViteCssCaches?: (options: {
         activeFiles: Set<string>;
@@ -60,6 +61,7 @@ export interface GenerateBundleContext {
     getViteCssCacheStats?: () => Record<string, unknown>;
     hmrTimingRecorder?: HmrTimingRecorder;
     cssPipelineStrategy?: ViteFrameworkCssPipelineStrategy | undefined;
+    frameworkRootImportShellTargetByFile?: Map<string, string> | undefined;
 }
 export interface RememberedCssSource {
     outputFile: string;

package/dist/bundlers/vite/serve-root-import-shell.d.ts

@@ -0,0 +1,8 @@
+import type { ViteFrameworkCssPipelineContext, ViteFrameworkCssPipelineStrategy } from './shared/framework-strategy';
+export declare function resolveViteServeRootMiniProgramImportShell(options: {
+    css: string;
+    cssPipelineContext: ViteFrameworkCssPipelineContext;
+    cssPipelineStrategy?: ViteFrameworkCssPipelineStrategy | undefined;
+    isWebGeneratorTarget: boolean;
+    outputFile: string;
+}): string | undefined;

package/dist/bundlers/vite/source-candidates.d.ts

@@ -1,4 +1,5 @@
 import type { TailwindInlineSourceCandidates, TailwindSourceEntry } from '../../tailwindcss/source-scan';
+import type { ICustomAttributesEntities } from '../../types';
 import type { IArbitraryValues } from '../../types/shared';
 export interface SourceCandidateStore {
     syncSource: (id: string, source: string) => Promise<void>;
@@ -51,6 +52,8 @@ interface ScanSourceCandidateRootOptions {
 }
 export interface SourceCandidateCollectorOptions {
     bareArbitraryValues?: IArbitraryValues['bareArbitraryValues'] | undefined;
+    customAttributesEntities?: ICustomAttributesEntities | undefined;
+    disabledDefaultTemplateHandler?: boolean | undefined;
     extractor?: ((source: string, extension: string) => Promise<Iterable<string>> | Iterable<string>) | undefined;
 }
 export declare function isSourceCandidateRequest(id: string): boolean;

package/dist/{context-xSJE588m.mjs → context-BL8Gy71H.mjs}

@@ -1,6 +1,6 @@
 import { resolveMpxPlatform } from "./framework.mjs";
-import { Ft as resolveValidTailwindV4Candidates$1, Mt as resolveCssMacroTailwindV4Source, O as resolveBooleanObjectOption, Pt as loadTailwindV4DesignSystem, _t as createTailwindV4Engine$1, a as resolveGeneratorRuntimeBranch, d as resolveTailwindV4SourceFromRuntime, i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-BvPcmqxU.mjs";
-import { c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssRuntimeFromContext, u as getRuntimeClassSetSignatureWithSources } from "./tailwindcss-DZT_pWrd.mjs";
+import { Ft as resolveValidTailwindV4Candidates$1, Mt as resolveCssMacroTailwindV4Source, O as resolveBooleanObjectOption, Pt as loadTailwindV4DesignSystem, _t as createTailwindV4Engine$1, a as resolveGeneratorRuntimeBranch, d as resolveTailwindV4SourceFromRuntime, i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-B59OA64h.mjs";
+import { c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssRuntimeFromContext, u as getRuntimeClassSetSignatureWithSources } from "./tailwindcss-DPcKMLxL.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-MVwpU07P.mjs";
 import { b as md5Hash, d as jsStringEscape, h as shouldEnableArbitraryValueFallback, l as getReplacement, m as resolveClassNameTransformWithResult, o as jsHandler, p as decodeUnicode2, t as createTemplateHandler, u as getReplacementCacheStore, y as createDebug } from "./wxml-DdGdeqaH.mjs";
 import { getDefaultOptions, resolveDefaultCssPreflight } from "./defaults.mjs";
@@ -1200,7 +1200,9 @@ function createInternalCompilerContext(opts) {
 	const cssCalcOptions = applyV4CssCalcDefaults(ctx.cssCalc, tailwindRuntime);
 	ctx.cssCalc = cssCalcOptions;
 	syncLegacyFieldsToCssOptions(ctx);
-	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, toCustomAttributesEntities(ctx.customAttributes), cssCalcOptions, tailwindRuntime.majorVersion);
+	const customAttributesEntities = toCustomAttributesEntities(ctx.customAttributes);
+	ctx.customAttributesEntities = customAttributesEntities;
+	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindRuntime.majorVersion);
 	ctx.styleHandler = styleHandler;
 	ctx.jsHandler = jsHandler;
 	ctx.templateHandler = templateHandler;

package/dist/{context-DRRgW7i2.js → context-VeFq_8vW.js}

@@ -1,7 +1,7 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
-const require_generator = require("./generator-CS10c9g1.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_generator = require("./generator-CEnUsjed.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 require("./utils-CuKLf1Zv.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
 const require_defaults = require("./defaults.js");
@@ -1206,7 +1206,9 @@ function createInternalCompilerContext(opts) {
 	const cssCalcOptions = require_tailwindcss.applyV4CssCalcDefaults(ctx.cssCalc, tailwindRuntime);
 	ctx.cssCalc = cssCalcOptions;
 	syncLegacyFieldsToCssOptions(ctx);
-	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, toCustomAttributesEntities(ctx.customAttributes), cssCalcOptions, tailwindRuntime.majorVersion);
+	const customAttributesEntities = toCustomAttributesEntities(ctx.customAttributes);
+	ctx.customAttributesEntities = customAttributesEntities;
+	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindRuntime.majorVersion);
 	ctx.styleHandler = styleHandler;
 	ctx.jsHandler = jsHandler;
 	ctx.templateHandler = templateHandler;

package/dist/core.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_context = require("./context-DRRgW7i2.js");
+const require_context = require("./context-VeFq_8vW.js");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });

package/dist/core.mjs

@@ -1,4 +1,4 @@
-import { l as createTailwindRuntimeReadyPromise, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-xSJE588m.mjs";
+import { l as createTailwindRuntimeReadyPromise, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-BL8Gy71H.mjs";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });

package/dist/{generator-BvPcmqxU.mjs → generator-B59OA64h.mjs}

@@ -1343,7 +1343,7 @@ function normalizeConfigDirective(css, config) {
 //#region src/bundlers/shared/generator-css/markers.ts
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
 const TAILWIND_ESCAPED_UTILITY_MARKER_RE = /\.[^,{]{0,512}(?:\\:|\\\[|\\#)/;
-const TAILWIND_ROOT_THEME_MARKER_RE = /(?::host|page|\.tw-root|wx-root-portal-content)[^{]{0,256}\{[^}]{0,4096}--(?:color|spacing|text|font-weight|radius)-/;
+const TAILWIND_ROOT_THEME_MARKER_RE = /(?::root\s*,\s*:host|:host\s*,\s*page\s*,\s*\.tw-root\s*,\s*wx-root-portal-content)[^{]{0,256}\{[^}]{0,4096}(?:--spacing\b|--(?:color|text|font|default|radius)-)/;
 const GENERATOR_PLACEHOLDER_MARKER_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\//i;
 const GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/\s*/gi;
 const TAILWIND_BANNER_PREFIX_RE = /^\/\*!\s*tailwindcss v[^*]*\*\/\s*/i;
@@ -1409,7 +1409,7 @@ function hasTailwindGeneratedCss(rawSource) {
 }
 function hasTailwindGeneratedCssMarkers(rawSource) {
 	if (rawSource.includes("--tw-") || rawSource.includes("tailwindcss v") || rawSource.includes(":not(#\\#)") || GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
-	if (!rawSource.includes("\\:") && !rawSource.includes("\\[") && !rawSource.includes("\\#") && !rawSource.includes("--color-") && !rawSource.includes("--spacing-") && !rawSource.includes("--text-") && !rawSource.includes("--font-weight-") && !rawSource.includes("--radius-")) return false;
+	if (!rawSource.includes("\\:") && !rawSource.includes("\\[") && !rawSource.includes("\\#") && !rawSource.includes("--color-") && !rawSource.includes("--spacing") && !rawSource.includes("--text-") && !rawSource.includes("--font-") && !rawSource.includes("--font-weight-") && !rawSource.includes("--default-") && !rawSource.includes("--radius-")) return false;
 	return TAILWIND_ESCAPED_UTILITY_MARKER_RE.test(rawSource) || TAILWIND_ROOT_THEME_MARKER_RE.test(rawSource);
 }
 //#endregion
@@ -1834,8 +1834,22 @@ function removeTailwindV4GeneratorAtRulesFallback(source) {
 function isTailwindGeneratedPreflightComment(text) {
 	return text.includes("cssremedy") || text.includes("Use the user's configured") || text.includes("tailwindlabs/tailwindcss") || text.includes("Prevent padding and border from affecting element width") || text.includes("Remove default margins and padding") || text.includes("Deprecated") || text.includes("Reset all borders") || text.includes("Add the correct text decoration") || text.includes("Make elements with the HTML hidden attribute stay hidden") || text.includes("Inherit font styles in all browsers") || text.includes("Add the correct height in Firefox") || text.includes("Remove the default font size and weight for headings") || text.includes("Reset links to optimize for opt-in styling") || text.includes("Add the correct font weight in Edge and Safari") || text.includes("Use the user's configured `mono` font-family") || text.includes("Add the correct font size in all browsers") || text.includes("Prevent `sub` and `sup` elements from affecting the line height") || text.includes("Remove text indentation from table contents") || text.includes("Use the modern Firefox focus style") || text.includes("Add the correct vertical alignment") || text.includes("Add the correct display") || text.includes("Make lists unstyled by default") || text.includes("Make replaced elements `display: block` by default") || text.includes("Constrain images and videos to the parent width") || text.includes("Restore default font weight") || text.includes("Restore indentation") || text.includes("Restore space after button") || text.includes("Prevent resizing textareas horizontally") || text.includes("Remove the inner padding in Chrome and Safari") || text.includes("Ensure date/time inputs have the same height") || text.includes("Prevent height from changing on date/time inputs") || text.includes("Remove excess padding from pseudo-elements") || text.includes("Center dropdown marker shown on inputs") || text.includes("Remove the additional `:invalid` styles") || text.includes("Correct the inability to style the border radius") || text.includes("Correct the cursor style of increment and decrement buttons");
 }
+const TAILWIND_GENERATED_THEME_SCOPE_SELECTORS = /* @__PURE__ */ new Set([
+	":host",
+	":root",
+	"page",
+	".tw-root",
+	"wx-root-portal-content"
+]);
+function isTailwindGeneratedThemeScopeSelector(selector) {
+	const selectors = selector.split(",").map((item) => item.trim()).filter(Boolean);
+	const selectorSet = new Set(selectors);
+	if (selectorSet.size !== selectors.length) return false;
+	if (!selectors.every((item) => TAILWIND_GENERATED_THEME_SCOPE_SELECTORS.has(item))) return false;
+	return selectorSet.size === 2 && selectorSet.has(":root") && selectorSet.has(":host") || selectorSet.size === 4 && selectorSet.has(":host") && selectorSet.has("page") && selectorSet.has(".tw-root") && selectorSet.has("wx-root-portal-content");
+}
 function isTailwindGeneratedThemeRule(selector, node) {
-	if (!/(?:^|,)\s*(?::host|page|\.tw-root|wx-root-portal-content)\b/.test(selector)) return false;
+	if (!isTailwindGeneratedThemeScopeSelector(selector)) return false;
 	return node.nodes?.some((child) => child.type === "decl" && /^--(?:color|spacing|text|font|default|radius|tw-)/.test(child.prop)) ?? false;
 }
 function isTailwindGeneratedPreflightRule(selector, node) {

package/dist/{generator-CS10c9g1.js → generator-CEnUsjed.js}

@@ -1348,7 +1348,7 @@ function normalizeConfigDirective(css, config) {
 //#region src/bundlers/shared/generator-css/markers.ts
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
 const TAILWIND_ESCAPED_UTILITY_MARKER_RE = /\.[^,{]{0,512}(?:\\:|\\\[|\\#)/;
-const TAILWIND_ROOT_THEME_MARKER_RE = /(?::host|page|\.tw-root|wx-root-portal-content)[^{]{0,256}\{[^}]{0,4096}--(?:color|spacing|text|font-weight|radius)-/;
+const TAILWIND_ROOT_THEME_MARKER_RE = /(?::root\s*,\s*:host|:host\s*,\s*page\s*,\s*\.tw-root\s*,\s*wx-root-portal-content)[^{]{0,256}\{[^}]{0,4096}(?:--spacing\b|--(?:color|text|font|default|radius)-)/;
 const GENERATOR_PLACEHOLDER_MARKER_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\//i;
 const GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/\s*/gi;
 const TAILWIND_BANNER_PREFIX_RE = /^\/\*!\s*tailwindcss v[^*]*\*\/\s*/i;
@@ -1414,7 +1414,7 @@ function hasTailwindGeneratedCss(rawSource) {
 }
 function hasTailwindGeneratedCssMarkers(rawSource) {
 	if (rawSource.includes("--tw-") || rawSource.includes("tailwindcss v") || rawSource.includes(":not(#\\#)") || GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
-	if (!rawSource.includes("\\:") && !rawSource.includes("\\[") && !rawSource.includes("\\#") && !rawSource.includes("--color-") && !rawSource.includes("--spacing-") && !rawSource.includes("--text-") && !rawSource.includes("--font-weight-") && !rawSource.includes("--radius-")) return false;
+	if (!rawSource.includes("\\:") && !rawSource.includes("\\[") && !rawSource.includes("\\#") && !rawSource.includes("--color-") && !rawSource.includes("--spacing") && !rawSource.includes("--text-") && !rawSource.includes("--font-") && !rawSource.includes("--font-weight-") && !rawSource.includes("--default-") && !rawSource.includes("--radius-")) return false;
 	return TAILWIND_ESCAPED_UTILITY_MARKER_RE.test(rawSource) || TAILWIND_ROOT_THEME_MARKER_RE.test(rawSource);
 }
 //#endregion
@@ -1839,8 +1839,22 @@ function removeTailwindV4GeneratorAtRulesFallback(source) {
 function isTailwindGeneratedPreflightComment(text) {
 	return text.includes("cssremedy") || text.includes("Use the user's configured") || text.includes("tailwindlabs/tailwindcss") || text.includes("Prevent padding and border from affecting element width") || text.includes("Remove default margins and padding") || text.includes("Deprecated") || text.includes("Reset all borders") || text.includes("Add the correct text decoration") || text.includes("Make elements with the HTML hidden attribute stay hidden") || text.includes("Inherit font styles in all browsers") || text.includes("Add the correct height in Firefox") || text.includes("Remove the default font size and weight for headings") || text.includes("Reset links to optimize for opt-in styling") || text.includes("Add the correct font weight in Edge and Safari") || text.includes("Use the user's configured `mono` font-family") || text.includes("Add the correct font size in all browsers") || text.includes("Prevent `sub` and `sup` elements from affecting the line height") || text.includes("Remove text indentation from table contents") || text.includes("Use the modern Firefox focus style") || text.includes("Add the correct vertical alignment") || text.includes("Add the correct display") || text.includes("Make lists unstyled by default") || text.includes("Make replaced elements `display: block` by default") || text.includes("Constrain images and videos to the parent width") || text.includes("Restore default font weight") || text.includes("Restore indentation") || text.includes("Restore space after button") || text.includes("Prevent resizing textareas horizontally") || text.includes("Remove the inner padding in Chrome and Safari") || text.includes("Ensure date/time inputs have the same height") || text.includes("Prevent height from changing on date/time inputs") || text.includes("Remove excess padding from pseudo-elements") || text.includes("Center dropdown marker shown on inputs") || text.includes("Remove the additional `:invalid` styles") || text.includes("Correct the inability to style the border radius") || text.includes("Correct the cursor style of increment and decrement buttons");
 }
+const TAILWIND_GENERATED_THEME_SCOPE_SELECTORS = /* @__PURE__ */ new Set([
+	":host",
+	":root",
+	"page",
+	".tw-root",
+	"wx-root-portal-content"
+]);
+function isTailwindGeneratedThemeScopeSelector(selector) {
+	const selectors = selector.split(",").map((item) => item.trim()).filter(Boolean);
+	const selectorSet = new Set(selectors);
+	if (selectorSet.size !== selectors.length) return false;
+	if (!selectors.every((item) => TAILWIND_GENERATED_THEME_SCOPE_SELECTORS.has(item))) return false;
+	return selectorSet.size === 2 && selectorSet.has(":root") && selectorSet.has(":host") || selectorSet.size === 4 && selectorSet.has(":host") && selectorSet.has("page") && selectorSet.has(".tw-root") && selectorSet.has("wx-root-portal-content");
+}
 function isTailwindGeneratedThemeRule(selector, node) {
-	if (!/(?:^|,)\s*(?::host|page|\.tw-root|wx-root-portal-content)\b/.test(selector)) return false;
+	if (!isTailwindGeneratedThemeScopeSelector(selector)) return false;
 	return node.nodes?.some((child) => child.type === "decl" && /^--(?:color|spacing|text|font|default|radius|tw-)/.test(child.prop)) ?? false;
 }
 function isTailwindGeneratedPreflightRule(selector, node) {

package/dist/generator.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
 exports.createWeappTailwindcssGeneratorFromRuntime = require_generator.createWeappTailwindcssGeneratorFromRuntime;
 exports.normalizeWeappTailwindcssGeneratorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions;

package/dist/generator.mjs

@@ -1,2 +1,2 @@
-import { bt as transformTailwindV4CssToWeapp, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source, yt as transformTailwindV4CssByTarget } from "./generator-BvPcmqxU.mjs";
+import { bt as transformTailwindV4CssToWeapp, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source, yt as transformTailwindV4CssByTarget } from "./generator-B59OA64h.mjs";
 export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromRuntime, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromRuntime, resolveTailwindV4Source, resolveTailwindV4SourceFromRuntime, resolveTailwindV4SourceFromRuntimeOptions, resolveTailwindV4SourceOptionsFromRuntime, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };

package/dist/{gulp-DNZZvUMq.js → gulp-C1Q3LRzg.js}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_generator = require("./generator-CS10c9g1.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_generator = require("./generator-CEnUsjed.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
-const require_context = require("./context-DRRgW7i2.js");
-const require_hmr_timing = require("./hmr-timing-DW1g3zjl.js");
+const require_context = require("./context-VeFq_8vW.js");
+const require_hmr_timing = require("./hmr-timing-BZ5sWIqO.js");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs);
 let node_path = require("node:path");
@@ -288,7 +288,11 @@ function createNativeGulpPlugins(options = {}) {
 			dependencies: [...sourceScan?.dependencies ?? []].sort()
 		}));
 		if (!forceRefresh && cachedGulpSourceCandidateSignature === nextSignature && cachedGulpSourceCandidateGetter) return cachedGulpSourceCandidateGetter;
-		const collector = require_hmr_timing.createSourceCandidateCollector({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
+		const collector = require_hmr_timing.createSourceCandidateCollector({
+			bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues,
+			customAttributesEntities: opts.customAttributesEntities,
+			disabledDefaultTemplateHandler: opts.disabledDefaultTemplateHandler
+		});
 		await collector.scanRoot({
 			entries: sourceScan?.entries,
 			explicit: sourceScan?.explicit,

package/dist/{gulp-BEOzXrbp.mjs → gulp-DUYWxmZC.mjs}

@@ -1,8 +1,8 @@
-import { Q as normalizeTailwindConfigDirectives, X as hasTailwindRootDirectives, et as normalizeTailwindSourceForGenerator, g as upsertTailwindV4CssSource, gt as prependConfigDirective, h as hasConfiguredTailwindV4CssRoots, vt as getTailwindV4IncrementalGenerateCacheStats } from "./generator-BvPcmqxU.mjs";
-import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-DZT_pWrd.mjs";
+import { Q as normalizeTailwindConfigDirectives, X as hasTailwindRootDirectives, et as normalizeTailwindSourceForGenerator, g as upsertTailwindV4CssSource, gt as prependConfigDirective, h as hasConfiguredTailwindV4CssRoots, vt as getTailwindV4IncrementalGenerateCacheStats } from "./generator-B59OA64h.mjs";
+import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-DPcKMLxL.mjs";
 import { y as createDebug } from "./wxml-DdGdeqaH.mjs";
-import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-xSJE588m.mjs";
-import { A as processCachedTask, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, O as createCssTokenSourceMap, b as rewriteLocalCssImportRequestsForOutput, n as emitHmrTiming, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, u as generateCssByGenerator, x as splitLocalCssImports } from "./hmr-timing-hRhRAjYV.mjs";
+import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-BL8Gy71H.mjs";
+import { A as processCachedTask, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, O as createCssTokenSourceMap, b as rewriteLocalCssImportRequestsForOutput, n as emitHmrTiming, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, u as generateCssByGenerator, x as splitLocalCssImports } from "./hmr-timing-C3ed5vCx.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -282,7 +282,11 @@ function createNativeGulpPlugins(options = {}) {
 			dependencies: [...sourceScan?.dependencies ?? []].sort()
 		}));
 		if (!forceRefresh && cachedGulpSourceCandidateSignature === nextSignature && cachedGulpSourceCandidateGetter) return cachedGulpSourceCandidateGetter;
-		const collector = createSourceCandidateCollector({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
+		const collector = createSourceCandidateCollector({
+			bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues,
+			customAttributesEntities: opts.customAttributesEntities,
+			disabledDefaultTemplateHandler: opts.disabledDefaultTemplateHandler
+		});
 		await collector.scanRoot({
 			entries: sourceScan?.entries,
 			explicit: sourceScan?.explicit,

package/dist/gulp.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_gulp = require("./gulp-DNZZvUMq.js");
+const require_gulp = require("./gulp-C1Q3LRzg.js");
 exports.WeappTailwindcss = require_gulp.createPlugins;
 exports.createPlugins = require_gulp.createPlugins;
 exports.weappTailwindcss = require_gulp.createPlugins;

package/dist/gulp.mjs

@@ -1,2 +1,2 @@
-import { t as createPlugins } from "./gulp-BEOzXrbp.mjs";
+import { t as createPlugins } from "./gulp-DUYWxmZC.mjs";
 export { createPlugins as WeappTailwindcss, createPlugins, createPlugins as weappTailwindcss };

package/dist/{hmr-timing-DW1g3zjl.js → hmr-timing-BZ5sWIqO.js}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
 const require_object = require("./object-COs_Mw6p.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
-const require_context = require("./context-DRRgW7i2.js");
+const require_context = require("./context-VeFq_8vW.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
@@ -1476,7 +1476,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 		index: 0,
 		matched: true
 	}) : void 0;
-	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && require_generator.hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? await require_generator.resolveTailwindV4Source(normalizedSourceOptions) : void 0;
+	const canResolveCombinedConfiguredCssSources = (normalizedSourceOptions?.cssSources?.length ?? 0) <= 1 || require_generator.hasTailwindGeneratedCss(rawSource);
+	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && require_generator.hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? (canResolveCombinedConfiguredCssSources ? await require_generator.resolveTailwindV4Source(normalizedSourceOptions) : void 0) : void 0;
 	if (configuredCssSource) return generatorOptions?.config ? {
 		...configuredCssSource,
 		css: require_generator.prependConfigDirective(configuredCssSource.css, generatorOptions.config)
@@ -2468,6 +2469,8 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = generatedCss;
+		const distinctUserLayerParts = hasDistinctUserRawSource && require_generator.hasUserCssLayerBlocks(generatedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(generatedUserCssRawSource) : void 0;
+		let restoredDistinctUserLayerCss = false;
 		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !require_generator.hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await require_generator.transformGeneratorUserCss(generatedUserCssRawSource, {
 			generatorTarget: generated.target,
 			generatorStyleOptions,
@@ -2497,10 +2500,26 @@ async function generateCssByGenerator(options) {
 					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				}
 			}
+			if (hasDistinctUserRawSource && distinctUserLayerParts) {
+				const layerUserCss = await require_generator.transformGeneratorUserCss(distinctUserLayerParts.layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback,
+					processed: userRawSourceProcessed
+				});
+				if ((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, layerUserCss).trim().length > 0) {
+					css = createCssSourceOrderAppend$1(wrapUserLayerComponentsCss(layerUserCss), css);
+					restoredDistinctUserLayerCss = true;
+					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+				}
+			}
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await require_generator.transformGeneratorUserCss(generatedUserCssRawSource, {
+				const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+				const userCss = await require_generator.transformGeneratorUserCss(distinctUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2508,10 +2527,11 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback,
 					processed: userRawSourceProcessed
 				});
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
-				const userCss = await require_generator.transformGeneratorUserCss(require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource), {
+				const cleanedUserCssRawSource = require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
+				const userCss = await require_generator.transformGeneratorUserCss(restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2576,7 +2596,8 @@ async function generateCssByGenerator(options) {
 			css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
 		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !require_generator.hasTailwindApplyDirective(generatedUserCssRawSource)) {
-			const userCss = await require_generator.transformGeneratorUserCss(generatedUserCssRawSource, {
+			const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+			const userCss = await require_generator.transformGeneratorUserCss(distinctUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -2584,7 +2605,7 @@ async function generateCssByGenerator(options) {
 				importFallback: generatorOptions.importFallback,
 				processed: userRawSourceProcessed
 			});
-			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
+			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss) : userCss;
 			css = createCssSourceOrderAppend$1(css, missingUserCss);
 		}
 		const finalCss = finalizeGeneratorCss(css, generated.target, {
@@ -2893,10 +2914,66 @@ const SCRIPT_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
 	"mts",
 	"cts"
 ]);
+const TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
+	"html",
+	"wxml",
+	"axml",
+	"jxml",
+	"ksml",
+	"ttml",
+	"qml",
+	"tyml",
+	"xhsml",
+	"swan",
+	"vue",
+	"uvue",
+	"nvue",
+	"mpx"
+]);
 async function extractCandidatesFromSource(source, extension, options = {}) {
 	const candidates = options.extractor ? new Set(await options.extractor(source, extension)) : new Set(await (0, _tailwindcss_mangle_engine.extractSourceCandidates)(source, extension, { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } }));
 	const scriptCandidates = await extractScriptStringCandidates(source, extension, options);
 	for (const candidate of scriptCandidates) candidates.add(candidate);
+	const templateAttributeCandidates = await extractTemplateAttributeCandidates(source, extension, options);
+	for (const candidate of templateAttributeCandidates) candidates.add(candidate);
+	return candidates;
+}
+function isDefaultTemplateAttribute(name) {
+	if (name === "class" || name === "hover-class" || name === "virtualhostclass") return true;
+	const lowerName = name.toLowerCase();
+	return lowerName === "class" || lowerName === "hover-class" || lowerName === "virtualhostclass";
+}
+async function extractCandidateTokensFromTemplateAttributeValue(value, options) {
+	return options.extractor ? await options.extractor(value, "html") : await (0, _tailwindcss_mangle_engine.extractSourceCandidates)(value, "html", { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } });
+}
+async function extractTemplateAttributeCandidates(source, extension, options) {
+	if (!TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
+	if (!options.customAttributesEntities?.length) return [];
+	const candidates = /* @__PURE__ */ new Set();
+	const matchCustomAttribute = require_wxml.createAttributeMatcher(options.customAttributesEntities);
+	const defaultTemplateHandlerEnabled = !options.disabledDefaultTemplateHandler;
+	let tag = "";
+	const tasks = [];
+	const parser = new require_wxml.Parser({
+		onopentagname(name) {
+			tag = name;
+		},
+		onattribute(name, value) {
+			if (!value) return;
+			const shouldHandleDefault = defaultTemplateHandlerEnabled && isDefaultTemplateAttribute(name);
+			const shouldHandleCustom = matchCustomAttribute?.(tag, name) ?? false;
+			if (!shouldHandleDefault && !shouldHandleCustom) return;
+			tasks.push((async () => {
+				for (const candidate of await extractCandidateTokensFromTemplateAttributeValue(value, options)) candidates.add(candidate);
+			})());
+		},
+		onclosetag() {
+			tag = "";
+		}
+	}, { xmlMode: true });
+	parser.write(source);
+	parser.end();
+	await Promise.all(tasks);
 	return candidates;
 }
 async function extractScriptStringCandidates(source, extension, options) {
@@ -3046,8 +3123,21 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, extractor) {
-	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${extractor ? "custom" : "default"}\0${(0, _weapp_tailwindcss_shared_node.md5)(source)}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, customAttributesEntities, disabledDefaultTemplateHandler, extractor) {
+	return [
+		extension,
+		JSON.stringify(bareArbitraryValues ?? false),
+		createCustomAttributesCacheSignature(customAttributesEntities),
+		disabledDefaultTemplateHandler === true ? "default-template:off" : "default-template:on",
+		extractor ? "custom" : "default",
+		(0, _weapp_tailwindcss_shared_node.md5)(source)
+	].join("\0");
+}
+function createCustomAttributesCacheSignature(customAttributesEntities) {
+	return JSON.stringify((customAttributesEntities ?? []).map(([selector, props]) => [stringifyCustomAttributeToken(selector), Array.isArray(props) ? props.map(stringifyCustomAttributeToken) : stringifyCustomAttributeToken(props)]));
+}
+function stringifyCustomAttributeToken(token) {
+	return typeof token === "string" ? `s:${token}` : `r:${token.source}/${token.flags}`;
 }
 async function extractCandidates(source, extension, options) {
 	return extractCandidatesFromSource(source, extension, options);
@@ -3094,7 +3184,7 @@ function createSourceCandidateStore(options = {}) {
 		const normalizedId = cleanUrl(id);
 		scanSourceById.set(normalizedId, source);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
@@ -3107,7 +3197,7 @@ function createSourceCandidateStore(options = {}) {
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
 		cssSourceById.set(normalizedId, source);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
@@ -3121,7 +3211,7 @@ function createSourceCandidateStore(options = {}) {
 		const normalizedId = cleanUrl(id);
 		transformSourceById.set(normalizedId, source);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : await extractCandidates(source, extension, options);
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);