weapp-tailwindcss 5.5.1 → 5.5.2

package/dist/{vite-D_mAIfTU.cjs → vite-bJZi1V-l.cjs}

@@ -1,16 +1,16 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-DsrQ9txU.cjs");
-const require_tailwindcss = require("./tailwindcss-C-jBBQfw.cjs");
+const require_generator = require("./generator-CCw17l0G.cjs");
+const require_tailwindcss = require("./tailwindcss-DhaLV5a2.cjs");
 require("./utils-CuKLf1Zv.cjs");
-const require_v4_generation_core = require("./v4-generation-core-CRNUU_Rr.cjs");
-const require_compiler = require("./compiler-D2ZJc3uA.cjs");
+const require_v4_generation_core = require("./v4-generation-core-bOm8k4AY.cjs");
+const require_compiler = require("./compiler-BSMSbVVt.cjs");
 const require_cache = require("./cache-CBJFB1HN.cjs");
-const require_hmr_timing = require("./hmr-timing-Cz4IesEM.cjs");
+const require_hmr_timing = require("./hmr-timing-DuIbach8.cjs");
 const require_final_css_cleanup = require("./final-css-cleanup-DSjczga3.cjs");
-const require_scoped_generator = require("./scoped-generator-TVjEaOeP.cjs");
-const require_web = require("./web-B2Ea9K4B.cjs");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-B7cUxqqX.cjs");
+const require_scoped_generator = require("./scoped-generator-CO9xZ06m.cjs");
+const require_web = require("./web-B4wa3xrE.cjs");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-_UPwg8oJ.cjs");
 require("./logger-TlKT3xmR.cjs");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
@@ -28,7 +28,22 @@ let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let node_buffer = require("node:buffer");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let node_async_hooks = require("node:async_hooks");
+let postcss_scss = require("postcss-scss");
+postcss_scss = require_rolldown_runtime.__toESM(postcss_scss, 1);
+let _vue_compiler_dom = require("@vue/compiler-dom");
 let comment_json = require("comment-json");
+//#region src/uni-app-x/style-asset/source-parser.ts
+function parseUniAppXStyleSource(source) {
+	return postcss_scss.default.parse(source, { from: void 0 });
+}
+function isUniAppXStyleSourceEmpty(source) {
+	try {
+		return parseUniAppXStyleSource(source).nodes.every((node) => node.type === "comment");
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/uni-app-x/style-asset/harmony-apply.ts
 const SFC_STYLE_BLOCK_RE$1 = /(<style\b[^>]*>)([\s\S]*?)(<\/style>)/gi;
 function createGeneratedRuleMap(css) {
@@ -52,7 +67,7 @@ function expandUniAppXHarmonyApplyStyles(source, generatedCss) {
 		if (!styleSource.includes("@apply")) return block;
 		let root;
 		try {
-			root = _weapp_tailwindcss_postcss.postcss.parse(styleSource);
+			root = parseUniAppXStyleSource(styleSource);
 		} catch {
 			return block;
 		}
@@ -244,7 +259,7 @@ function createStyleValueFromApplySources(sources, utilityStyles) {
 		for (const styleSource of styleSources) {
 			let root;
 			try {
-				root = _weapp_tailwindcss_postcss.postcss.parse(styleSource);
+				root = parseUniAppXStyleSource(styleSource);
 			} catch {
 				continue;
 			}
@@ -273,13 +288,13 @@ function createStyleValueFromApplySources(sources, utilityStyles) {
 	return Object.keys(result).length > 0 ? result : void 0;
 }
 function resolveReferencePaths(styleSource, sourceId) {
-	if (!sourceId || !styleSource.includes("@reference")) return styleSource;
 	let root;
 	try {
-		root = _weapp_tailwindcss_postcss.postcss.parse(styleSource);
+		root = parseUniAppXStyleSource(styleSource);
 	} catch {
 		return styleSource;
 	}
+	if (!sourceId || !styleSource.includes("@reference")) return root.toString();
 	const cleanSourceId = sourceId.replace(/\?.*$/, "");
 	const pathApi = /^[a-z]:[\\/]/i.test(cleanSourceId) ? node_path.default.win32 : node_path.default;
 	root.walkAtRules("reference", (rule) => {
@@ -301,7 +316,7 @@ function collectUniAppXHarmonyApplyUtilitiesFromSources(sources) {
 	for (const source of sources) for (const styleSource of collectUniAppXHarmonyApplyStyleSourcesFromSource(source)) {
 		let root;
 		try {
-			root = _weapp_tailwindcss_postcss.postcss.parse(styleSource);
+			root = parseUniAppXStyleSource(styleSource);
 		} catch {
 			continue;
 		}
@@ -525,7 +540,7 @@ function createUniAppXHarmonyApplyGeneratorSource(applyStyleSources, _applyUtili
 	return applyStyleSources.map((source) => {
 		let root;
 		try {
-			root = _weapp_tailwindcss_postcss.postcss.parse(source);
+			root = parseUniAppXStyleSource(source);
 		} catch {
 			return source;
 		}
@@ -1463,7 +1478,7 @@ function shouldKeepRootMiniProgramStyleAsImportShell(enabled) {
 	return enabled === true;
 }
 function shouldPreserveFrameworkRootMiniProgramImportShell(options) {
-	return !options.isWebGeneratorTarget && options.matchesCss && isRootMiniProgramStyleOutputFile$1(options.file) && (0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapper)(options.css) && shouldKeepRootMiniProgramStyleAsImportShell(options.shouldKeep());
+	return !options.isWebGeneratorTarget && options.matchesCss && require_web.isRootStyleOutputFile(options.file) && (0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapper)(options.css) && shouldKeepRootMiniProgramStyleAsImportShell(options.shouldKeep());
 }
 function resolveFrameworkRootImportShellPlan(options) {
 	const isCurrentImportShell = shouldPreserveFrameworkRootMiniProgramImportShell({
@@ -1478,7 +1493,7 @@ function resolveFrameworkRootImportShellPlan(options) {
 		return {
 			isCurrentImportShell,
 			reusableTarget: options.rememberedTarget,
-			targetToRemember: importedFile && isRootMiniProgramStyleOutputFile$1(importedFile) ? importedFile : void 0
+			targetToRemember: importedFile && require_web.isRootStyleOutputFile(importedFile) ? importedFile : void 0
 		};
 	}
 	if (options.rememberedTarget) return {
@@ -1505,7 +1520,7 @@ function restoreFrameworkRootMiniProgramImportShellAssets(bundle, options) {
 	const writeTargets = /* @__PURE__ */ new Map();
 	let restored = 0;
 	for (const [sourceFile, targetFile] of options.targetByFile) {
-		if (!options.matchesCss(sourceFile) || !options.matchesCss(targetFile) || !isRootMiniProgramStyleOutputFile$1(sourceFile) || !isRootMiniProgramStyleOutputFile$1(targetFile) || require_source_candidate_scan_signature.normalizeOutputPathKey(sourceFile) === require_source_candidate_scan_signature.normalizeOutputPathKey(targetFile)) continue;
+		if (!options.matchesCss(sourceFile) || !options.matchesCss(targetFile) || !require_web.isRootStyleOutputFile(sourceFile) || !require_web.isRootStyleOutputFile(targetFile) || require_source_candidate_scan_signature.normalizeOutputPathKey(sourceFile) === require_source_candidate_scan_signature.normalizeOutputPathKey(targetFile)) continue;
 		const output = Object.entries(bundle).find(([bundleFile, candidate]) => candidate.type === "asset" && require_source_candidate_scan_signature.normalizeOutputPathKey(candidate.fileName || bundleFile) === require_source_candidate_scan_signature.normalizeOutputPathKey(sourceFile))?.[1];
 		if (output?.type !== "asset") continue;
 		const rawSource = output.source.toString();
@@ -1675,6 +1690,7 @@ function removeCoveredInjectedSourceAssets(bundle, targetFile, targetCss, record
 	if (removableRecords.length === 0) return 0;
 	const recordFileKeys = new Set(removableRecords.map((record) => require_source_candidate_scan_signature.normalizeOutputPathKey(record.file)));
 	const recordCss = new Set(removableRecords.map((record) => record.css.trim()));
+	const targetMatcher = (0, _weapp_tailwindcss_postcss.createCssRuleMatcher)(targetCss);
 	let removed = 0;
 	for (const [candidateFile, candidateOutput] of Object.entries(bundle)) {
 		if (candidateOutput.type !== "asset") continue;
@@ -1683,7 +1699,7 @@ function removeCoveredInjectedSourceAssets(bundle, targetFile, targetCss, record
 		const candidateIsRootWebStyle = require_web.isRootStyleOutputFile(candidateKey) && !require_web.isMiniProgramStyleOutputFile(candidateKey);
 		if (candidateIsRootWebStyle && !targetIsRootWebStyle) continue;
 		const candidateSource = require_web.readAssetSource(candidateOutput).trim();
-		if (!(recordFileKeys.has(candidateKey) || candidateSource.length > 0 && (recordCss.has(candidateSource) || (0, _weapp_tailwindcss_postcss.containsCssAfterMinify)(targetCss, candidateSource) || targetIsRootWebStyle && candidateIsRootWebStyle && !require_web.hasNonCommentCss((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(targetCss, candidateSource).trim())))) continue;
+		if (!(recordFileKeys.has(candidateKey) || candidateSource.length > 0 && (recordCss.has(candidateSource) || targetMatcher.contains(candidateSource) || targetIsRootWebStyle && candidateIsRootWebStyle && !require_web.hasNonCommentCss(targetMatcher.filter(candidateSource).trim())))) continue;
 		if (candidateIsRootWebStyle) delete bundle[candidateFile];
 		else require_web.clearAssetSource(candidateOutput);
 		options.debug?.("remove injected vite-processed source css asset: %s -> %s", candidateKey, targetFile);
@@ -2069,15 +2085,22 @@ function createTransformFilterSignature(options) {
 //#region src/bundlers/vite/generate-bundle/bundle-markup-candidates.ts
 async function collectBundleMarkupCandidates(options) {
 	const { extractSourceCandidates, previousCandidatesByFile, preserveMissingFiles, resolveSourceCandidateFile, rootDir, snapshot, transformFilter } = options;
-	const candidatesByFile = preserveMissingFiles ? new Map([...previousCandidatesByFile ?? []].map(([file, candidates]) => [file, new Set(candidates)])) : /* @__PURE__ */ new Map();
+	const candidatesByFile = preserveMissingFiles ? new Map([...previousCandidatesByFile ?? []].map(([file, entry]) => [file, {
+		...entry,
+		candidates: new Set(entry.candidates)
+	}])) : /* @__PURE__ */ new Map();
+	for (const file of snapshot.removedFiles) candidatesByFile.delete(file);
 	await Promise.all(snapshot.entries.map(async (entry) => {
 		if (!extractSourceCandidates || entry.type !== "html" || entry.output.type !== "asset" || shouldSkipViteAssetTransform(entry.output, entry.file, rootDir, transformFilter)) return;
 		const sourceFile = resolveSourceCandidateFile(entry.file) ?? node_path.default.resolve(rootDir, entry.file);
-		candidatesByFile.set(sourceFile, await extractSourceCandidates(sourceFile, entry.source));
+		candidatesByFile.set(entry.file, {
+			sourceFile,
+			candidates: await extractSourceCandidates(sourceFile, entry.source)
+		});
 	}));
 	const valuesForEntries = (entries, filterOptions = {}) => {
 		const values = /* @__PURE__ */ new Set();
-		for (const [file, candidates] of candidatesByFile) {
+		for (const { sourceFile: file, candidates } of candidatesByFile.values()) {
 			if (entries !== void 0 && !require_generator.isFileMatchedByTailwindSourceEntries(file, entries)) continue;
 			if (filterOptions.excludeEntries?.length && require_generator.isFileMatchedByTailwindSourceEntries(file, filterOptions.excludeEntries)) continue;
 			for (const candidate of candidates) values.add(candidate);
@@ -2574,7 +2597,11 @@ async function processViteCssBundleEntry(options) {
 	const { activeViteCssCacheFiles, addWatchFile, annotateCssSourceTrace, applyCssResultToBundle, applyViteCssCacheResult, applyViteCssTransformTaskResult, bundle, bundleFiles, cache, collectedBundlerGeneratedCssFiles, configuredTailwindV4CssSourceFileKeysForScope, configuredTailwindV4ExplicitCssEntryFileKeysForScope, context, createCandidateSignature, createCssSourceTraceCacheSignature, createCssTokenSourceMap, createCssTransformShareScopeKey, createInitialCssPipelineContext, createRuntimeAffectingSourceSignature, createScopedGeneratorCandidateSignature, createScopedGeneratorRuntime, createScopedGeneratorSourceTraceMap, createScopedSourceCandidateGetter, createScopedSourceCandidateSourceGetter, cssTaskFactories, currentSubpackageRoots, debug, defaultStyleOutputExtension, emitOrReplayCssAsset, envFlags, executeViteCssTransformTask, file, frameworkRootImportShellTargetByFile, generatorCandidatesChanged, generatorPlatform, generatorRuntime, getConfiguredTailwindV4CssSourceEntries, getCssHandlerOptions, getCssSource, getCssUserHandlerOptions, getLastCssResult, getOriginalCssLayerSource, getRememberedCssSources, getSfcSource, getSourceCandidateSources, getViteProcessedCssAssetResult, getViteProcessedCssAssetResults, hasExplicitConfiguredRootCssEntryForOutput, hasRuntimeAffectingChanges, hasViteProcessedCssResultForSource, isCssAssetProcessed, isCssImportOnlyBundleAsset, isMiniProgramStyleOutputFile, isRootMiniProgramStyleOutputFile, isSubpackageOutputFile, isTemporaryCssAssetFile, isViteProcessedCssAsset, isWebGeneratorTarget, lastCssResultByFile, lastCssSourceHashByFile, markCssAssetProcessed, measureElapsed, metrics, normalizeConfiguredTailwindV4CssEntryFileKey, normalizeGeneratorUserRawSource, normalizeMiniProgramGeneratorRawSource, normalizeOutputPathKey, normalizeRelativeCssConfigDirectives, normalizeViteCssCacheKey, onUpdate, opts, originalEntrySource, originalSource, outDir, processFiles, processViteCssCacheTask, recordCssAssetResult, recordViteProcessedCssAssetResult, rememberCssSource, rememberProcessCacheKey, removeCssCoveredByRootStyleBundleSources, resolveAssetSourceFile, resolveConfiguredCssEntryRootInjectionTarget, resolveConfiguredRootCssSourceStyle, resolveCssAssetIdentity, resolveCssAssetOutputPlan, resolveFrameworkRootImportShellPlan, resolveMatchedCssSourceOutputFile, resolveReplayCssOutputFile, resolveViteCssCompositionPlan, resolveViteCssLinkedImpactSignature, resolveViteCssPipelineOutputFile, resolveViteCssSourcePlan, resolveViteCssTransformCachePlan, resolveViteCssTransformDecisionPlan, rootDir, runtimeLinkedCssFiles, runtimeSignature, runtimeState, selectConfiguredRootCssSourceEntry, sharedCssResultCache, shouldExcludeSubpackageSourceCandidates, shouldGenerateWebCssByGenerator, shouldInjectCssIntoMainFromOutput, shouldKeepCurrentRootCssOutputForConfiguredSource, shouldKeepCurrentRootMiniProgramStyleOutputAsImportShell, shouldKeepRootMiniProgramStyleAsImportShell, shouldMoveRootMiniProgramStyleToImportShellOrigin, shouldPreserveAppCssExtension, shouldProcessTailwindGeneration, shouldSkipRawRememberedCssSource, shouldSkipRawSourceStyleAsset, shouldSkipViteAssetTransform, snapshot, sourceRoot, state, styleHandler, temporaryCssAssetSourceResolver, timeTask, transformFilter, transformRuntime, transformWebTargetCss, useIncrementalMode, usedConfiguredTailwindV4CssSourceFiles } = options;
 	metrics.css.total++;
 	const assetSourceFile = resolveAssetSourceFile(originalSource, file);
-	const rawSource = normalizeRelativeCssConfigDirectives(originalEntrySource, assetSourceFile, outDir, opts);
+	const rawSource = normalizeRelativeCssConfigDirectives(isWebGeneratorTarget ? originalEntrySource : require_v4_generation_core.normalizeMiniProgramImportShell(originalEntrySource, {
+		cssOnly: true,
+		outputFile: originalSource.fileName || file,
+		outputFiles: [...bundleFiles, ...lastCssResultByFile.keys()]
+	}), assetSourceFile, outDir, opts);
 	const currentRawSourceHasExplicitScanContext = rawSource.includes("@source") || rawSource.includes("@config");
 	const cssPipelineContext2 = {
 		...createInitialCssPipelineContext(file),
@@ -2633,7 +2660,10 @@ async function processViteCssBundleEntry(options) {
 		}))
 	});
 	let outputFile = cssAssetOutputPlan.outputFile;
-	const resolveMatchedOutputFileForCurrentAsset = cssAssetOutputPlan.resolveMatchedOutputFile;
+	const resolveMatchedOutputFileForCurrentAsset = (sourceFile) => {
+		const matched = cssAssetOutputPlan.resolveMatchedOutputFile(sourceFile);
+		return matched ? frameworkRootImportShellTargetByFile.get(matched) ?? matched : matched;
+	};
 	const resolvedFromConfiguredOriginalCssEntry = cssAssetOutputPlan.resolvedFromConfiguredOriginalCssEntry;
 	if (cssAssetOutputPlan.reusedRootImportShellTarget) debug("css reuse framework root import shell target: %s -> %s", rootImportShellOutputFile, outputFile);
 	activeViteCssCacheFiles.add(normalizeViteCssCacheKey(outputFile));
@@ -2956,7 +2986,7 @@ async function processViteCssBundleEntry(options) {
 function resolveCssBundleOutputFile(options) {
 	const { bundleFiles, defaultStyleOutputExtension, file, isWebGeneratorTarget, opts, pipelineContext, cssPipelineStrategy, shouldPreserveAppCssExtension } = options;
 	let outputFile = require_web.resolveViteCssOutputFile(file, opts, isWebGeneratorTarget, shouldPreserveAppCssExtension, defaultStyleOutputExtension, bundleFiles);
-	if (outputFile === file && isRootMiniProgramStyleOutputFile$1(file) && shouldMoveRootMiniProgramStyleToImportShellOrigin(cssPipelineStrategy?.shouldMoveRootMiniProgramStyleToImportShellOrigin?.({
+	if (outputFile === file && require_source_candidate_scan_signature.normalizeOutputPathKey(options.assetOutputFile ?? file) === require_source_candidate_scan_signature.normalizeOutputPathKey(file) && isRootMiniProgramStyleOutputFile$1(file) && shouldMoveRootMiniProgramStyleToImportShellOrigin(cssPipelineStrategy?.shouldMoveRootMiniProgramStyleToImportShellOrigin?.({
 		...pipelineContext,
 		file
 	}))) outputFile = createRootMiniProgramOriginStyleOutputFile(file);
@@ -2993,7 +3023,10 @@ function createMatchedCssSourceOutputResolver(options) {
 	};
 }
 function resolveCssAssetOutputPlan(options) {
-	let outputFile = resolveCssBundleOutputFile(options);
+	let outputFile = resolveCssBundleOutputFile({
+		...options,
+		assetOutputFile: options.rootImportShellOutputFile
+	});
 	const reusedRootImportShellTarget = Boolean(options.rootImportShellTarget && !options.isWebGeneratorTarget && (options.opts.cssMatcher(options.rootImportShellOutputFile) || options.opts.cssMatcher(options.file)) && options.shouldReuseRootImportShell());
 	if (reusedRootImportShellTarget && options.rootImportShellTarget) outputFile = options.rootImportShellTarget;
 	const resolveMatchedOutputFile = createMatchedCssSourceOutputResolver({
@@ -3505,21 +3538,22 @@ function applyViteCssTransformTaskResult(options) {
 }
 //#endregion
 //#region src/bundlers/vite/generate-bundle/css-transform-task.ts
-function resolveGeneratorUserRawSource(options) {
-	const bundleUserRawSource = options.vitePipelineCssAsset && !require_v4_generation_core.hasBundlerGeneratedCssMarker(options.rawSource) && require_web.normalizeCssSourceForCompare(options.rawSource) !== require_web.normalizeCssSourceForCompare(options.generatorRawSource) ? options.normalizeMiniProgramGeneratorRawSource(options.normalizeGeneratorUserRawSource(options.rawSource, options.generatorSourceFile, options.assetSourceFile), options.outputFile) : void 0;
-	return [options.generatorUserLayerRawSource, bundleUserRawSource].filter((source) => typeof source === "string" && source.trim().length > 0).join("\n");
+function resolveBundleUserRawSource(options) {
+	return options.vitePipelineCssAsset && !require_v4_generation_core.hasBundlerGeneratedCssMarker(options.rawSource) && require_web.normalizeCssSourceForCompare(options.rawSource) !== require_web.normalizeCssSourceForCompare(options.generatorRawSource) ? options.normalizeMiniProgramGeneratorRawSource(options.normalizeGeneratorUserRawSource(options.rawSource, options.generatorSourceFile, options.assetSourceFile), options.outputFile) : void 0;
 }
 async function executeViteCssTransformTask(options) {
 	await options.runtimeState.readyPromise;
 	const previousGeneratorCss = options.previousCss && !options.isWebGeneratorTarget ? options.normalizeMiniProgramGeneratorRawSource(options.previousCss, options.outputFile) : options.previousCss;
 	if (require_web.hasTailwindGenerationSource(options.generatorRawSource) || !options.isWebGeneratorTarget && require_v4_generation_core.hasBundlerGeneratedCssMarker(options.rawSource)) {
-		const generatorUserRawSource = resolveGeneratorUserRawSource(options);
+		const bundleUserRawSource = resolveBundleUserRawSource(options);
+		const generatorUserRawSource = [options.generatorUserLayerRawSource, options.isWebGeneratorTarget ? bundleUserRawSource : void 0].filter((source) => typeof source === "string" && source.trim().length > 0).join("\n");
 		const generated = await (options.generateCss ?? require_v4_generation_core.generateTailwindV4Css)({
 			cssHandlerOptions: options.generatorCssHandlerOptions,
 			cssStage: "framework-processed",
 			cssUserHandlerOptions: options.cssUserHandlerOptions,
 			debug: options.debug,
 			file: options.generatorSourceFile,
+			frameworkProcessedUserCss: options.isWebGeneratorTarget ? void 0 : bundleUserRawSource,
 			generatorPlatform: options.generatorPlatform,
 			getSourceCandidatesForEntries: options.getSourceCandidatesForEntries,
 			opts: options.opts,
@@ -4352,6 +4386,61 @@ function isUniAppXNativeAppOutDir(outDir) {
 	return typeof outDir === "string" && /(?:^|[/\\-])(?:\.uvue[/\\])?app-(?:android|ios|harmony)(?:[/\\-]|$)/.test(outDir);
 }
 //#endregion
+//#region src/uni-app-x/border-preflight.ts
+const BORDER_PREFLIGHT_CLASS = "weapp-tw-border";
+/** 框架回放组件样式后恢复基础规则的顺序，确保作者 class 可以覆盖重置。 */
+function hoistUniAppXBorderPreflight(css) {
+	if (!css.includes("weapp-tw-border")) return css;
+	const root = _weapp_tailwindcss_postcss.postcss.parse(css);
+	const resets = root.nodes.filter((node) => node.type === "rule" && node.selector === `.weapp-tw-border`);
+	const anchor = root.nodes.find((node) => !resets.includes(node) && node.type !== "comment" && !(node.type === "atrule" && ["charset", "import"].includes(node.name)));
+	if (!anchor || resets.length === 0) return css;
+	for (const reset of resets) {
+		reset.remove();
+		root.insertBefore(anchor, reset);
+	}
+	return root.toString();
+}
+/** uni-app x 移除通配符 preflight 后，用独立基础类承载用户配置的边框默认值。 */
+function createUniAppXBorderPreflight(options) {
+	const declarations = (0, _weapp_tailwindcss_postcss.createInjectPreflight)(options)().filter(({ prop }) => prop === "border" || prop.startsWith("border-"));
+	if (declarations.length === 0) return;
+	const rule = _weapp_tailwindcss_postcss.postcss.rule({ selector: `.${BORDER_PREFLIGHT_CLASS}` });
+	for (const declaration of declarations) rule.append(_weapp_tailwindcss_postcss.postcss.decl(declaration));
+	return rule.toString();
+}
+function resolveUniAppXBorderPreflightOptions(options, isWeb) {
+	const borderPreflight = isWeb ? void 0 : createUniAppXBorderPreflight(options.cssPreflight);
+	return borderPreflight ? {
+		borderPreflight,
+		borderPreflightRange: options.cssPreflightRange
+	} : {};
+}
+function shouldInjectBorderPreflight(node, range) {
+	return range === "all" ? ![
+		"template",
+		"slot",
+		"block"
+	].includes(node.tag) : node.tag === "view" || node.tag === "text";
+}
+/** 在既有 class 转换完成后插入基础类，保持 utility 与动态绑定的原始顺序。 */
+function injectBorderPreflightClass(ms, node, offset) {
+	const attribute = node.props.find((prop) => prop.type === _vue_compiler_dom.NodeTypes.ATTRIBUTE && prop.name === "class");
+	if (attribute?.type === _vue_compiler_dom.NodeTypes.ATTRIBUTE) {
+		if (attribute.value) {
+			if (attribute.value.content.split(/\s+/).includes("weapp-tw-border")) return;
+			const start = offset + attribute.value.loc.start.offset;
+			if (/^["']/.test(attribute.value.loc.source)) ms.prependRight(start + 1, `${BORDER_PREFLIGHT_CLASS} `);
+			else {
+				ms.prependRight(start, `"${BORDER_PREFLIGHT_CLASS} `);
+				ms.appendLeft(offset + attribute.value.loc.end.offset, "\"");
+			}
+		} else ms.appendLeft(offset + attribute.loc.end.offset, `="${BORDER_PREFLIGHT_CLASS}"`);
+		return;
+	}
+	ms.appendLeft(offset + node.loc.start.offset + node.tag.length + 1, ` class="${BORDER_PREFLIGHT_CLASS}"`);
+}
+//#endregion
 //#region src/uni-app-x/style-isolation.ts
 const manifestCache = /* @__PURE__ */ new Map();
 function resolveUniAppXStyleIsolationEnabled(root) {
@@ -4566,9 +4655,48 @@ function resolvePreprocessorTransform(code, id, lang, options) {
 //#endregion
 //#region src/uni-app-x/vite/style-source.ts
 const VITE_CSS_HMR_MODULE_RE = /\b(?:const\s+__vite__css\s*=|__vite__updateStyle\s*\()/;
-function resolveUniAppXStyleSource(code, query) {
-	if (!query.vue || query.type !== "style") return { code };
+function createUniAppXSfcStyleSources() {
+	const authoredByFile = /* @__PURE__ */ new Map();
+	const generatedByFile = /* @__PURE__ */ new Map();
+	return {
+		rememberSource(id, source) {
+			authoredByFile.set((0, _weapp_tailwindcss_shared.cleanUrl)(id), require_web.extractSfcStyleBlocks(source));
+		},
+		rememberGenerated(id, source) {
+			const file = (0, _weapp_tailwindcss_shared.cleanUrl)(id);
+			const authoredCount = authoredByFile.get(file)?.length ?? 0;
+			const generated = /* @__PURE__ */ new Map();
+			for (const [index, style] of require_web.extractSfcStyleBlocks(source).entries()) if (index >= authoredCount) generated.set(index, style.source);
+			generatedByFile.set(file, generated);
+		},
+		getGenerated(id, index) {
+			return generatedByFile.get((0, _weapp_tailwindcss_shared.cleanUrl)(id))?.get(index);
+		},
+		hasGenerated(id) {
+			return Boolean(generatedByFile.get((0, _weapp_tailwindcss_shared.cleanUrl)(id))?.size);
+		},
+		load(id, index) {
+			const file = (0, _weapp_tailwindcss_shared.cleanUrl)(id);
+			const style = authoredByFile.get(file)?.[index];
+			if (!style) {
+				const generated = generatedByFile.get(file)?.get(index);
+				return generated === void 0 ? void 0 : {
+					code: generated,
+					map: null
+				};
+			}
+			const normalized = (0, _weapp_tailwindcss_postcss.normalizeUniAppXImportantApplyForSass)(style.source);
+			return normalized === style.source ? void 0 : {
+				code: normalized,
+				map: null
+			};
+		}
+	};
+}
+function resolveUniAppXStyleSource(code, query, generatedSource) {
 	if (VITE_CSS_HMR_MODULE_RE.test(code)) return { skip: true };
+	if (!query.vue || query.type !== "style") return { code };
+	if (generatedSource !== void 0) return { code: generatedSource };
 	const styleBlocks = require_web.extractSfcStyleBlocks(code);
 	if (styleBlocks.length === 0) return { code };
 	const style = styleBlocks[query.index ?? 0];
@@ -4653,7 +4781,7 @@ function createUniAppXAssetTask(file, originalSource, outDir, options) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-DUPOPZ54.cjs")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-DAg85t9Z.cjs")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const UVUE_NVUE_QUERY_RE = /\.(?:uvue|nvue)(?:\?.*)?$/;
@@ -4665,7 +4793,7 @@ function createUniAppXPlugins(options) {
 	const isIosPlatform = providedIosPlatform ?? utsPlatform.isAppIos;
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const nativeLocalStyleModuleIds = /* @__PURE__ */ new Set();
-	const knownSfcSources = /* @__PURE__ */ new Map();
+	const sfcStyleSources = createUniAppXSfcStyleSources();
 	const pendingSfcTransforms = /* @__PURE__ */ new Map();
 	const webLocalStyle = createUniAppXWebLocalStyleBridge(isWebGeneratorTarget, hmrCssModuleVersions);
 	let componentLocalStyleEnabled;
@@ -4784,14 +4912,8 @@ function createUniAppXPlugins(options) {
 			async handler(id) {
 				const { filename, query } = require_web.parseVueRequest(id);
 				if (!query.vue || query.type !== "style" || !UVUE_NVUE_RE.test(filename)) return;
-				const source = knownSfcSources.get(filename);
-				const style = source ? require_web.extractSfcStyleBlocks(source)[query.index ?? 0] : void 0;
-				if (!style) return;
-				const normalized = (0, _weapp_tailwindcss_postcss.normalizeUniAppXImportantApplyForSass)(style.source);
-				return normalized === style.source ? void 0 : {
-					code: normalized,
-					map: null
-				};
+				await pendingSfcTransforms.get((0, _weapp_tailwindcss_shared.cleanUrl)(filename));
+				return sfcStyleSources.load(filename, query.index ?? 0);
 			}
 		},
 		async transform(code, id) {
@@ -4799,9 +4921,9 @@ function createUniAppXPlugins(options) {
 			await runtimeState.readyPromise;
 			const { filename, query } = require_web.parseVueRequest(id);
 			if (query.vue && query.type === "style") await pendingSfcTransforms.get((0, _weapp_tailwindcss_shared.cleanUrl)(filename));
-			const resolvedSource = resolveUniAppXStyleSource(code, query);
+			const resolvedSource = resolveUniAppXStyleSource(code, query, sfcStyleSources.getGenerated(filename, query.index ?? 0));
 			if (resolvedSource.skip) return;
-			const styleCode = query.vue && query.type === "style" ? webLocalStyle.appendToStyle(resolvedSource.code, id) : resolvedSource.code;
+			const styleCode = query.vue && query.type === "style" && !sfcStyleSources.hasGenerated(filename) ? webLocalStyle.appendToStyle(resolvedSource.code, id) : resolvedSource.code;
 			const preprocessorCode = query.vue && query.type === "style" ? (0, _weapp_tailwindcss_postcss.normalizeUniAppXImportantApplyForSass)(styleCode) : styleCode;
 			const preprocessor = resolvePreprocessorTransform(preprocessorCode, id, query.lang, {
 				isIosPlatform,
@@ -4815,7 +4937,7 @@ function createUniAppXPlugins(options) {
 		}
 	}];
 	async function transformSfc(code, id, context) {
-		knownSfcSources.set((0, _weapp_tailwindcss_shared.cleanUrl)(id), code);
+		sfcStyleSources.rememberSource(id, code);
 		if (isWebGeneratorTarget()) for (const style of require_web.extractSfcStyleBlocks(code)) webCssEntryDiagnostics?.observeSourceImports(style.source, id);
 		if (isNativeAppBuildTarget(id)) {
 			nativeLocalStyleModuleIds.add(id);
@@ -4838,6 +4960,7 @@ function createUniAppXPlugins(options) {
 			...enableComponentLocalStyle ? { enableComponentLocalStyle } : {},
 			...enablePageLocalStyle ? { enablePageLocalStyle } : {},
 			native: true,
+			...resolveUniAppXBorderPreflightOptions(options, isWebGeneratorTarget()),
 			pageMatcher: resolvedUniAppXOptions.componentLocalStyles.pageMatcher,
 			...isWebGeneratorTarget() && customAttributesEntities.length > 0 ? { webCustomAttributeDeep: true } : {},
 			...isWebGeneratorTarget() ? { onWebLocalStyleRules: (rules) => {
@@ -4846,6 +4969,7 @@ function createUniAppXPlugins(options) {
 			} } : {}
 		});
 		const result = Object.keys(transformOptions).length > 0 ? transformUVue(code, id, jsHandler, currentRuntimeSet, transformOptions) : transformUVue(code, id, jsHandler, currentRuntimeSet);
+		sfcStyleSources.rememberGenerated(id, isWebGeneratorTarget() ? result?.code ?? "" : "");
 		if (!result?.code) return result;
 		harmonyApply.rememberSource(result.code, id);
 		const expandedCode = await harmonyApply.expandStyles(result.code, id, context);
@@ -4874,7 +4998,8 @@ function createUniAppXPlugins(options) {
 			order: "pre",
 			async handler(code, id) {
 				if (!isEnabled()) return;
-				if (!UVUE_NVUE_QUERY_RE.test(id)) return;
+				const { query } = require_web.parseVueRequest(id);
+				if (!UVUE_NVUE_QUERY_RE.test(id) || query.vue && query.type === "style") return;
 				return runTransformSfc(code, id, this);
 			}
 		},
@@ -4884,6 +5009,7 @@ function createUniAppXPlugins(options) {
 				if (!isEnabled() || getResolvedConfig()?.command !== "serve") return;
 				if (!UVUE_NVUE_RE.test(ctx.file) && !require_web.isCSSRequest(ctx.file)) return;
 				if (isWebGeneratorTarget() && UVUE_NVUE_RE.test(ctx.file) && typeof ctx.read === "function") {
+					hmrCssModuleVersions?.clear();
 					const source = await ctx.read();
 					if (hasUniAppXImportantApply(source, _weapp_tailwindcss_postcss.normalizeUniAppXImportantApplyForSass)) {
 						ctx.server.ws.send({
@@ -5153,8 +5279,13 @@ async function processRememberedCssReplay(options) {
 		const rememberedKeys = replayableRememberedGroup.map((item) => item.key);
 		const rememberedCssSource = mergeRememberedCssSources(replayableRememberedGroup.map((item) => item.remembered), outputFile);
 		if (!rememberedCssSource) continue;
-		const { rawSource, sourceFile } = rememberedCssSource;
-		const generatorRawSource = isWebGeneratorTarget ? rawSource : require_v4_generation_core.normalizeMiniProgramGeneratorCssSource(rawSource, outputFile);
+		const { sourceFile } = rememberedCssSource;
+		const rawSource = isWebGeneratorTarget ? rememberedCssSource.rawSource : require_v4_generation_core.normalizeMiniProgramImportShell(rememberedCssSource.rawSource, {
+			cssOnly: true,
+			outputFile,
+			outputFiles: [...bundleFiles, ...lastCssResultByFile.keys()]
+		});
+		const generatorRawSource = isWebGeneratorTarget ? rawSource : require_v4_generation_core.normalizeMiniProgramGeneratorCssSource(rawSource, outputFile, [...bundleFiles, ...lastCssResultByFile.keys()]);
 		activeViteCssCacheFiles.add(normalizeViteCssCacheKey(outputFile));
 		activeViteCssCacheFiles.add(normalizeViteCssCacheKey(sourceFile));
 		const outputCssHandlerOptions = getCssHandlerOptions(rememberedOutputFile);
@@ -5235,7 +5366,7 @@ async function processRememberedCssReplay(options) {
 				if (shouldEmitRememberedReplayCssAsset) emitRememberedCssAsset(css);
 				metrics.css.elapsed += measureElapsed(start);
 				metrics.css.transformed++;
-				onUpdate(outputFile, rawSource, css);
+				onUpdate(outputFile, rememberedCssSource.rawSource, css);
 				debug("css replay preserve local import shell: %s", outputFile);
 			}));
 			continue;
@@ -5275,7 +5406,7 @@ async function processRememberedCssReplay(options) {
 			if (shouldEmitRememberedReplayCssAsset) emitRememberedCssAsset(css);
 			metrics.css.elapsed += measureElapsed(start);
 			metrics.css.transformed++;
-			onUpdate(outputFile, rawSource, css);
+			onUpdate(outputFile, rememberedCssSource.rawSource, css);
 			debug("css replay handle: %s", outputFile);
 		}));
 	}
@@ -5359,7 +5490,7 @@ function createConfiguredCssRootResolvers(options) {
 		if (matchedOriginalEntry && outputFile.replace(/[?#].*$/, "").endsWith(".css")) return matchedOriginalEntry;
 		const shouldRequireExplicitEntry = !options.cssPipelineContext.currentGeneratorBranch.isWeb && options.opts.cssMatcher(outputFile) && isRootStyleOutputFile(outputFile);
 		const generationEntries = entries.filter((entry) => require_web.hasTailwindGenerationSource(entry.source) && (!shouldRequireExplicitEntry || explicitFileKeys.has(normalizeEntryFile(entry.file))));
-		const matchedOutputEntries = generationEntries.filter((entry) => require_source_candidate_scan_signature.normalizeOutputPathKey(resolveEntryOutputFile(entry.file).replace(/[?#].*$/, "")) === require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile.replace(/[?#].*$/, "")));
+		const matchedOutputEntries = generationEntries.filter((entry) => require_source_candidate_scan_signature.normalizeOutputPathKey(resolveEntryOutputFile(entry.file).replace(/[?#].*$/, "")) === require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile.replace(/[?#].*$/, "")) || (originalFileNames?.length ?? 0) === 0 && require_source_candidate_scan_signature.normalizeOutputPathKey(options.rootImportShellTargets?.get(resolveEntryOutputFile(entry.file)) ?? "") === require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile.replace(/[?#].*$/, "")));
 		if (matchedOutputEntries.length === 1) return matchedOutputEntries[0];
 		if (!shouldSelectRootOutput(outputFile)) return;
 		if (generationEntries.length <= 1) return generationEntries[0];
@@ -5423,7 +5554,7 @@ function createConfiguredCssRootResolvers(options) {
 }
 //#endregion
 //#region src/bundlers/vite/generate-bundle/runtime-linked-css.ts
-const MINI_PROGRAM_TEMPLATE_OUTPUT_EXT_RE = /\.(?:wxml|axml|jxml|ksml|ttml|qml|tyml|xhsml|swan)$/i;
+const MINI_PROGRAM_TEMPLATE_OUTPUT_EXT_RE = /\.(?:wxml|axml|jxml|ksml|ttml|qml|qxml|tyml|xhsml|swan)$/i;
 const JS_STYLE_IMPORT_RE = /\b(?:import|require)\s*(?:\(\s*)?["']([^"']+\.(?:css|less|sass|scss|styl|stylus|pcss|postcss))(?:[?#][^"']*)?["']/g;
 function addSiblingCssFile(files, file, extensionByStem, fallbackExtension) {
 	const templateMatch = file.replace(/[?#].*$/, "").match(MINI_PROGRAM_TEMPLATE_OUTPUT_EXT_RE);
@@ -5904,7 +6035,7 @@ function createGenerateBundleHook$1(context) {
 		const outDir = resolvedConfig?.build?.outDir ? node_path.default.resolve(rootDir, resolvedConfig.build.outDir) : rootDir;
 		const defaultStyleOutputExtension = require_web.resolveMiniProgramStyleOutputExtension({ files: Object.keys(bundle) });
 		const normalizeMiniProgramGeneratorRawSource = (source, outputFile) => {
-			return isWebGeneratorTarget ? source : require_v4_generation_core.normalizeMiniProgramGeneratorCssSource(source, outputFile);
+			return isWebGeneratorTarget ? source : require_v4_generation_core.normalizeMiniProgramGeneratorCssSource(source, outputFile, [...Object.keys(bundle), ...lastCssResultByFile.keys()]);
 		};
 		await runtimeState.readyPromise;
 		debug("start");
@@ -5964,6 +6095,7 @@ function createGenerateBundleHook$1(context) {
 			currentSubpackageRoots,
 			defaultStyleOutputExtension,
 			entries: configuredTailwindV4CssSourceEntriesForScope,
+			rootImportShellTargets: frameworkRootImportShellTargetByFile,
 			explicitCssEntryFiles: configuredTailwindV4ExplicitCssEntryFiles,
 			isWebGeneratorTarget,
 			opts,
@@ -6528,6 +6660,55 @@ function createGenerateBundleHook(context) {
 	};
 }
 //#endregion
+//#region src/bundlers/vite/generate-bundle/entry-style-graph.ts
+function linkEntryChunkStyles(bundle, options) {
+	const assets = new Map(Object.entries(bundle).flatMap(([key, output]) => output.type === "asset" ? [[require_source_candidate_scan_signature.normalizeOutputPathKey(output.fileName || key), output]] : []));
+	const imports = /* @__PURE__ */ new Map();
+	for (const [file, asset] of assets) {
+		if (!options.matchesCss(file)) continue;
+		const targets = /* @__PURE__ */ new Set();
+		_weapp_tailwindcss_postcss.postcss.parse(asset.source.toString()).walkAtRules("import", (rule) => {
+			const request = require_generator.parseCssImportSpecifier(rule.params)?.specifier;
+			if (request && !/^(?:[a-z][a-z\d+.-]*:|\/\/|\/)/i.test(request)) {
+				const target = node_path.default.posix.normalize(node_path.default.posix.join(node_path.default.posix.dirname(file), request));
+				if (assets.has(target)) targets.add(target);
+			}
+		});
+		imports.set(file, targets);
+	}
+	const reaches = (from, target, visited = /* @__PURE__ */ new Set()) => {
+		if (from === target) return true;
+		if (visited.has(from)) return false;
+		visited.add(from);
+		return [...imports.get(from) ?? []].some((next) => reaches(next, target, visited));
+	};
+	for (const chunk of Object.values(bundle)) {
+		if (chunk.type !== "chunk" || !chunk.isEntry) continue;
+		const entry = node_path.default.posix.parse(require_source_candidate_scan_signature.normalizeOutputPathKey(chunk.fileName));
+		const roots = [...assets].filter(([file]) => {
+			const style = node_path.default.posix.parse(file);
+			return options.matchesCss(file) && style.dir === entry.dir && style.name === entry.name;
+		});
+		if (roots.length !== 1) continue;
+		const [file, asset] = roots[0];
+		const original = asset.source.toString();
+		const requests = [];
+		for (const id of Object.keys(chunk.modules ?? {})) {
+			const output = options.resolveOutputFile(id);
+			const target = output && require_source_candidate_scan_signature.normalizeOutputPathKey(output);
+			if (!target || !imports.has(target) || reaches(file, target) || reaches(target, file)) continue;
+			imports.get(file).add(target);
+			const relative = node_path.default.posix.relative(node_path.default.posix.dirname(file), target);
+			requests.push(`@import ${require_generator.quoteCssImportSpecifier(relative.startsWith(".") ? relative : `./${relative}`)};\n`);
+		}
+		if (requests.length > 0) {
+			const next = requests.join("") + original;
+			asset.source = next;
+			options.onUpdate?.(file, original, next);
+		}
+	}
+}
+//#endregion
 //#region src/bundlers/vite/css-finalizer/plugin.ts
 function createViteCssFinalizerOutputPlugin(context) {
 	return {
@@ -6614,6 +6795,17 @@ function createViteCssFinalizerOutputPlugin(context) {
 					finalCssAssetFiles.add(file);
 					opts.onUpdate(file, original, generated);
 				};
+				const linkEntryStyles = () => {
+					if (isWebGeneratorTarget) return;
+					linkEntryChunkStyles(bundle, {
+						matchesCss: opts.cssMatcher,
+						onUpdate: trackFinalCssAssetUpdate,
+						resolveOutputFile: (id) => {
+							if (!opts.cssMatcher(id) || id.includes("?")) return;
+							return require_web.resolveViteCssPipelineOutputFile(id, opts, rootDir, false, false, sourceRoot, require_web.resolveMiniProgramStyleOutputExtension({ files: Object.keys(bundle) }), Object.keys(bundle));
+						}
+					});
+				};
 				restoreFrameworkRootMiniProgramImportShellAssets(bundle, {
 					debug,
 					isWebGeneratorTarget,
@@ -6720,6 +6912,7 @@ function createViteCssFinalizerOutputPlugin(context) {
 					await injectHarmonyBundleStyles(getRecordedGeneratorCandidates?.() ?? getSourceCandidates?.() ?? await ensureRuntimeClassSet());
 					collectViteProcessedCssAssets();
 					injectViteProcessedCssIntoMainCss();
+					linkEntryStyles();
 					normalizeRootMiniProgramImportShellAssets(bundle, {
 						cssMatcher: opts.cssMatcher,
 						debug,
@@ -6844,6 +7037,7 @@ function createViteCssFinalizerOutputPlugin(context) {
 				await injectHarmonyBundleStyles();
 				collectViteProcessedCssAssets();
 				injectViteProcessedCssIntoMainCss();
+				linkEntryStyles();
 				normalizeRootMiniProgramImportShellAssets(bundle, {
 					cssMatcher: opts.cssMatcher,
 					debug,
@@ -6882,7 +7076,7 @@ function createViteServeJsTransformPlugin(options) {
 			if (!options.shouldTransform() || !isViteServeJsRequest(id, options.getCommand())) return;
 			const handlerOptions = options.createHandlerOptions(id);
 			if (require_compiler.shouldSkipJsTransform(code, handlerOptions)) return;
-			const runtime = await options.transformRuntime();
+			const runtime = await options.transformRuntime(id, code);
 			const { code: transformed } = await options.jsHandler(code, runtime, handlerOptions);
 			if (transformed === code) return;
 			return {
@@ -7020,9 +7214,9 @@ function createConfiguredCssEntryDiagnostics(options) {
 //#endregion
 //#region src/bundlers/vite/shared/framework-module-candidates.ts
 function createFrameworkModuleCandidateRegistrar(options) {
-	return async (id, source) => {
+	return async (id, source, extension) => {
 		await options.runtimeState.readyPromise;
-		const candidates = await options.sourceCandidateCollector.syncModuleSource(id, source);
+		const candidates = await options.sourceCandidateCollector.syncModuleSource(id, source, extension);
 		options.invalidateRecordedGeneratorCandidates();
 		options.cacheCurrent();
 		const cssHandlerOptions = options.getCssHandlerOptions(id);
@@ -7761,7 +7955,7 @@ ${previousTracedCss}`;
 			previousCss: previousGeneratorCss,
 			previousClassSet: pendingHmrChange && !forceFullHmrCssRegeneration ? generatedClassSetByFile.get(fileKey) : void 0,
 			deferEmptyScopedCssSource: shouldDeferEmptyScopedCssSource,
-			deferCssAdaptation: !transient && !currentGeneratorBranch.isWeb && !shouldAdaptFrameworkWatchCss(),
+			deferCssAdaptation: resolvedConfig?.command === "build" && !transient && !currentGeneratorBranch.isWeb && !shouldAdaptFrameworkWatchCss(),
 			disableSourceScan: hookContext?.disableSourceScan === true,
 			cssStage: hookContext?.cssStage,
 			restoreLocalCssImports: !currentGeneratorBranch.isWeb
@@ -7954,6 +8148,8 @@ ${tracedCss}`;
 		await sourceScanSession.sync();
 	};
 	const extraPlugins = capability.frameworkExtras ? frameworkBranch.createExtraPlugins?.({
+		cssPreflight: opts.cssPreflight,
+		cssPreflightRange: opts.cssPreflightRange,
 		customAttributesEntities,
 		disabledDefaultTemplateHandler,
 		ensureRuntimeClassSet,
@@ -8058,7 +8254,7 @@ ${tracedCss}`;
 		getCommand: () => resolvedConfig?.command,
 		jsHandler,
 		shouldTransform: () => shouldOwnTailwindGeneration && (frameworkCssPipelineStrategy?.shouldTransformServeJs?.(createCssPipelineContext()) ?? !resolveCurrentGeneratorBranch().isWeb),
-		transformRuntime: ensureRuntimeClassSet
+		transformRuntime: (id, code) => registerModuleGraphCandidates(id, code, "js")
 	}) : void 0;
 	const plugins = [
 		...sourceAndRewritePlugins,
@@ -8107,7 +8303,7 @@ function wrapPluginCloseBundle(hook, dispose) {
 		try {
 			return await hook.apply(this, args);
 		} finally {
-			dispose();
+			dispose.call(this);
 		}
 	};
 	if (hook && typeof hook === "object" && "handler" in hook && typeof hook.handler === "function") return {
@@ -8116,7 +8312,7 @@ function wrapPluginCloseBundle(hook, dispose) {
 			try {
 				return await hook.handler.apply(this, args);
 			} finally {
-				dispose();
+				dispose.call(this);
 			}
 		}
 	};
@@ -8140,7 +8336,12 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		})
 	}));
 	const cleanupPlugin = wrappedPlugins.at(-1);
-	if (cleanupPlugin) cleanupPlugin.closeBundle = wrapPluginCloseBundle(cleanupPlugin.closeBundle, relationOwner.dispose);
+	if (cleanupPlugin) {
+		cleanupPlugin.closeBundle = wrapPluginCloseBundle(cleanupPlugin.closeBundle, function() {
+			if (!this.meta?.watchMode) relationOwner.dispose();
+		});
+		cleanupPlugin.closeWatcher = wrapPluginCloseBundle(cleanupPlugin.closeWatcher, relationOwner.dispose);
+	}
 	return wrappedPlugins;
 }
 //#endregion
@@ -8179,11 +8380,13 @@ function createTaroAlipayBrowserslistAssetPlugin() {
 	};
 }
 function createTaroVitePlugins(options = {}) {
-	return [createTaroAlipayBrowserslistAssetPlugin(), ...createViteFrameworkPlugins(options, {
+	const plugins = createViteFrameworkPlugins(options, {
 		frameworkName: "taro",
 		cssPipelineStrategy: taroCssPipelineStrategy,
 		styleInjectorDelegate: require_scoped_generator.viteStyleInjectorDelegates.taro
-	})];
+	});
+	if (!plugins) return;
+	return [createTaroAlipayBrowserslistAssetPlugin(), ...plugins];
 }
 //#endregion
 //#region src/bundlers/vite/frameworks/uni-app/index.ts
@@ -8378,7 +8581,8 @@ const uniAppXCssPipelineStrategy = {
 	},
 	transformGeneratedCss(css, context) {
 		const webCss = context.shouldApplyWebCssCompat ? context.defaultWebCssCompat(css) : css;
-		return withUniAppXWebPreflightReset(context.removeScopedPreflight(webCss), context.currentGeneratorBranch.isWeb);
+		const output = withUniAppXWebPreflightReset(context.removeScopedPreflight(webCss), context.currentGeneratorBranch.isWeb);
+		return context.currentGeneratorBranch.isWeb ? output : hoistUniAppXBorderPreflight(output);
 	}
 };
 function createUniAppXVitePlugins(options = {}) {
@@ -8392,6 +8596,8 @@ function createUniAppXVitePlugins(options = {}) {
 		sourceCandidatesBeforeExtraPlugin: (plugin) => plugin.name === "weapp-tailwindcss:uni-app-x:nvue",
 		createExtraPlugins: (context) => createUniAppXPlugins({
 			appType: "uni-app-x",
+			cssPreflight: context.cssPreflight,
+			cssPreflightRange: context.cssPreflightRange,
 			customAttributesEntities: context.customAttributesEntities,
 			disabledDefaultTemplateHandler: context.disabledDefaultTemplateHandler,
 			ensureRuntimeClassSet: context.ensureRuntimeClassSet,
@@ -8676,6 +8882,18 @@ Object.defineProperty(exports, "WeappTailwindcss", {
 		return WeappTailwindcss;
 	}
 });
+Object.defineProperty(exports, "injectBorderPreflightClass", {
+	enumerable: true,
+	get: function() {
+		return injectBorderPreflightClass;
+	}
+});
+Object.defineProperty(exports, "isUniAppXStyleSourceEmpty", {
+	enumerable: true,
+	get: function() {
+		return isUniAppXStyleSourceEmpty;
+	}
+});
 Object.defineProperty(exports, "shouldEnableComponentLocalStyle", {
 	enumerable: true,
 	get: function() {
@@ -8688,3 +8906,9 @@ Object.defineProperty(exports, "shouldEnablePageLocalStyle", {
 		return shouldEnablePageLocalStyle;
 	}
 });
+Object.defineProperty(exports, "shouldInjectBorderPreflight", {
+	enumerable: true,
+	get: function() {
+		return shouldInjectBorderPreflight;
+	}
+});