weapp-tailwindcss 5.0.0-next.25 → 5.0.0-next.26

package/dist/presets/index.d.ts

@@ -1,3 +1,4 @@
+export * from './hbuilderx';
 export * from './shared';
 export * from './uni-app';
 export * from './uni-app-x';

package/dist/presets.js

@@ -1,9 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+const require_v3_engine = require("./v3-engine-CGsbY81C.js");
 const require_utils = require("./utils-CSA174-I.js");
-const require_tailwindcss = require("./tailwindcss-nQetCaPp.js");
+const require_tailwindcss = require("./tailwindcss-Cm93idme.js");
 require("./logger-Cdzl3p8j.js");
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let local_pkg = require("local-pkg");
@@ -42,6 +44,11 @@ function createBasePreset(options = {}) {
 	return (0, _weapp_tailwindcss_shared.defuOverrideArray)((0, _weapp_tailwindcss_shared.defuOverrideArray)(userOptions, rawOptions ?? {}), preset);
 }
 //#endregion
+//#region src/presets/hbuilderx.ts
+function hbuilderx(options = {}) {
+	return createBasePreset({ ...options });
+}
+//#endregion
 //#region src/presets/uni-app.ts
 function uniApp(options = {}) {
 	const uniPlatform = node_process.default.env["UNI_PLATFORM"];
@@ -61,7 +68,11 @@ function resolveTailwindResolveOptions(base, resolve) {
 	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
 	return {
 		...resolve ?? {},
-		paths: [...new Set([base, ...currentPaths])]
+		paths: [...new Set([
+			node_path.default.join(base, "node_modules"),
+			base,
+			...currentPaths
+		])]
 	};
 }
 function resolveInstalledTailwindDefaults(resolve) {
@@ -102,6 +113,7 @@ function uniAppX(options) {
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
 		unitConversion: options.unitConversion,
+		appType: "uni-app-x",
 		tailwindcssBasedir: options.base,
 		tailwindcssPatcherOptions: {
 			projectRoot: options.base,
@@ -127,6 +139,7 @@ function uniAppX(options) {
 }
 //#endregion
 exports.createBasePreset = createBasePreset;
+exports.hbuilderx = hbuilderx;
 exports.normalizeCssEntries = normalizeCssEntries;
 exports.uniApp = uniApp;
 exports.uniAppX = uniAppX;

package/dist/presets.mjs

@@ -1,7 +1,8 @@
-import { q as omitUndefined } from "./v3-engine-COw08vWd.mjs";
+import { q as omitUndefined } from "./v3-engine-CPJ9uGyr.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-B2SJgA1L.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-ujlr9Iad.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DFa5Yes8.mjs";
 import { t as logger } from "./logger-Dr7IvyH2.mjs";
+import path from "node:path";
 import process from "node:process";
 import { getPackageInfoSync } from "local-pkg";
 //#region src/presets/shared.ts
@@ -37,6 +38,11 @@ function createBasePreset(options = {}) {
 	return defuOverrideArray(defuOverrideArray(userOptions, rawOptions ?? {}), preset);
 }
 //#endregion
+//#region src/presets/hbuilderx.ts
+function hbuilderx(options = {}) {
+	return createBasePreset({ ...options });
+}
+//#endregion
 //#region src/presets/uni-app.ts
 function uniApp(options = {}) {
 	const uniPlatform = process.env["UNI_PLATFORM"];
@@ -56,7 +62,11 @@ function resolveTailwindResolveOptions(base, resolve) {
 	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
 	return {
 		...resolve ?? {},
-		paths: [...new Set([base, ...currentPaths])]
+		paths: [...new Set([
+			path.join(base, "node_modules"),
+			base,
+			...currentPaths
+		])]
 	};
 }
 function resolveInstalledTailwindDefaults(resolve) {
@@ -97,6 +107,7 @@ function uniAppX(options) {
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
 		unitConversion: options.unitConversion,
+		appType: "uni-app-x",
 		tailwindcssBasedir: options.base,
 		tailwindcssPatcherOptions: {
 			projectRoot: options.base,
@@ -121,4 +132,4 @@ function uniAppX(options) {
 	});
 }
 //#endregion
-export { createBasePreset, normalizeCssEntries, uniApp, uniAppX };
+export { createBasePreset, hbuilderx, normalizeCssEntries, uniApp, uniAppX };

package/dist/{source-candidates-DoyOltpZ.mjs → source-candidates-DkScNh9A.mjs}

@@ -1,4 +1,4 @@
-import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-COw08vWd.mjs";
+import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-CPJ9uGyr.mjs";
 import path from "node:path";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";

package/dist/{source-candidates-0jPRIPmC.js → source-candidates-mfvC9gMc.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+const require_v3_engine = require("./v3-engine-CGsbY81C.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let tailwindcss_patch = require("tailwindcss-patch");

package/dist/{tailwindcss-nQetCaPp.js → tailwindcss-Cm93idme.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
+const require_v3_engine = require("./v3-engine-CGsbY81C.js");
 require("./utils-CSA174-I.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");

package/dist/{tailwindcss-ujlr9Iad.mjs → tailwindcss-DFa5Yes8.mjs}

@@ -1,4 +1,4 @@
-import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-COw08vWd.mjs";
+import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-CPJ9uGyr.mjs";
 import { n as defuOverrideArray } from "./utils-B2SJgA1L.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";

package/dist/{v3-engine-Bbsrez2w.js → v3-engine-CGsbY81C.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_auto = require("./auto-B11j1XiD.js");
+const require_auto = require("./auto-CqyEtds4.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");

package/dist/{v3-engine-COw08vWd.mjs → v3-engine-CPJ9uGyr.mjs}

@@ -1,4 +1,4 @@
-import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-AduSz49t.mjs";
+import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCssMacroStyleOptions, r as hasCssMacroTailwindV4Directive, t as hasCssMacroStyleOptions } from "./auto-CsWz6lsU.mjs";
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import postcss from "postcss";

package/dist/{vite-DE8Vfzal.js → vite-BM_ksf1q.js}

@@ -1,12 +1,12 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-Bbsrez2w.js");
-const require_generator = require("./generator-DTPePQZ9.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CERcE0fP.js");
-const require_precheck = require("./precheck-ezN3ovAq.js");
+const require_v3_engine = require("./v3-engine-CGsbY81C.js");
+const require_generator = require("./generator-BH6a0xuB.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-mY0v1k-Y.js");
+const require_precheck = require("./precheck-DLJg0_pu.js");
 const require_utils = require("./utils-CSA174-I.js");
-const require_tailwindcss = require("./tailwindcss-nQetCaPp.js");
-const require_source_candidates = require("./source-candidates-0jPRIPmC.js");
-const require_bundle_state = require("./bundle-state-BY7PWHAc.js");
+const require_tailwindcss = require("./tailwindcss-Cm93idme.js");
+const require_source_candidates = require("./source-candidates-mfvC9gMc.js");
+const require_bundle_state = require("./bundle-state-uCtqRm0p.js");
 require("./logger-Cdzl3p8j.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
@@ -1814,6 +1814,83 @@ function createViteRuntimeClassSet(options) {
 	};
 }
 //#endregion
+//#region src/bundlers/vite/serve-css-generation.ts
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/;
+const COMMON_JS_PROXY_RE = /\?commonjs-proxy/;
+const VITE_CSS_HMR_MODULE_RE = /\b__vite__updateStyle\s*\(/;
+const VITE_CSS_CONST_RE = /\bconst\s+__vite__css\s*=\s*("(?:\\[\s\S]|[^"])*")/;
+function decodeJsStringLiteral(literal) {
+	try {
+		return JSON.parse(literal);
+	} catch {
+		return;
+	}
+}
+function encodeJsStringLiteral(value) {
+	return JSON.stringify(value);
+}
+function extractViteCssHmrModuleCss(code) {
+	const match = VITE_CSS_CONST_RE.exec(code);
+	if (!match?.[1]) return;
+	const css = decodeJsStringLiteral(match[1]);
+	if (typeof css !== "string") return;
+	return {
+		css,
+		start: match.index + match[0].lastIndexOf(match[1]),
+		end: match.index + match[0].length
+	};
+}
+function replaceViteCssHmrModuleCss(code, css) {
+	const extracted = extractViteCssHmrModuleCss(code);
+	if (!extracted) return;
+	return `${code.slice(0, extracted.start)}${encodeJsStringLiteral(css)}${code.slice(extracted.end)}`;
+}
+function isViteServeStyleRequest(id, command) {
+	return command === "serve" && require_bundle_state.isSourceStyleRequest(id) && !SPECIAL_QUERY_RE.test(id) && !COMMON_JS_PROXY_RE.test(id);
+}
+function isViteServeCssRootRequest(id, command) {
+	return command === "serve" && require_bundle_state.isCSSRequest(id) && !SPECIAL_QUERY_RE.test(id) && !COMMON_JS_PROXY_RE.test(id);
+}
+function isViteCssHmrModule(code, id, command) {
+	return isViteServeStyleRequest(id, command) && VITE_CSS_HMR_MODULE_RE.test(code) && /[?&](?:direct|vue)(?:&|$)/.test(id);
+}
+function createViteServeCssGenerationPlugins(options) {
+	return [{
+		name: `${require_precheck.vitePluginName}:generate:serve`,
+		apply: "serve",
+		enforce: "pre",
+		async transform(code, id) {
+			if (!options.shouldGenerate() || !isViteServeCssRootRequest(id, options.getCommand())) return;
+			if (!require_incremental_runtime_class_set.hasTailwindRootDirectives(code)) return;
+			await options.onTailwindRootCss?.(id, code);
+			const generatedCss = await options.generateCss(id, code, this);
+			if (generatedCss === void 0 || generatedCss === code) return;
+			return {
+				code: generatedCss,
+				map: null
+			};
+		}
+	}, {
+		name: `${require_precheck.vitePluginName}:generate:serve-hmr`,
+		apply: "serve",
+		enforce: "post",
+		async transform(code, id) {
+			if (!options.shouldGenerate() || !isViteCssHmrModule(code, id, options.getCommand())) return;
+			const extracted = extractViteCssHmrModuleCss(code);
+			if (!extracted) return;
+			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);
+			if (nextCode === void 0 || nextCode === code) return;
+			return {
+				code: nextCode,
+				map: null
+			};
+		}
+	}];
+}
+//#endregion
 //#region src/bundlers/vite/tailwind-basedir.ts
 const PACKAGE_JSON_FILE = "package.json";
 function resolveImplicitTailwindcssBasedirFromViteRoot(root) {
@@ -1885,7 +1962,6 @@ function WeappTailwindcss(options = {}) {
 	const shouldOwnTailwindGeneration = !disabledOptions.plugin;
 	const shouldRewriteCssImports = tailwindcssMajorVersion >= 4;
 	const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator);
-	const isWebGeneratorTarget = generatorOptions.target === "web";
 	const shouldInferAppType = !hasExplicitAppType && generatorOptions.target !== "web";
 	const hasInitialTailwindCssRoots = require_tailwindcss.hasConfiguredTailwindV4CssRoots({
 		...options,
@@ -2154,20 +2230,57 @@ function WeappTailwindcss(options = {}) {
 	const resolveHotTailwindCssModules = (ctx) => {
 		const modules = [];
 		const seenModules = /* @__PURE__ */ new Set();
+		const collectModule = (mod) => {
+			if (mod == null || seenModules.has(mod)) return;
+			if (!require_bundle_state.isSourceStyleRequest(mod.id ?? mod.url)) return;
+			seenModules.add(mod);
+			ctx.server.moduleGraph.invalidateModule(mod);
+			modules.push(mod);
+		};
 		for (const id of tailwindRootCssModuleIds) {
-			const candidates = [ctx.server.moduleGraph.getModuleById(id), ...ctx.server.moduleGraph.getModulesByFile(id) ?? []].filter((mod) => {
-				if (mod == null) return false;
-				return require_bundle_state.isSourceStyleRequest(mod.id ?? mod.url);
-			});
-			for (const mod of candidates) {
-				if (seenModules.has(mod)) continue;
-				seenModules.add(mod);
-				ctx.server.moduleGraph.invalidateModule(mod);
-				modules.push(mod);
-			}
+			const candidates = [
+				ctx.server.moduleGraph.getModuleById(id),
+				ctx.server.moduleGraph.getModuleById((0, _weapp_tailwindcss_shared.cleanUrl)(id)),
+				...ctx.server.moduleGraph.getModulesByFile(id) ?? [],
+				...ctx.server.moduleGraph.getModulesByFile((0, _weapp_tailwindcss_shared.cleanUrl)(id)) ?? []
+			];
+			for (const mod of candidates) collectModule(mod);
 		}
 		return modules;
 	};
+	const resolveModuleHotUrl = (mod) => {
+		if (typeof mod.url === "string" && mod.url.length > 0) return mod.url;
+		if (typeof mod.id === "string" && mod.id.startsWith("/")) return mod.id;
+	};
+	const includesHotModule = (modules, target) => {
+		const targetUrl = resolveModuleHotUrl(target);
+		const targetId = target.id;
+		return modules.some((mod) => {
+			if (mod === target) return true;
+			return targetUrl !== void 0 && resolveModuleHotUrl(mod) === targetUrl || typeof targetId === "string" && targetId.length > 0 && mod.id === targetId;
+		});
+	};
+	const sendSupplementalCssHotUpdates = (ctx, cssModules) => {
+		const updates = cssModules.filter((mod) => !includesHotModule(ctx.modules, mod)).map((mod) => {
+			const hotUrl = resolveModuleHotUrl(mod);
+			if (!hotUrl) return;
+			return {
+				type: "js-update",
+				timestamp: ctx.timestamp,
+				path: hotUrl,
+				acceptedPath: hotUrl,
+				explicitImportRequired: false,
+				isWithinCircularImport: false
+			};
+		}).filter((update) => update !== void 0);
+		if (updates.length === 0) return;
+		queueMicrotask(() => {
+			ctx.server.ws?.send?.({
+				type: "update",
+				updates
+			});
+		});
+	};
 	const matchesViteProcessedCssSource = (candidate) => {
 		const normalized = normalizeViteProcessedCssFile(candidate);
 		return viteProcessedCssSourceFiles.has(normalized);
@@ -2268,7 +2381,6 @@ function WeappTailwindcss(options = {}) {
 	});
 	const isIosPlatform = require_utils.resolveUniUtsPlatform().isAppIos;
 	const prepareTailwindGeneration = async () => {
-		if (isWebGeneratorTarget && runtimeState.twPatcher.majorVersion !== 3) return;
 		if (shouldDiscoverAutoCssSources()) await discoverAndRegisterAutoCssSources();
 		await syncSourceCandidateScan();
 	};
@@ -2323,6 +2435,7 @@ function WeappTailwindcss(options = {}) {
 					await syncChangedSourceCandidateFile(ctx.file);
 					invalidateRecordedGeneratorCandidates();
 					const cssModules = resolveHotTailwindCssModules(ctx);
+					sendSupplementalCssHotUpdates(ctx, cssModules);
 					return cssModules.length > 0 ? [...ctx.modules, ...cssModules] : void 0;
 				}, { emit: false });
 			},
@@ -2332,6 +2445,12 @@ function WeappTailwindcss(options = {}) {
 				}, { emit: false });
 			}
 		},
+		...createViteServeCssGenerationPlugins({
+			generateCss: generateTailwindCssForVitePipeline,
+			getCommand: () => resolvedConfig?.command,
+			onTailwindRootCss: (id, code) => registerAutoCssSource(id, code),
+			shouldGenerate: () => shouldOwnTailwindGeneration
+		}),
 		{
 			name: `${require_precheck.vitePluginName}:post`,
 			enforce: "post",

package/dist/{vite-hZsQAY1a.mjs → vite-CqEF-Wx5.mjs}

@@ -1,11 +1,11 @@
-import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-COw08vWd.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CtqzN9L-.mjs";
-import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-BlJ86j-A.mjs";
-import { _ as createTailwindRuntimeReadyPromise, a as vitePluginName, c as analyzeSource, d as isClassContextLiteralPath, f as replaceWxml, g as collectRuntimeClassSet, h as toCustomAttributesEntities, l as JsTokenUpdater, n as getCompilerContext, o as generateCode, p as babelParse, s as createAttributeMatcher, t as shouldSkipJsTransform, u as _defineProperty, y as refreshTailwindRuntimeState } from "./precheck-B4CpMt_w.mjs";
+import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-CPJ9uGyr.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-iI_265gt.mjs";
+import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-ECHyKwUL.mjs";
+import { _ as collectRuntimeClassSet, a as vitePluginName, b as refreshTailwindRuntimeState, c as createAttributeMatcher, d as _defineProperty, f as isClassContextLiteralPath, g as toCustomAttributesEntities, l as analyzeSource, m as babelParse, n as getCompilerContext, p as replaceWxml, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as createTailwindRuntimeReadyPromise } from "./precheck-BI8oBeUg.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-B2SJgA1L.mjs";
-import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-ujlr9Iad.mjs";
-import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-DoyOltpZ.mjs";
-import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CBouNDzi.mjs";
+import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DFa5Yes8.mjs";
+import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-DkScNh9A.mjs";
+import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CWcrb3mH.mjs";
 import { t as logger$1 } from "./logger-Dr7IvyH2.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
@@ -1805,6 +1805,83 @@ function createViteRuntimeClassSet(options) {
 	};
 }
 //#endregion
+//#region src/bundlers/vite/serve-css-generation.ts
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/;
+const COMMON_JS_PROXY_RE = /\?commonjs-proxy/;
+const VITE_CSS_HMR_MODULE_RE = /\b__vite__updateStyle\s*\(/;
+const VITE_CSS_CONST_RE = /\bconst\s+__vite__css\s*=\s*("(?:\\[\s\S]|[^"])*")/;
+function decodeJsStringLiteral(literal) {
+	try {
+		return JSON.parse(literal);
+	} catch {
+		return;
+	}
+}
+function encodeJsStringLiteral(value) {
+	return JSON.stringify(value);
+}
+function extractViteCssHmrModuleCss(code) {
+	const match = VITE_CSS_CONST_RE.exec(code);
+	if (!match?.[1]) return;
+	const css = decodeJsStringLiteral(match[1]);
+	if (typeof css !== "string") return;
+	return {
+		css,
+		start: match.index + match[0].lastIndexOf(match[1]),
+		end: match.index + match[0].length
+	};
+}
+function replaceViteCssHmrModuleCss(code, css) {
+	const extracted = extractViteCssHmrModuleCss(code);
+	if (!extracted) return;
+	return `${code.slice(0, extracted.start)}${encodeJsStringLiteral(css)}${code.slice(extracted.end)}`;
+}
+function isViteServeStyleRequest(id, command) {
+	return command === "serve" && isSourceStyleRequest(id) && !SPECIAL_QUERY_RE.test(id) && !COMMON_JS_PROXY_RE.test(id);
+}
+function isViteServeCssRootRequest(id, command) {
+	return command === "serve" && isCSSRequest(id) && !SPECIAL_QUERY_RE.test(id) && !COMMON_JS_PROXY_RE.test(id);
+}
+function isViteCssHmrModule(code, id, command) {
+	return isViteServeStyleRequest(id, command) && VITE_CSS_HMR_MODULE_RE.test(code) && /[?&](?:direct|vue)(?:&|$)/.test(id);
+}
+function createViteServeCssGenerationPlugins(options) {
+	return [{
+		name: `${vitePluginName}:generate:serve`,
+		apply: "serve",
+		enforce: "pre",
+		async transform(code, id) {
+			if (!options.shouldGenerate() || !isViteServeCssRootRequest(id, options.getCommand())) return;
+			if (!hasTailwindRootDirectives(code)) return;
+			await options.onTailwindRootCss?.(id, code);
+			const generatedCss = await options.generateCss(id, code, this);
+			if (generatedCss === void 0 || generatedCss === code) return;
+			return {
+				code: generatedCss,
+				map: null
+			};
+		}
+	}, {
+		name: `${vitePluginName}:generate:serve-hmr`,
+		apply: "serve",
+		enforce: "post",
+		async transform(code, id) {
+			if (!options.shouldGenerate() || !isViteCssHmrModule(code, id, options.getCommand())) return;
+			const extracted = extractViteCssHmrModuleCss(code);
+			if (!extracted) return;
+			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);
+			if (nextCode === void 0 || nextCode === code) return;
+			return {
+				code: nextCode,
+				map: null
+			};
+		}
+	}];
+}
+//#endregion
 //#region src/bundlers/vite/tailwind-basedir.ts
 const PACKAGE_JSON_FILE = "package.json";
 function resolveImplicitTailwindcssBasedirFromViteRoot(root) {
@@ -1876,7 +1953,6 @@ function WeappTailwindcss(options = {}) {
 	const shouldOwnTailwindGeneration = !disabledOptions.plugin;
 	const shouldRewriteCssImports = tailwindcssMajorVersion >= 4;
 	const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
-	const isWebGeneratorTarget = generatorOptions.target === "web";
 	const shouldInferAppType = !hasExplicitAppType && generatorOptions.target !== "web";
 	const hasInitialTailwindCssRoots = hasConfiguredTailwindV4CssRoots({
 		...options,
@@ -2145,20 +2221,57 @@ function WeappTailwindcss(options = {}) {
 	const resolveHotTailwindCssModules = (ctx) => {
 		const modules = [];
 		const seenModules = /* @__PURE__ */ new Set();
+		const collectModule = (mod) => {
+			if (mod == null || seenModules.has(mod)) return;
+			if (!isSourceStyleRequest(mod.id ?? mod.url)) return;
+			seenModules.add(mod);
+			ctx.server.moduleGraph.invalidateModule(mod);
+			modules.push(mod);
+		};
 		for (const id of tailwindRootCssModuleIds) {
-			const candidates = [ctx.server.moduleGraph.getModuleById(id), ...ctx.server.moduleGraph.getModulesByFile(id) ?? []].filter((mod) => {
-				if (mod == null) return false;
-				return isSourceStyleRequest(mod.id ?? mod.url);
-			});
-			for (const mod of candidates) {
-				if (seenModules.has(mod)) continue;
-				seenModules.add(mod);
-				ctx.server.moduleGraph.invalidateModule(mod);
-				modules.push(mod);
-			}
+			const candidates = [
+				ctx.server.moduleGraph.getModuleById(id),
+				ctx.server.moduleGraph.getModuleById(cleanUrl(id)),
+				...ctx.server.moduleGraph.getModulesByFile(id) ?? [],
+				...ctx.server.moduleGraph.getModulesByFile(cleanUrl(id)) ?? []
+			];
+			for (const mod of candidates) collectModule(mod);
 		}
 		return modules;
 	};
+	const resolveModuleHotUrl = (mod) => {
+		if (typeof mod.url === "string" && mod.url.length > 0) return mod.url;
+		if (typeof mod.id === "string" && mod.id.startsWith("/")) return mod.id;
+	};
+	const includesHotModule = (modules, target) => {
+		const targetUrl = resolveModuleHotUrl(target);
+		const targetId = target.id;
+		return modules.some((mod) => {
+			if (mod === target) return true;
+			return targetUrl !== void 0 && resolveModuleHotUrl(mod) === targetUrl || typeof targetId === "string" && targetId.length > 0 && mod.id === targetId;
+		});
+	};
+	const sendSupplementalCssHotUpdates = (ctx, cssModules) => {
+		const updates = cssModules.filter((mod) => !includesHotModule(ctx.modules, mod)).map((mod) => {
+			const hotUrl = resolveModuleHotUrl(mod);
+			if (!hotUrl) return;
+			return {
+				type: "js-update",
+				timestamp: ctx.timestamp,
+				path: hotUrl,
+				acceptedPath: hotUrl,
+				explicitImportRequired: false,
+				isWithinCircularImport: false
+			};
+		}).filter((update) => update !== void 0);
+		if (updates.length === 0) return;
+		queueMicrotask(() => {
+			ctx.server.ws?.send?.({
+				type: "update",
+				updates
+			});
+		});
+	};
 	const matchesViteProcessedCssSource = (candidate) => {
 		const normalized = normalizeViteProcessedCssFile(candidate);
 		return viteProcessedCssSourceFiles.has(normalized);
@@ -2259,7 +2372,6 @@ function WeappTailwindcss(options = {}) {
 	});
 	const isIosPlatform = resolveUniUtsPlatform().isAppIos;
 	const prepareTailwindGeneration = async () => {
-		if (isWebGeneratorTarget && runtimeState.twPatcher.majorVersion !== 3) return;
 		if (shouldDiscoverAutoCssSources()) await discoverAndRegisterAutoCssSources();
 		await syncSourceCandidateScan();
 	};
@@ -2314,6 +2426,7 @@ function WeappTailwindcss(options = {}) {
 					await syncChangedSourceCandidateFile(ctx.file);
 					invalidateRecordedGeneratorCandidates();
 					const cssModules = resolveHotTailwindCssModules(ctx);
+					sendSupplementalCssHotUpdates(ctx, cssModules);
 					return cssModules.length > 0 ? [...ctx.modules, ...cssModules] : void 0;
 				}, { emit: false });
 			},
@@ -2323,6 +2436,12 @@ function WeappTailwindcss(options = {}) {
 				}, { emit: false });
 			}
 		},
+		...createViteServeCssGenerationPlugins({
+			generateCss: generateTailwindCssForVitePipeline,
+			getCommand: () => resolvedConfig?.command,
+			onTailwindRootCss: (id, code) => registerAutoCssSource(id, code),
+			shouldGenerate: () => shouldOwnTailwindGeneration
+		}),
 		{
 			name: `${vitePluginName}:post`,
 			enforce: "post",

package/dist/vite.js

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

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

@@ -31,7 +31,6 @@ require("@babel/parser");
 require("@babel/types");
 require("@ast-core/escape");
 require("@weapp-tailwindcss/shared/extractors");
-require("htmlparser2");
 //#region src/bundlers/shared/css-imports.ts
 const tailwindcssImportRE = /^(?:tailwindcss|weapp-tailwindcss)(?:\/.*)?$/;
 const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])((?:tailwindcss|weapp-tailwindcss)(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
@@ -197,10 +196,10 @@ const creator = () => {
 				];
 				atRule.replaceWith(nextNodes);
 				startComment.raws.before = hasPreviousNode ? "\n" : "";
-				startComment.raws.after = "\n";
+				startComment.raws["after"] = "\n";
 				if (clonedNodes[0]) clonedNodes[0].raws.before = "\n";
 				endComment.raws.before = "\n";
-				endComment.raws.after = "\n";
+				endComment.raws["after"] = "\n";
 				const nextNode = endComment?.next();
 				if (nextNode) nextNode.raws.before = "\n";
 			}
@@ -235,10 +234,10 @@ const creator = () => {
 				if ((parentRule.nodes?.length ?? 0) === 0) parentRule.replaceWith(nextNodes);
 				else parentRule.after(nextNodes);
 				startComment.raws.before = hasPreviousNode ? "\n" : "";
-				startComment.raws.after = "\n";
+				startComment.raws["after"] = "\n";
 				conditionalRule.raws.before = "\n";
 				endComment.raws.before = "\n";
-				endComment.raws.after = "\n";
+				endComment.raws["after"] = "\n";
 				const nextNode = endComment.next();
 				if (nextNode) nextNode.raws.before = "\n";
 				return true;
@@ -319,11 +318,9 @@ function withCssMacroPostcssPlugins(plugins) {
 	if (!plugins) return [macroPlugin];
 	if (Array.isArray(plugins)) return plugins.some(isCssMacroPostcssPlugin) ? plugins : [...plugins, macroPlugin];
 	if (typeof plugins === "object") {
-		if (Object.values(plugins).some(isCssMacroPostcssPlugin)) return plugins;
-		return {
-			...plugins,
-			[CSS_MACRO_POSTCSS_PLUGIN_NAME]: macroPlugin
-		};
+		const values = Object.values(plugins).filter(Boolean);
+		if (values.some(isCssMacroPostcssPlugin)) return values;
+		return [...values, macroPlugin];
 	}
 	return [macroPlugin];
 }