weapp-tailwindcss 5.0.0-next.10 → 5.0.0-next.13

package/dist/vite.js

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

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

@@ -2,31 +2,31 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_postcss = require("./postcss-CZE8k8oP.js");
+let node_buffer = require("node:buffer");
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_postcss.__toESM(node_process);
 let loader_utils = require("loader-utils");
-loader_utils = require_chunk.__toESM(loader_utils);
-let node_buffer = require("node:buffer");
+loader_utils = require_postcss.__toESM(loader_utils);
+let node_path = require("node:path");
+node_path = require_postcss.__toESM(node_path);
 let node_util = require("node:util");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
-let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
 //#region src/bundlers/shared/css-imports.ts
-const tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
+const tailwindcssImportRE = /^(?:tailwindcss|weapp-tailwindcss)(?:\/.*)?$/;
+const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])((?:tailwindcss|weapp-tailwindcss)(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
 function normalizeTailwindcssSpecifier(specifier) {
-	if (specifier === "tailwindcss$") return "tailwindcss";
+	if (specifier === "tailwindcss$" || specifier === "weapp-tailwindcss$") return specifier.slice(0, -1);
 	return specifier;
 }
 function getTailwindcssSubpath(specifier) {
-	if (specifier === "tailwindcss") return "index.css";
-	return specifier.slice(12);
+	if (specifier === "tailwindcss" || specifier === "weapp-tailwindcss") return "index.css";
+	return specifier.replace(/^(?:tailwindcss|weapp-tailwindcss)\//, "");
 }
 function resolveTailwindcssImport(specifier, pkgDir, options) {
 	const normalized = normalizeTailwindcssSpecifier(specifier);
 	if (!tailwindcssImportRE.test(normalized)) return null;
-	if (normalized === "tailwindcss") return options?.rootImport ?? "weapp-tailwindcss/index.css";
+	if (normalized === "tailwindcss" || normalized === "weapp-tailwindcss") return options?.rootImport ?? (options?.join ?? node_path.default.join)(pkgDir, "index.css");
 	return (options?.join ?? node_path.default.join)(pkgDir, getTailwindcssSubpath(normalized));
 }
 function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
@@ -40,8 +40,113 @@ function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
 	return hasReplacements ? rewritten : void 0;
 }
 //#endregion
-//#region src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts
+//#region src/bundlers/shared/generator-css/markers.ts
+const GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/\s*/gi;
+function stripGeneratorPlaceholderMarkers(css) {
+	return css.replace(GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE, "");
+}
+//#endregion
+//#region src/bundlers/shared/generator-css/directives.ts
+const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
+	"config",
+	"custom-variant",
+	"plugin",
+	"source",
+	"tailwind",
+	"theme",
+	"utility",
+	"variant"
+]);
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
+const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
+const TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE = /^\s*@(?:theme|utility|variant|custom-variant)\b[\s\S]*$/;
+function parseImportRequest(params) {
+	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
+}
+function parseConfigRequest(params) {
+	return /^(["'])(.+)\1\s*;?$/.exec(params.trim())?.[2];
+}
+function isPackageJsonImportRequest$1(request) {
+	return typeof request === "string" && request.startsWith("#");
+}
+function isWeappTailwindcssImportRequest(request) {
+	return request === "weapp-tailwindcss" || request?.startsWith("weapp-tailwindcss/");
+}
+function normalizeTailwindImportRequest(request, options = {}) {
+	if (options.importFallback && isWeappTailwindcssImportRequest(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
+	return request;
+}
+function replaceImportRequest(params, request, replacement) {
+	const index = params.indexOf(request);
+	if (index === -1) return params;
+	return `${params.slice(0, index)}${replacement}${params.slice(index + request.length)}`;
+}
+function normalizeTailwindDirectiveLine(line, options = {}) {
+	if (!options.importFallback || !line.trimStart().startsWith("@import")) return line;
+	const request = parseImportRequest(line.trimStart().replace(/^@import\b/, ""));
+	if (!request || !isWeappTailwindcssImportRequest(request)) return line;
+	return replaceImportRequest(line, request, request.replace(/^weapp-tailwindcss/, "tailwindcss"));
+}
+function extractTailwindDirectiveLines(rawSource, options = {}) {
+	const directives = [];
+	const seenImports = /* @__PURE__ */ new Set();
+	for (const line of stripGeneratorPlaceholderMarkers(rawSource).split(/\r?\n/)) {
+		const trimmed = line.trim();
+		if (!trimmed || trimmed.startsWith("//")) continue;
+		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE.exec(line)?.[0];
+		if (!directive) continue;
+		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
+		const normalizedTrimmed = normalized.trim();
+		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;
+		const request = /^@import\b/.test(normalizedTrimmed) ? parseImportRequest(normalizedTrimmed.replace(/^@import\b/, "")) : void 0;
+		if (request && !isTailwindImportRequest(request) && !isPackageJsonImportRequest$1(request)) continue;
+		if (/^@import\b/.test(normalizedTrimmed) && !request) continue;
+		if (request && isTailwindImportRequest(request)) {
+			const key = normalizedTrimmed;
+			if (seenImports.has(key)) continue;
+			seenImports.add(key);
+		}
+		directives.push(normalized);
+	}
+	return directives;
+}
+function extractTailwindSourceForPostcssFallback(rawSource, options = {}) {
+	const directives = extractTailwindDirectiveLines(rawSource, options);
+	return directives.length > 0 ? directives.join("\n") : void 0;
+}
+function hasPreprocessorOnlySyntax(rawSource) {
+	return /(?:^|\n)\s*(?:\/\/|\$[\w-]+\s*:|@[\w-]+\s*:|@(?:mixin|include|function|use|forward)\b)/.test(rawSource);
+}
+function normalizeTailwindSourceForGenerator(rawSource, options = {}) {
+	return hasPreprocessorOnlySyntax(rawSource) ? extractTailwindSourceForPostcssFallback(rawSource, options) ?? rawSource : rawSource;
+}
+function isTailwindImportRequest(request) {
+	return request === "tailwindcss" || request === "tailwindcss4" || request?.startsWith("tailwindcss/") || request?.startsWith("tailwindcss4/");
+}
+function isTailwindImportAtRule(node, options = {}) {
+	if (node.name === "tailwind") return true;
+	if (node.name !== "import") return false;
+	return isTailwindImportRequest(normalizeTailwindImportRequest(parseImportRequest(node.params), options));
+}
+function hasTailwindRootDirectives(rawSource, options = {}) {
+	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
+	try {
+		const root = require_postcss.postcss_default.parse(rawSource);
+		let found = false;
+		root.walkAtRules((node) => {
+			const request = node.name === "import" ? parseImportRequest(node.params) : node.name === "config" || node.name === "plugin" ? parseConfigRequest(node.params) : void 0;
+			if (isTailwindImportAtRule(node, options) || isPackageJsonImportRequest$1(request) || TAILWIND_ROOT_DIRECTIVE_NAMES.has(node.name)) {
+				found = true;
+				return false;
+			}
+		});
+		return found;
+	} catch {
+		return extractTailwindDirectiveLines(rawSource, options).length > 0;
+	}
+}
+//#endregion
+//#region src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts
 const getLoaderOptions = loader_utils.default.getOptions;
 function joinPosixPath(base, subpath) {
 	if (base.endsWith("/")) return `${base}${subpath}`;
@@ -56,25 +161,45 @@ function applyCssImportRewrite(source, options) {
 		appType: rewriteOptions.appType
 	}) ?? source;
 }
+function isPackageJsonImportRequest(request) {
+	return request.startsWith("#");
+}
+function toRootRelativeConfigPath(configPath, rootContext) {
+	if (!rootContext) return (0, _weapp_tailwindcss_shared.ensurePosix)(configPath);
+	const relative = (0, _weapp_tailwindcss_shared.ensurePosix)(node_path.default.relative(rootContext, configPath));
+	return relative.startsWith(".") ? relative : `./${relative}`;
+}
+function normalizeCssConfigDirectives(source, resourcePath, rootContext) {
+	if (!resourcePath) return source;
+	const base = node_path.default.dirname(resourcePath);
+	return source.replace(/@config\s+(["'])(.+?)\1\s*;?/g, (full, quote, request) => {
+		if (node_path.default.isAbsolute(request) || isPackageJsonImportRequest(request)) return full;
+		return `@config ${quote}${toRootRelativeConfigPath(node_path.default.resolve(base, request), rootContext)}${quote};`;
+	});
+}
 function transformCssImportRewriteSource(source, options) {
 	const input = node_buffer.Buffer.isBuffer(source) ? source.toString("utf-8") : source;
 	const rewritten = applyCssImportRewrite(input, options);
 	if (rewritten === input) return source;
-	if (node_process.default.env.WEAPP_TW_LOADER_DEBUG) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] rewritten import ${(0, node_util.inspect)({
+	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] rewritten import ${(0, node_util.inspect)({
 		before: input.slice(0, 80),
 		after: rewritten.slice(0, 80)
 	})}\n`);
 	return rewritten;
 }
 const WeappTwCssImportRewriteLoader = function(source) {
-	if (node_process.default.env.WEAPP_TW_LOADER_DEBUG) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] executing for ${this.resourcePath}\n`);
+	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-css-import-rewrite-loader] executing for ${this.resourcePath}\n`);
 	const opt = getLoaderOptions(this);
 	const input = node_buffer.Buffer.isBuffer(source) ? source.toString("utf-8") : source;
-	const registerTask = typeof input === "string" && TAILWIND_ROOT_DIRECTIVE_RE.test(input) ? opt?.tailwindcssImportRewrite?.registerCssSource?.({
+	const registerTask = typeof input === "string" && hasTailwindRootDirectives(input, { importFallback: true }) ? opt?.tailwindcssImportRewrite?.registerCssSource?.({
 		file: this.resourcePath,
-		css: input
+		css: normalizeCssConfigDirectives(normalizeTailwindSourceForGenerator(input, { importFallback: true }), this.resourcePath, this.rootContext)
 	}) : void 0;
-	const transform = () => transformCssImportRewriteSource(source, opt);
+	const transform = () => {
+		const transformed = transformCssImportRewriteSource(source, opt);
+		if (typeof transformed === "string") return normalizeCssConfigDirectives(transformed, this.resourcePath, this.rootContext);
+		return transformed;
+	};
 	if (registerTask && typeof registerTask.then === "function") return Promise.resolve(registerTask).then(transform);
 	return transform();
 };

package/dist/weapp-tw-runtime-classset-loader.js

@@ -1,15 +1,53 @@
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_postcss = require("./postcss-CZE8k8oP.js");
+let node_buffer = require("node:buffer");
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_postcss.__toESM(node_process);
 let loader_utils = require("loader-utils");
-loader_utils = require_chunk.__toESM(loader_utils);
+loader_utils = require_postcss.__toESM(loader_utils);
+//#region src/tailwindcss/remove-unsupported-css.ts
+/**
+* 移除小程序不支持的 cascade layer 语法，同时保留 layer 内的实际规则。
+*/
+function removeUnsupportedCascadeLayers(root) {
+	root.walkAtRules("layer", (atRule) => {
+		if (!atRule.nodes || atRule.nodes.length === 0) {
+			atRule.remove();
+			return;
+		}
+		atRule.replaceWith(...atRule.nodes);
+	});
+}
+//#endregion
 //#region src/bundlers/webpack/loaders/weapp-tw-runtime-classset-loader.ts
 function isPromiseLike(value) {
 	return Boolean(value && typeof value.then === "function");
 }
 const getLoaderOptions = loader_utils.default.getOptions;
+function normalizeRuntimeCssSource(source) {
+	if (node_buffer.Buffer.isBuffer(source)) {
+		const css = source.toString("utf8");
+		return shouldCleanRuntimeCss(css) ? node_buffer.Buffer.from(cleanRuntimeCss(css)) : source;
+	}
+	return shouldCleanRuntimeCss(source) ? cleanRuntimeCss(source) : source;
+}
+function shouldCleanRuntimeCss(css) {
+	return css.includes("@layer") || css.includes("@theme");
+}
+function cleanRuntimeCss(css) {
+	const root = require_postcss.postcss_default.parse(css);
+	removeUnsupportedCascadeLayers(root);
+	removeUnsupportedThemeKeyframes(root);
+	return root.toString();
+}
+function removeUnsupportedThemeKeyframes(root) {
+	root.walkAtRules("theme", (themeRule) => {
+		themeRule.walkAtRules((atRule) => {
+			if (atRule.name.startsWith("-") && atRule.name.endsWith("keyframes")) atRule.remove();
+		});
+	});
+}
 const WeappTwRuntimeClassSetLoader = function(source) {
-	if (node_process.default.env.WEAPP_TW_LOADER_DEBUG) node_process.default.stdout.write(`[weapp-tw-runtime-classset-loader] executing for ${this.resourcePath}\n`);
+	if (node_process.default.env["WEAPP_TW_LOADER_DEBUG"]) node_process.default.stdout.write(`[weapp-tw-runtime-classset-loader] executing for ${this.resourcePath}\n`);
 	const opt = getLoaderOptions(this);
 	const maybePromise = opt?.getClassSet?.();
 	const applyWatchDependencies = (dependencies) => {
@@ -25,10 +63,10 @@ const WeappTwRuntimeClassSetLoader = function(source) {
 	};
 	if (isPromiseLike(maybePromise)) return Promise.resolve(maybePromise).then(async () => {
 		await resolveWatchDependencies();
-		return source;
+		return normalizeRuntimeCssSource(source);
 	});
 	resolveWatchDependencies();
-	return source;
+	return normalizeRuntimeCssSource(source);
 };
 //#endregion
 module.exports = WeappTwRuntimeClassSetLoader;

package/dist/{webpack-CAk_ITq7.mjs → webpack-DvptFz7B.mjs}

@@ -1,14 +1,13 @@
-import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-CHs4DXui.mjs";
-import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
-import { i as processCachedTask, n as generateCssByGenerator, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BgMW6wf2.mjs";
-import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-B4RH6ZNN.mjs";
-import { r as getGroupedEntries } from "./utils-Btw1iOVV.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C5IgPlQ0.mjs";
-import { c as resolvePluginDisabledState, d as toAbsoluteOutputPath, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, s as resolvePackageDir, t as buildBundleSnapshot, u as resolveOutputSpecifier } from "./bundle-state-BWqi5ZyX.mjs";
+import { F as createDebug, l as getRuntimeClassSetSignature, z as resolveTailwindcssOptions } from "./v3-engine-D61eilBl.mjs";
+import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-Dbn4yPfZ.mjs";
+import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-SG48aLG2.mjs";
+import { r as getGroupedEntries } from "./utils-CycMvPn_.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-BbTVeQkG.mjs";
+import { c as resolvePluginDisabledState, f as resolveOutputSpecifier, l as isSourceStyleRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as toAbsoluteOutputPath, r as updateBundleBuildState, s as resolvePackageDir, t as buildBundleSnapshot, u as stripRequestQuery } from "./bundle-state-CP2XS3Uj.mjs";
 import Module, { createRequire } from "node:module";
+import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = Module;
@@ -30,6 +29,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 //#region src/shared/mpx.ts
 const localRequire = createRequire(import.meta.url);
 const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
+const MPX_WEBPACK_PLUGIN_PACKAGE_RE = /@mpxjs[\\/]webpack-plugin[\\/]package\.json$/;
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
 	return MPX_STYLE_RESOURCE_QUERY_RE$1.test(query);
@@ -50,19 +50,44 @@ function resolveMpxWebpackPluginDir(compiler) {
 		const projectRequire = createRequire(path.join(candidate, "package.json"));
 		return path.dirname(projectRequire.resolve("@mpxjs/webpack-plugin/package.json"));
 	} catch {}
-	return path.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	const cachedPackageJson = Object.keys(localRequire.cache).find((file) => MPX_WEBPACK_PLUGIN_PACKAGE_RE.test(file));
+	if (cachedPackageJson) return path.dirname(cachedPackageJson);
+	try {
+		return path.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	} catch {
+		return;
+	}
 }
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
+function resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir) {
+	if (request === "@mpxjs/webpack-plugin") return mpxWebpackPluginDir;
+	return path.join(mpxWebpackPluginDir, request.slice(22));
+}
 function addMpxWebpackPluginAlias(alias, pkgDir) {
+	const recordLoader = path.join(pkgDir, "lib/record-loader");
+	const styleCompiler = path.join(pkgDir, "lib/style-compiler/index");
+	const stripConditionalLoader = path.join(pkgDir, "lib/style-compiler/strip-conditional-loader");
 	if (Array.isArray(alias)) alias.push({
+		name: "@mpxjs/webpack-plugin/lib/record-loader",
+		alias: recordLoader
+	}, {
+		name: "@mpxjs/webpack-plugin/lib/style-compiler/index",
+		alias: styleCompiler
+	}, {
+		name: "@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader",
+		alias: stripConditionalLoader
+	}, {
 		name: /^@mpxjs\/webpack-plugin\//,
 		alias: pkgDir
 	});
 	else {
 		alias["@mpxjs/webpack-plugin"] = pkgDir;
 		alias["@mpxjs/webpack-plugin$"] = pkgDir;
+		alias["@mpxjs/webpack-plugin/lib/record-loader"] = recordLoader;
+		alias["@mpxjs/webpack-plugin/lib/style-compiler/index"] = styleCompiler;
+		alias["@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader"] = stripConditionalLoader;
 	}
 }
 function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
@@ -71,18 +96,48 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 	compiler.options.resolveLoader.alias = alias;
 	addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
 }
+function resolveMpxWebpackPluginRequire(compiler) {
+	const candidates = [
+		compiler?.context,
+		compiler?.options?.context,
+		process.cwd()
+	].filter((item) => typeof item === "string" && item.length > 0);
+	for (const candidate of candidates) try {
+		const projectRequire = createRequire(path.join(candidate, "package.json"));
+		projectRequire.resolve("@mpxjs/webpack-plugin/package.json");
+		return projectRequire;
+	} catch {}
+	const cachedPackageJson = Object.keys(localRequire.cache).find((file) => MPX_WEBPACK_PLUGIN_PACKAGE_RE.test(file));
+	if (cachedPackageJson) return createRequire(cachedPackageJson);
+	return localRequire;
+}
+function patchMpxWebpackPluginNormalizeLib(compiler, mpxWebpackPluginDir) {
+	if (!mpxWebpackPluginDir) return false;
+	const projectRequire = resolveMpxWebpackPluginRequire(compiler);
+	let normalize;
+	try {
+		normalize = projectRequire("@mpxjs/webpack-plugin/lib/utils/normalize");
+	} catch {
+		return false;
+	}
+	if (typeof normalize.lib !== "function") return false;
+	if (normalize.lib.__weappTwPatched) return true;
+	const wrappedLib = (file) => path.join(mpxWebpackPluginDir, "lib", file);
+	wrappedLib.__weappTwPatched = true;
+	wrappedLib.__weappTwOriginal = normalize.lib;
+	normalize.lib = wrappedLib;
+	return true;
+}
 function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
 	compiler.options = compiler.options || {};
 	compiler.options.resolve = compiler.options.resolve || {};
 	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
-	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
+	patchMpxWebpackPluginNormalizeLib(compiler, mpxWebpackPluginDir);
+	if (mpxWebpackPluginDir) ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
 	const alias = compiler.options.resolve.alias ?? {};
 	compiler.options.resolve.alias = alias;
 	if (Array.isArray(alias)) alias.push({
-		name: /^@mpxjs\/webpack-plugin\//,
-		alias: mpxWebpackPluginDir
-	}, {
 		name: "tailwindcss",
 		alias: tailwindcssCssEntry
 	}, {
@@ -90,11 +145,10 @@ function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 		alias: tailwindcssCssEntry
 	});
 	else {
-		alias["@mpxjs/webpack-plugin"] = mpxWebpackPluginDir;
-		alias["@mpxjs/webpack-plugin$"] = mpxWebpackPluginDir;
 		alias.tailwindcss = tailwindcssCssEntry;
 		alias.tailwindcss$ = tailwindcssCssEntry;
 	}
+	if (mpxWebpackPluginDir) addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
 	return tailwindcssCssEntry;
 }
 function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
@@ -102,10 +156,11 @@ function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
 	const originalResolve = loaderContext.resolve;
 	if (originalResolve.__weappTwPatched) return;
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
+	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(loaderContext);
 	const wrappedResolve = function(context, request, callback) {
 		if (request === "tailwindcss" || request === "tailwindcss$") return callback(null, tailwindcssCssEntry);
 		if (request?.startsWith("tailwindcss/")) return callback(null, path.join(pkgDir, request.slice(12)));
-		if (isMpxWebpackPluginRequest(request)) return originalResolve.call(this, process.cwd(), request, callback);
+		if (mpxWebpackPluginDir && isMpxWebpackPluginRequest(request)) return callback(null, resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir));
 		return originalResolve.call(this, context, request, callback);
 	};
 	wrappedResolve.__weappTwPatched = true;
@@ -141,16 +196,13 @@ function getCacheKey(filename) {
 }
 function stripResourceQuery(resource) {
 	if (typeof resource !== "string") return resource;
-	const queryIndex = resource.indexOf("?");
-	if (queryIndex !== -1) return resource.slice(0, queryIndex);
-	const hashIndex = resource.indexOf("#");
-	if (hashIndex !== -1) return resource.slice(0, hashIndex);
-	return resource;
+	return stripRequestQuery(resource);
 }
 function isCssLikeModuleResource(resource, cssMatcher, appType) {
 	if (typeof resource !== "string") return false;
 	const normalizedResource = stripResourceQuery(resource);
 	if (normalizedResource && cssMatcher(normalizedResource)) return true;
+	if (isSourceStyleRequest(resource)) return true;
 	if (appType === "mpx") return MPX_STYLE_RESOURCE_QUERY_RE.test(resource);
 	return false;
 }
@@ -158,6 +210,13 @@ function hasLoaderEntry(entries, target) {
 	if (!target) return false;
 	return entries.some((entry) => entry.loader?.includes?.(target));
 }
+function normalizeWatchPath(file) {
+	return path.resolve(file);
+}
+function isFileInContext(file, context) {
+	const relative = path.relative(normalizeWatchPath(context), normalizeWatchPath(file));
+	return relative.length > 0 && !relative.startsWith("..") && !path.isAbsolute(relative);
+}
 function toChunkFiles(files) {
 	if (!files) return [];
 	if (Array.isArray(files)) return files;
@@ -186,8 +245,11 @@ function createAssetHashByChunkMap(chunks) {
 function createRuntimeAwareCssHash(assetHash, sourceHash, runtimeSetHash) {
 	return `${assetHash ?? sourceHash}:${runtimeSetHash}`;
 }
-function hasWatchChanges(compiler) {
-	return (compiler.modifiedFiles?.size ?? 0) > 0 || (compiler.removedFiles?.size ?? 0) > 0;
+function isWatchFileInRuntimeDependencies(file, dependencies) {
+	const normalizedFile = normalizeWatchPath(file);
+	for (const dependency of dependencies.files ?? []) if (normalizeWatchPath(dependency) === normalizedFile) return true;
+	for (const context of dependencies.contexts ?? []) if (isFileInContext(normalizedFile, context)) return true;
+	return false;
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
@@ -218,6 +280,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			compilerOptions.onStart();
 			debug("start");
 			await runtimeState.readyPromise;
+			const hmrTimingStartedAt = performance.now();
 			for (const chunk of compilation.chunks) if (chunk.id && chunk.hash) compilerOptions.cache.calcHashValueChanged(chunk.id, chunk.hash);
 			const assetHashByChunk = createAssetHashByChunkMap(compilation.chunks);
 			const entries = Object.entries(assets);
@@ -270,7 +333,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const created = {
 					isMainChunk,
 					postcssOptions: { options: { from: file } },
-					majorVersion
+					...majorVersion === void 0 ? {} : { majorVersion }
 				};
 				cssHandlerOptionsCache.set(cacheKey, created);
 				return created;
@@ -319,10 +382,6 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					clearCache: forceRuntimeRefresh,
 					allowEmpty: false
 				});
-				if (runtimeSet.size === 0) {
-					const syncSet = runtimeState.twPatcher.getClassSetSync?.();
-					if (syncSet && syncSet.size > 0) runtimeSet = syncSet;
-				}
 			}
 			await refreshRuntimeMetadata(forceRuntimeRefresh);
 			consumeRuntimeRefreshRequirement();
@@ -444,12 +503,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			pushConcurrentTaskFactories(tasks, jsTaskFactories);
 			await Promise.all(tasks);
 			debug("end");
+			emitHmrTiming("webpack", "processAssets", performance.now() - hmrTimingStartedAt);
 			compilerOptions.onEnd();
 		});
 	});
 }
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.22.0_tsx@4.21.0_typescript@6.0.3_unrun@0.2.37_synckit@0.11.12__vue-tsc@3.2.9_typescript@6.0.3_/node_modules/tsdown/esm-shims.js
+//#region ../../node_modules/.pnpm/tsdown@0.22.0_oxc-resolver@11.19.1_@emnapi+core@1.10.0_@emnapi+runtime@1.10.0__tsx@4.22_d5fec98bd6da0af22d9e6961a46a32e3/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -493,8 +553,8 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
-		appType,
-		registerCssSource: registerAutoCssSource
+		...appType === void 0 ? {} : { appType },
+		...registerAutoCssSource === void 0 ? {} : { registerCssSource: registerAutoCssSource }
 	} : void 0;
 	const classSetLoaderOptions = {
 		getClassSet: getClassSetInLoader,
@@ -510,7 +570,7 @@ function setupWebpackV5Loaders(options) {
 		type: null
 	});
 	const createCssImportRewriteLoaderEntry = () => {
-		if (!runtimeCssImportRewriteLoader) return null;
+		if (!runtimeCssImportRewriteLoader || !cssImportRewriteLoaderOptions) return null;
 		return {
 			loader: runtimeCssImportRewriteLoader,
 			options: cssImportRewriteLoaderOptions,
@@ -527,15 +587,15 @@ function setupWebpackV5Loaders(options) {
 			let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
 			const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
 			const isCssModule = isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher, appType);
-			if (process.env.WEAPP_TW_LOADER_DEBUG && isCssModule) debug("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
+			if (process.env["WEAPP_TW_LOADER_DEBUG"] && isCssModule) debug("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
 				rewriteAnchorIdx,
 				classSetAnchorIdx
 			});
-			if (process.env.WEAPP_TW_LOADER_DEBUG && typeof module.resource === "string" && module.resource.includes("app.css")) debug("app.css module loaders=%o anchors=%o", loaderEntries.map((x) => x.loader), {
+			if (process.env["WEAPP_TW_LOADER_DEBUG"] && typeof module.resource === "string" && module.resource.includes("app.css")) debug("app.css module loaders=%o anchors=%o", loaderEntries.map((x) => x.loader), {
 				rewriteAnchorIdx,
 				classSetAnchorIdx
 			});
-			else if (process.env.WEAPP_TW_LOADER_DEBUG && typeof module.resource === "string" && module.resource.endsWith(".css")) debug("css module seen: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
+			else if (process.env["WEAPP_TW_LOADER_DEBUG"] && typeof module.resource === "string" && module.resource.endsWith(".css")) debug("css module seen: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
 				rewriteAnchorIdx,
 				classSetAnchorIdx
 			});
@@ -632,13 +692,24 @@ var UnifiedWebpackPluginV5 = class {
 			await updateRuntimeWatchDependencies();
 			runtimeMetadataPrepared = true;
 		};
+		const collectWatchChangedFiles = () => {
+			const compilerLike = compiler;
+			return new Set([...compilerLike.modifiedFiles ?? [], ...compilerLike.removedFiles ?? []]);
+		};
+		const hasRuntimeDependencyChanges = (files) => {
+			for (const file of files) if (isWatchFileInRuntimeDependencies(file, {
+				contexts: runtimeWatchDependencyContexts,
+				files: runtimeWatchDependencyFiles
+			})) return true;
+			return false;
+		};
 		const syncRuntimeRefreshRequirement = (markWatchRun = false) => {
 			if (markWatchRun) watchRunObserved = true;
-			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasWatchChanges(compiler);
+			const changedFiles = collectWatchChangedFiles();
+			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges(changedFiles);
 		};
 		const resetRuntimePreparation = () => {
 			runtimeSetPrepared = false;
-			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
 		const registerAutoCssSource = async (source) => {
@@ -653,8 +724,9 @@ var UnifiedWebpackPluginV5 = class {
 			});
 			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
 		};
-		compiler.hooks.invalid?.tap?.(pluginName, () => {
-			runtimeRefreshRequiredForCompilation = true;
+		compiler.hooks.invalid?.tap?.(pluginName, (fileName) => {
+			if (!fileName) return;
+			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([path.resolve(fileName)]);
 		});
 		compiler.hooks.watchRun?.tap?.(pluginName, () => syncRuntimeRefreshRequirement(true));
 		if (compiler.hooks.thisCompilation?.tap) compiler.hooks.thisCompilation.tap(pluginName, resetRuntimePreparation);