weapp-tailwindcss 5.1.6 → 5.1.7

package/dist/{vite-Baw9qNrc.js → vite-BJRlG835.js}

@@ -1,12 +1,12 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
-const require_v4_engine = require("./v4-engine-C9cmNlP8.js");
-const require_generator = require("./generator-CqWzj2Z1.js");
+const require_v4_engine = require("./v4-engine-3UmJkAY7.js");
+const require_generator = require("./generator-DASZwC6t.js");
 const require_utils = require("./utils-D3h8j7Mk.js");
-const require_context = require("./context-BCSk_YnL.js");
-const require_tailwindcss = require("./tailwindcss-DYJ3HZD2.js");
-const require_hmr_timing = require("./hmr-timing-Df4203aI.js");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-5Uk6U72B.js");
+const require_context = require("./context-C7KTDlrG.js");
+const require_tailwindcss = require("./tailwindcss-DPxJpRVP.js");
+const require_hmr_timing = require("./hmr-timing-BIr_CiPW.js");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-Djr2Hw8y.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs);
@@ -515,7 +515,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-B6_y_yCB.js")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-CvqqZBuq.js")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = /* @__PURE__ */ new Set([
@@ -749,6 +749,68 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 		});
 	};
 }
+const UNI_APP_X_WEB_PREFLIGHT_RESET_CSS = [`/* weapp-tailwindcss uni-app-x web preflight reset */`, `${[
+	"uni-ad-draw",
+	"uni-ad-fullscreen-video",
+	"uni-ad-interactive",
+	"uni-ad-interstitial",
+	"uni-ad-rewarded-video",
+	"uni-ad",
+	"uni-animation-view",
+	"uni-audio",
+	"uni-block",
+	"uni-button",
+	"uni-camera",
+	"uni-canvas",
+	"uni-checkbox-group",
+	"uni-checkbox",
+	"uni-cover-image",
+	"uni-cover-view",
+	"uni-custom-tab-bar",
+	"uni-editor",
+	"uni-form",
+	"uni-icon",
+	"uni-image",
+	"uni-input",
+	"uni-label",
+	"uni-list-item",
+	"uni-list-view",
+	"uni-live-player",
+	"uni-live-pusher",
+	"uni-map",
+	"uni-match-media",
+	"uni-movable-area",
+	"uni-movable-view",
+	"uni-navigation-bar",
+	"uni-navigator",
+	"uni-open-data",
+	"uni-page-meta",
+	"uni-picker-view",
+	"uni-picker",
+	"uni-progress",
+	"uni-radio-group",
+	"uni-radio",
+	"uni-rich-text",
+	"uni-scroll-view",
+	"uni-slider",
+	"uni-sticky-header",
+	"uni-sticky-section",
+	"uni-swiper-item",
+	"uni-swiper",
+	"uni-switch",
+	"uni-template",
+	"uni-text",
+	"uni-textarea",
+	"uni-unicloud-db",
+	"uni-video",
+	"uni-view",
+	"uni-web-view"
+].map((tag) => `uni-app ${tag}`).join(", ")}{border-width:0;}`].join("\n");
+const TAILWIND_PREFLIGHT_BORDER_RE = /\bborder\s*:\s*0(?:px)?\s+solid\b/;
+function withUniAppXWebPreflightReset(css, enabled) {
+	if (!enabled || css.includes("weapp-tailwindcss uni-app-x web preflight reset") || !TAILWIND_PREFLIGHT_BORDER_RE.test(css)) return css;
+	return css.length > 0 ? `${UNI_APP_X_WEB_PREFLIGHT_RESET_CSS}\n${css}` : UNI_APP_X_WEB_PREFLIGHT_RESET_CSS;
+}
 //#endregion
 //#region src/bundlers/vite/generate-bundle/configured-css-sources.ts
 function collectConfiguredTailwindV4CssSources(opts) {
@@ -4281,7 +4343,7 @@ function createGenerateBundleHook(context) {
 		const shouldApplyWebviewCssCompat = isWebGeneratorTarget || shouldApplyWebviewSafeSelectors;
 		const transformWebTargetCss = (css) => {
 			const compatCss = isWebGeneratorTarget ? (0, _weapp_tailwindcss_postcss.transformWebCssCompat)(css, generatorOptions.webCompat) : shouldApplyWebviewCssCompat ? (0, _weapp_tailwindcss_postcss.transformWebCssCompat)(css, generatorOptions.webCompat ?? true) : css;
-			return shouldApplyWebviewSafeSelectors ? (0, _weapp_tailwindcss_postcss.transformWebCssSafeSelectors)(compatCss, { escapeMap: opts.escapeMap }) : compatCss;
+			return withUniAppXWebPreflightReset(shouldApplyWebviewSafeSelectors ? (0, _weapp_tailwindcss_postcss.transformWebCssSafeSelectors)(compatCss, { escapeMap: opts.escapeMap }) : compatCss, opts.appType === "uni-app-x" && isWebGeneratorTarget);
 		};
 		const isUniAppXStyleTarget = opts.appType === "uni-app-x";
 		const isNativeAppStyleTarget = isUniAppXStyleTarget && uniUtsPlatform.isApp;
@@ -5173,7 +5235,7 @@ function isUniAppViteWebviewOutDir(outDir) {
 }
 function finalizeWebCss(css, enabled, webCompat, options = {}) {
 	const compatCss = enabled ? (0, _weapp_tailwindcss_postcss.transformWebCssCompat)(css, webCompat) : css;
-	return options.safeSelectors ? (0, _weapp_tailwindcss_postcss.transformWebCssSafeSelectors)(compatCss, { escapeMap: options.escapeMap }) : compatCss;
+	return withUniAppXWebPreflightReset(options.safeSelectors ? (0, _weapp_tailwindcss_postcss.transformWebCssSafeSelectors)(compatCss, { escapeMap: options.escapeMap }) : compatCss, options.uniAppXWebPreflightReset === true);
 }
 function createViteCssFinalizerOutputPlugin(context) {
 	return {
@@ -5224,7 +5286,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 						resolveViteProcessedCssOutputFile: (file) => resolveViteCssPipelineOutputFile(file, opts, rootDir, isWebGeneratorTarget, isNativeAppStyleTarget, sourceRoot, resolveMiniProgramStyleOutputExtension({ files: Object.keys(bundle) }), Object.keys(bundle)),
 						transformCss: (css) => finalizeWebCss(css, generatorBranch.isWeb, generatorOptions.webCompat, {
 							escapeMap: opts.escapeMap,
-							safeSelectors: shouldApplyWebviewSafeSelectors
+							safeSelectors: shouldApplyWebviewSafeSelectors,
+							uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 						}),
 						debug
 					});
@@ -5237,7 +5300,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 						recordCssAssetResult,
 						transformCss: (css) => finalizeWebCss(css, generatorBranch.isWeb, generatorOptions.webCompat, {
 							escapeMap: opts.escapeMap,
-							safeSelectors: shouldApplyWebviewSafeSelectors
+							safeSelectors: shouldApplyWebviewSafeSelectors,
+							uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 						}),
 						debug,
 						onUpdate: opts.onUpdate
@@ -5305,7 +5369,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 					if (isViteProcessedCssAsset?.(output, file)) {
 						const nextCss = annotateCss(finalizeWebCss(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(rawSource), generatorBranch.isWeb, generatorOptions.webCompat, {
 							escapeMap: opts.escapeMap,
-							safeSelectors: shouldApplyWebviewSafeSelectors
+							safeSelectors: shouldApplyWebviewSafeSelectors,
+							uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 						}));
 						output.source = nextCss;
 						markCssAssetProcessed(output, file);
@@ -5343,7 +5408,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 					}) : void 0;
 					const nextCss = annotateCss(generated?.css ?? (generatorBranch.isWeb ? finalizeWebCss(rawSource, true, generatorOptions.webCompat, {
 						escapeMap: opts.escapeMap,
-						safeSelectors: shouldApplyWebviewSafeSelectors
+						safeSelectors: shouldApplyWebviewSafeSelectors,
+						uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 					}) : (await opts.styleHandler(rawSource, cssHandlerOptions)).css));
 					if (generated) {
 						registerGeneratorDependencies(this, generated.dependencies);
@@ -6043,6 +6109,12 @@ function isViteServeCssRootRequest(id, command) {
 function isViteCssHmrModule(code, id, command) {
 	return isViteServeStyleRequest(id, command) && VITE_CSS_HMR_MODULE_RE.test(code) && /[?&](?:direct|vue)(?:&|$)/.test(id);
 }
+function hasViteServeCssGenerationDirective(code) {
+	return require_v4_engine.hasTailwindRootDirectives(code) || require_v4_engine.hasTailwindSourceDirectives(code, { importFallback: true }) || require_v4_engine.hasTailwindApplyDirective(code);
+}
+function hasViteServeCssRootDirective(code) {
+	return require_v4_engine.hasTailwindRootDirectives(code);
+}
 function createViteServeCssGenerationPlugins(options) {
 	return [{
 		name: `${require_context.vitePluginName}:generate:serve`,
@@ -6067,7 +6139,8 @@ function createViteServeCssGenerationPlugins(options) {
 			if (!options.shouldGenerate() || !isViteCssHmrModule(code, id, options.getCommand())) return;
 			const extracted = extractViteCssHmrModuleCss(code);
 			if (!extracted) return;
-			await options.onTailwindRootCss?.(id, extracted.css);
+			if (!hasViteServeCssGenerationDirective(extracted.css)) return;
+			if (hasViteServeCssRootDirective(extracted.css)) await options.onTailwindRootCss?.(id, extracted.css);
 			const generatedCss = await options.generateCss(id, extracted.css, this);
 			if (generatedCss === void 0 || generatedCss === extracted.css) return;
 			const nextCode = replaceViteCssHmrModuleCss(code, generatedCss);
@@ -6203,6 +6276,7 @@ function WeappTailwindcss(options = {}) {
 	const initialTailwindRuntime = tailwindRuntime;
 	const refreshTailwindRuntime = refreshTailwindcssRuntime;
 	const uniAppXEnabled = require_tailwindcss.isUniAppXEnabled(uniAppX);
+	const shouldEnableUniAppXPlugins = opts.appType === "uni-app-x" || uniAppXEnabled;
 	const disabledOptions = require_source_candidate_scan_signature.resolvePluginDisabledState(disabled);
 	const tailwindcssMajorVersion = initialTailwindRuntime.majorVersion ?? 0;
 	if (!disabledOptions.plugin && tailwindcssMajorVersion !== 4) throw new Error("weapp-tailwindcss/vite 新生成管线仅支持 Tailwind CSS v4，请升级 tailwindcss 或停留在旧版 weapp-tailwindcss。");
@@ -6643,11 +6717,11 @@ function WeappTailwindcss(options = {}) {
 		if (!generated) return;
 		const finalizedCss = finalizeViteMiniProgramCss(generated.css);
 		const isUniAppViteWebviewPlatform = opts.appType === "uni-app-vite" && isUniAppViteWebviewStylePlatform(resolveViteStylePlatform());
-		const tracedCss = require_hmr_timing.annotateCssSourceTrace(removeScopedTailwindPreflightCss(currentGeneratorBranch.isWeb || isUniAppViteWebviewPlatform ? applyUniAppViteWebviewCssCompat(finalizedCss, {
+		const tracedCss = require_hmr_timing.annotateCssSourceTrace(withUniAppXWebPreflightReset(removeScopedTailwindPreflightCss(currentGeneratorBranch.isWeb || isUniAppViteWebviewPlatform ? applyUniAppViteWebviewCssCompat(finalizedCss, {
 			compat: currentGeneratorOptions.webCompat ?? true,
 			escapeMap: opts.escapeMap,
 			safeSelectors: isUniAppViteWebviewPlatform
-		}) : finalizedCss), {
+		}) : finalizedCss), opts.appType === "uni-app-x" && currentGeneratorBranch.isWeb), {
 			opts,
 			tokenSources: require_hmr_timing.createCssTokenSourceMap(getSourceCandidateSourcesForEntries(void 0), opts)
 		});
@@ -6752,7 +6826,7 @@ function WeappTailwindcss(options = {}) {
 		if (shouldDiscoverAutoCssSources()) await discoverAndRegisterAutoCssSources();
 		await syncSourceCandidateScan();
 	};
-	const uniAppXPlugins = uniAppXEnabled ? createUniAppXPlugins({
+	const uniAppXPlugins = shouldEnableUniAppXPlugins ? createUniAppXPlugins({
 		appType: opts.appType ?? "uni-app-x",
 		customAttributesEntities,
 		disabledDefaultTemplateHandler,

package/dist/{vite-PdxjaqhO.mjs → vite-XxJh7Xtu.mjs}

@@ -1,11 +1,11 @@
 import { resolveImplicitAppTypeFromViteRoot } from "./framework.mjs";
-import { $ as hasTailwindGeneratedCssMarkers, B as hasTailwindNonRootGenerationDirectives, Et as omitUndefined, G as normalizeTailwindSourceForGenerator, H as hasTailwindSourceDirectives, K as parseImportRequest, L as stripMiniProgramCssSpecificityPlaceholders, P as hasMiniProgramCssSpecificityPlaceholders, R as hasLocalCssImport, Tt as filterUnsupportedMiniProgramTailwindV4Candidates, U as normalizeTailwindConfigDirectives, V as hasTailwindRootDirectives, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, d as normalizeCssEntries, f as findNearestPackageRoot, lt as getTailwindV4IncrementalGenerateCacheStats, o as hasConfiguredTailwindV4CssRoots, q as removeTailwindSourceDirectives, s as upsertTailwindV4CssSource, u as isTailwindV4CssEntry, w as normalizeEmptyTailwindCustomVariants, xt as resolveTailwindV4CssSourceBase, z as hasTailwindApplyDirective } from "./v4-engine-DRQaCFMm.mjs";
-import { a as resolveGeneratorRuntimeBranch, c as shouldUseNativeAppCssBranch, i as normalizeWeappTailwindcssGeneratorOptions, s as shouldUseMiniProgramCssBranch } from "./generator-CoT5vu9w.mjs";
+import { $ as hasTailwindGeneratedCssMarkers, B as hasTailwindNonRootGenerationDirectives, Et as omitUndefined, G as normalizeTailwindSourceForGenerator, H as hasTailwindSourceDirectives, K as parseImportRequest, L as stripMiniProgramCssSpecificityPlaceholders, P as hasMiniProgramCssSpecificityPlaceholders, R as hasLocalCssImport, Tt as filterUnsupportedMiniProgramTailwindV4Candidates, U as normalizeTailwindConfigDirectives, V as hasTailwindRootDirectives, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, d as normalizeCssEntries, f as findNearestPackageRoot, lt as getTailwindV4IncrementalGenerateCacheStats, o as hasConfiguredTailwindV4CssRoots, q as removeTailwindSourceDirectives, s as upsertTailwindV4CssSource, u as isTailwindV4CssEntry, w as normalizeEmptyTailwindCustomVariants, xt as resolveTailwindV4CssSourceBase, z as hasTailwindApplyDirective } from "./v4-engine-CYSrDVNp.mjs";
+import { a as resolveGeneratorRuntimeBranch, c as shouldUseNativeAppCssBranch, i as normalizeWeappTailwindcssGeneratorOptions, s as shouldUseMiniProgramCssBranch } from "./generator-BOt2Tvx3.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-DodxWHGz.mjs";
-import { C as normalizeFrameworkStylePlatform, S as createDebug, _ as toCustomAttributesEntities, a as vitePluginName, l as shouldSkipJsTransform, m as replaceWxml, n as normalizeStyleHandlerMajorVersion, t as getCompilerContext, v as collectRuntimeClassSet, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-3GGqW9vw.mjs";
-import { _ as resolveViteTailwindV4CssDependencies, a as findTailwindConfig, f as createViteSourceScanMatcher, g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as resolveViteSourceScanEntries, r as isUniAppXEnabled } from "./tailwindcss-Bjr3aphG.mjs";
-import { E as createCssTokenSourceMap, O as processCachedTask, T as createCssSourceTraceCacheSignature, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as scoreTailwindV4CssSourceFileMatch, d as validateCandidatesByGenerator, g as mergeMarkedUserLayerComponentsCss, h as extractMarkedUserLayerComponentsCss, m as runWithConcurrency, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, t as createHmrTimingRecorder, w as annotateCssSourceTrace } from "./hmr-timing-Cfu-4Bnf.mjs";
-import { A as isSourceStyleRequest, C as resolvePluginDisabledState, D as isHTMLRequest, E as isCSSRequest, F as createBuiltinViteStyleInjectorPlugins, M as normalizeOutputPathKey, O as normalizePath, P as toAbsoluteOutputPath, S as resolvePackageDir, T as formatPostcssSourceMap, _ as generateTailwindV4Css, a as createJsHashSalt, b as parseBundlerGeneratedCssMarkerBlocks, c as hasRuntimeAffectingSourceChanges, f as createBundleBuildState, g as createBundleModuleGraphOptions, h as applyLinkedResults, i as createCandidateSignature, j as stripRequestQuery, k as slash, l as summarizeStringDiff, m as createRuntimeAffectingSourceSignature, n as createScopedGeneratorCandidateSignature, o as createLinkedImpactSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, s as getSnapshotHash, t as createSourceCandidateScanSignature, u as buildBundleSnapshot, v as createBundlerGeneratedCssMarker, w as cleanUrl, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-BbCmW975.mjs";
+import { C as normalizeFrameworkStylePlatform, S as createDebug, _ as toCustomAttributesEntities, a as vitePluginName, l as shouldSkipJsTransform, m as replaceWxml, n as normalizeStyleHandlerMajorVersion, t as getCompilerContext, v as collectRuntimeClassSet, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-BqeDu1Ha.mjs";
+import { _ as resolveViteTailwindV4CssDependencies, a as findTailwindConfig, f as createViteSourceScanMatcher, g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as resolveViteSourceScanEntries, r as isUniAppXEnabled } from "./tailwindcss-DDGD90w7.mjs";
+import { E as createCssTokenSourceMap, O as processCachedTask, T as createCssSourceTraceCacheSignature, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as scoreTailwindV4CssSourceFileMatch, d as validateCandidatesByGenerator, g as mergeMarkedUserLayerComponentsCss, h as extractMarkedUserLayerComponentsCss, m as runWithConcurrency, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, t as createHmrTimingRecorder, w as annotateCssSourceTrace } from "./hmr-timing-CYwVMRol.mjs";
+import { A as isSourceStyleRequest, C as resolvePluginDisabledState, D as isHTMLRequest, E as isCSSRequest, F as createBuiltinViteStyleInjectorPlugins, M as normalizeOutputPathKey, O as normalizePath, P as toAbsoluteOutputPath, S as resolvePackageDir, T as formatPostcssSourceMap, _ as generateTailwindV4Css, a as createJsHashSalt, b as parseBundlerGeneratedCssMarkerBlocks, c as hasRuntimeAffectingSourceChanges, f as createBundleBuildState, g as createBundleModuleGraphOptions, h as applyLinkedResults, i as createCandidateSignature, j as stripRequestQuery, k as slash, l as summarizeStringDiff, m as createRuntimeAffectingSourceSignature, n as createScopedGeneratorCandidateSignature, o as createLinkedImpactSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, s as getSnapshotHash, t as createSourceCandidateScanSignature, u as buildBundleSnapshot, v as createBundlerGeneratedCssMarker, w as cleanUrl, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-D97ZEXcj.mjs";
 import { t as logger$1 } from "./logger-BNzxZbZj.mjs";
 import fs, { existsSync, readFileSync, realpathSync } from "node:fs";
 import path from "node:path";
@@ -509,7 +509,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = import("./transform--155BmeJ.mjs").then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = import("./transform-DPPr79r2.mjs").then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = /* @__PURE__ */ new Set([
@@ -743,6 +743,68 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 		});
 	};
 }
+const UNI_APP_X_WEB_PREFLIGHT_RESET_CSS = [`/* weapp-tailwindcss uni-app-x web preflight reset */`, `${[
+	"uni-ad-draw",
+	"uni-ad-fullscreen-video",
+	"uni-ad-interactive",
+	"uni-ad-interstitial",
+	"uni-ad-rewarded-video",
+	"uni-ad",
+	"uni-animation-view",
+	"uni-audio",
+	"uni-block",
+	"uni-button",
+	"uni-camera",
+	"uni-canvas",
+	"uni-checkbox-group",
+	"uni-checkbox",
+	"uni-cover-image",
+	"uni-cover-view",
+	"uni-custom-tab-bar",
+	"uni-editor",
+	"uni-form",
+	"uni-icon",
+	"uni-image",
+	"uni-input",
+	"uni-label",
+	"uni-list-item",
+	"uni-list-view",
+	"uni-live-player",
+	"uni-live-pusher",
+	"uni-map",
+	"uni-match-media",
+	"uni-movable-area",
+	"uni-movable-view",
+	"uni-navigation-bar",
+	"uni-navigator",
+	"uni-open-data",
+	"uni-page-meta",
+	"uni-picker-view",
+	"uni-picker",
+	"uni-progress",
+	"uni-radio-group",
+	"uni-radio",
+	"uni-rich-text",
+	"uni-scroll-view",
+	"uni-slider",
+	"uni-sticky-header",
+	"uni-sticky-section",
+	"uni-swiper-item",
+	"uni-swiper",
+	"uni-switch",
+	"uni-template",
+	"uni-text",
+	"uni-textarea",
+	"uni-unicloud-db",
+	"uni-video",
+	"uni-view",
+	"uni-web-view"
+].map((tag) => `uni-app ${tag}`).join(", ")}{border-width:0;}`].join("\n");
+const TAILWIND_PREFLIGHT_BORDER_RE = /\bborder\s*:\s*0(?:px)?\s+solid\b/;
+function withUniAppXWebPreflightReset(css, enabled) {
+	if (!enabled || css.includes("weapp-tailwindcss uni-app-x web preflight reset") || !TAILWIND_PREFLIGHT_BORDER_RE.test(css)) return css;
+	return css.length > 0 ? `${UNI_APP_X_WEB_PREFLIGHT_RESET_CSS}\n${css}` : UNI_APP_X_WEB_PREFLIGHT_RESET_CSS;
+}
 //#endregion
 //#region src/bundlers/vite/generate-bundle/configured-css-sources.ts
 function collectConfiguredTailwindV4CssSources(opts) {
@@ -4275,7 +4337,7 @@ function createGenerateBundleHook(context) {
 		const shouldApplyWebviewCssCompat = isWebGeneratorTarget || shouldApplyWebviewSafeSelectors;
 		const transformWebTargetCss = (css) => {
 			const compatCss = isWebGeneratorTarget ? transformWebCssCompat(css, generatorOptions.webCompat) : shouldApplyWebviewCssCompat ? transformWebCssCompat(css, generatorOptions.webCompat ?? true) : css;
-			return shouldApplyWebviewSafeSelectors ? transformWebCssSafeSelectors(compatCss, { escapeMap: opts.escapeMap }) : compatCss;
+			return withUniAppXWebPreflightReset(shouldApplyWebviewSafeSelectors ? transformWebCssSafeSelectors(compatCss, { escapeMap: opts.escapeMap }) : compatCss, opts.appType === "uni-app-x" && isWebGeneratorTarget);
 		};
 		const isUniAppXStyleTarget = opts.appType === "uni-app-x";
 		const isNativeAppStyleTarget = isUniAppXStyleTarget && uniUtsPlatform.isApp;
@@ -5167,7 +5229,7 @@ function isUniAppViteWebviewOutDir(outDir) {
 }
 function finalizeWebCss(css, enabled, webCompat, options = {}) {
 	const compatCss = enabled ? transformWebCssCompat(css, webCompat) : css;
-	return options.safeSelectors ? transformWebCssSafeSelectors(compatCss, { escapeMap: options.escapeMap }) : compatCss;
+	return withUniAppXWebPreflightReset(options.safeSelectors ? transformWebCssSafeSelectors(compatCss, { escapeMap: options.escapeMap }) : compatCss, options.uniAppXWebPreflightReset === true);
 }
 function createViteCssFinalizerOutputPlugin(context) {
 	return {
@@ -5218,7 +5280,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 						resolveViteProcessedCssOutputFile: (file) => resolveViteCssPipelineOutputFile(file, opts, rootDir, isWebGeneratorTarget, isNativeAppStyleTarget, sourceRoot, resolveMiniProgramStyleOutputExtension({ files: Object.keys(bundle) }), Object.keys(bundle)),
 						transformCss: (css) => finalizeWebCss(css, generatorBranch.isWeb, generatorOptions.webCompat, {
 							escapeMap: opts.escapeMap,
-							safeSelectors: shouldApplyWebviewSafeSelectors
+							safeSelectors: shouldApplyWebviewSafeSelectors,
+							uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 						}),
 						debug
 					});
@@ -5231,7 +5294,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 						recordCssAssetResult,
 						transformCss: (css) => finalizeWebCss(css, generatorBranch.isWeb, generatorOptions.webCompat, {
 							escapeMap: opts.escapeMap,
-							safeSelectors: shouldApplyWebviewSafeSelectors
+							safeSelectors: shouldApplyWebviewSafeSelectors,
+							uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 						}),
 						debug,
 						onUpdate: opts.onUpdate
@@ -5299,7 +5363,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 					if (isViteProcessedCssAsset?.(output, file)) {
 						const nextCss = annotateCss(finalizeWebCss(stripBundlerGeneratedCssMarkers(rawSource), generatorBranch.isWeb, generatorOptions.webCompat, {
 							escapeMap: opts.escapeMap,
-							safeSelectors: shouldApplyWebviewSafeSelectors
+							safeSelectors: shouldApplyWebviewSafeSelectors,
+							uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 						}));
 						output.source = nextCss;
 						markCssAssetProcessed(output, file);
@@ -5337,7 +5402,8 @@ function createViteCssFinalizerOutputPlugin(context) {
 					}) : void 0;
 					const nextCss = annotateCss(generated?.css ?? (generatorBranch.isWeb ? finalizeWebCss(rawSource, true, generatorOptions.webCompat, {
 						escapeMap: opts.escapeMap,
-						safeSelectors: shouldApplyWebviewSafeSelectors
+						safeSelectors: shouldApplyWebviewSafeSelectors,
+						uniAppXWebPreflightReset: opts.appType === "uni-app-x" && generatorBranch.isWeb
 					}) : (await opts.styleHandler(rawSource, cssHandlerOptions)).css));
 					if (generated) {
 						registerGeneratorDependencies(this, generated.dependencies);
@@ -6037,6 +6103,12 @@ function isViteServeCssRootRequest(id, command) {
 function isViteCssHmrModule(code, id, command) {
 	return isViteServeStyleRequest(id, command) && VITE_CSS_HMR_MODULE_RE.test(code) && /[?&](?:direct|vue)(?:&|$)/.test(id);
 }
+function hasViteServeCssGenerationDirective(code) {
+	return hasTailwindRootDirectives(code) || hasTailwindSourceDirectives(code, { importFallback: true }) || hasTailwindApplyDirective(code);
+}
+function hasViteServeCssRootDirective(code) {
+	return hasTailwindRootDirectives(code);
+}
 function createViteServeCssGenerationPlugins(options) {
 	return [{
 		name: `${vitePluginName}:generate:serve`,
@@ -6061,7 +6133,8 @@ function createViteServeCssGenerationPlugins(options) {
 			if (!options.shouldGenerate() || !isViteCssHmrModule(code, id, options.getCommand())) return;
 			const extracted = extractViteCssHmrModuleCss(code);
 			if (!extracted) return;
-			await options.onTailwindRootCss?.(id, extracted.css);
+			if (!hasViteServeCssGenerationDirective(extracted.css)) return;
+			if (hasViteServeCssRootDirective(extracted.css)) await options.onTailwindRootCss?.(id, extracted.css);
 			const generatedCss = await options.generateCss(id, extracted.css, this);
 			if (generatedCss === void 0 || generatedCss === extracted.css) return;
 			const nextCode = replaceViteCssHmrModuleCss(code, generatedCss);
@@ -6197,6 +6270,7 @@ function WeappTailwindcss(options = {}) {
 	const initialTailwindRuntime = tailwindRuntime;
 	const refreshTailwindRuntime = refreshTailwindcssRuntime;
 	const uniAppXEnabled = isUniAppXEnabled(uniAppX);
+	const shouldEnableUniAppXPlugins = opts.appType === "uni-app-x" || uniAppXEnabled;
 	const disabledOptions = resolvePluginDisabledState(disabled);
 	const tailwindcssMajorVersion = initialTailwindRuntime.majorVersion ?? 0;
 	if (!disabledOptions.plugin && tailwindcssMajorVersion !== 4) throw new Error("weapp-tailwindcss/vite 新生成管线仅支持 Tailwind CSS v4，请升级 tailwindcss 或停留在旧版 weapp-tailwindcss。");
@@ -6637,11 +6711,11 @@ function WeappTailwindcss(options = {}) {
 		if (!generated) return;
 		const finalizedCss = finalizeViteMiniProgramCss(generated.css);
 		const isUniAppViteWebviewPlatform = opts.appType === "uni-app-vite" && isUniAppViteWebviewStylePlatform(resolveViteStylePlatform());
-		const tracedCss = annotateCssSourceTrace(removeScopedTailwindPreflightCss(currentGeneratorBranch.isWeb || isUniAppViteWebviewPlatform ? applyUniAppViteWebviewCssCompat(finalizedCss, {
+		const tracedCss = annotateCssSourceTrace(withUniAppXWebPreflightReset(removeScopedTailwindPreflightCss(currentGeneratorBranch.isWeb || isUniAppViteWebviewPlatform ? applyUniAppViteWebviewCssCompat(finalizedCss, {
 			compat: currentGeneratorOptions.webCompat ?? true,
 			escapeMap: opts.escapeMap,
 			safeSelectors: isUniAppViteWebviewPlatform
-		}) : finalizedCss), {
+		}) : finalizedCss), opts.appType === "uni-app-x" && currentGeneratorBranch.isWeb), {
 			opts,
 			tokenSources: createCssTokenSourceMap(getSourceCandidateSourcesForEntries(void 0), opts)
 		});
@@ -6746,7 +6820,7 @@ function WeappTailwindcss(options = {}) {
 		if (shouldDiscoverAutoCssSources()) await discoverAndRegisterAutoCssSources();
 		await syncSourceCandidateScan();
 	};
-	const uniAppXPlugins = uniAppXEnabled ? createUniAppXPlugins({
+	const uniAppXPlugins = shouldEnableUniAppXPlugins ? createUniAppXPlugins({
 		appType: opts.appType ?? "uni-app-x",
 		customAttributesEntities,
 		disabledDefaultTemplateHandler,

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-BJRlG835.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-XxJh7Xtu.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\./;
@@ -2150,6 +2154,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 +2386,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
@@ -5450,6 +5485,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 +5623,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 +5713,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 +7383,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 +7574,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) {