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

package/dist/{webpack-damWiYqY.js → webpack-wfNutjMm.js}

@@ -1,19 +1,18 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_cache = require("./cache-BVAiJV3J.js");
-const require_runtime_patch = require("./runtime-patch-D6mBo_KB.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BYmzQ-_f.js");
-const require_precheck = require("./precheck-B32p-gLI.js");
-const require_utils = require("./utils-BiShvil9.js");
-const require_tailwindcss = require("./tailwindcss-Bu-RWIHx.js");
-const require_bundle_state = require("./bundle-state-EUbcdKqo.js");
+const require_v3_engine = require("./v3-engine-DwV1E6rX.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-DN9KKjSi.js");
+const require_precheck = require("./precheck-CRX-pMKJ.js");
+const require_utils = require("./utils-D0MZP_tr.js");
+const require_tailwindcss = require("./tailwindcss-DZ6jVYb4.js");
+const require_bundle_state = require("./bundle-state-Bz8vLnCf.js");
+let node_fs = require("node:fs");
+node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
 node_module = require_chunk.__toESM(node_module);
 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 node_fs = require("node:fs");
-node_fs = require_chunk.__toESM(node_fs);
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = node_module.default;
 const patched = /* @__PURE__ */ new WeakSet();
@@ -34,6 +33,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 //#region src/shared/mpx.ts
 const localRequire = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 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);
@@ -54,19 +54,44 @@ function resolveMpxWebpackPluginDir(compiler) {
 		const projectRequire = (0, node_module.createRequire)(node_path.default.join(candidate, "package.json"));
 		return node_path.default.dirname(projectRequire.resolve("@mpxjs/webpack-plugin/package.json"));
 	} catch {}
-	return node_path.default.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 node_path.default.dirname(cachedPackageJson);
+	try {
+		return node_path.default.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 node_path.default.join(mpxWebpackPluginDir, request.slice(22));
+}
 function addMpxWebpackPluginAlias(alias, pkgDir) {
+	const recordLoader = node_path.default.join(pkgDir, "lib/record-loader");
+	const styleCompiler = node_path.default.join(pkgDir, "lib/style-compiler/index");
+	const stripConditionalLoader = node_path.default.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) {
@@ -75,18 +100,48 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 	compiler.options.resolveLoader.alias = alias;
 	addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
 }
+function resolveMpxWebpackPluginRequire(compiler) {
+	const candidates = [
+		compiler?.context,
+		compiler?.options?.context,
+		node_process.default.cwd()
+	].filter((item) => typeof item === "string" && item.length > 0);
+	for (const candidate of candidates) try {
+		const projectRequire = (0, node_module.createRequire)(node_path.default.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 (0, node_module.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) => node_path.default.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
 	}, {
@@ -94,11 +149,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) {
@@ -106,10 +160,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, node_path.default.join(pkgDir, request.slice(12)));
-		if (isMpxWebpackPluginRequest(request)) return originalResolve.call(this, node_process.default.cwd(), request, callback);
+		if (mpxWebpackPluginDir && isMpxWebpackPluginRequest(request)) return callback(null, resolveMpxWebpackPluginRequest(request, mpxWebpackPluginDir));
 		return originalResolve.call(this, context, request, callback);
 	};
 	wrappedResolve.__weappTwPatched = true;
@@ -145,16 +200,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 require_bundle_state.stripRequestQuery(resource);
 }
 function isCssLikeModuleResource(resource, cssMatcher, appType) {
 	if (typeof resource !== "string") return false;
 	const normalizedResource = stripResourceQuery(resource);
 	if (normalizedResource && cssMatcher(normalizedResource)) return true;
+	if (require_bundle_state.isSourceStyleRequest(resource)) return true;
 	if (appType === "mpx") return MPX_STYLE_RESOURCE_QUERY_RE.test(resource);
 	return false;
 }
@@ -162,6 +214,13 @@ function hasLoaderEntry(entries, target) {
 	if (!target) return false;
 	return entries.some((entry) => entry.loader?.includes?.(target));
 }
+function normalizeWatchPath(file) {
+	return node_path.default.resolve(file);
+}
+function isFileInContext(file, context) {
+	const relative = node_path.default.relative(normalizeWatchPath(context), normalizeWatchPath(file));
+	return relative.length > 0 && !relative.startsWith("..") && !node_path.default.isAbsolute(relative);
+}
 function toChunkFiles(files) {
 	if (!files) return [];
 	if (Array.isArray(files)) return files;
@@ -190,8 +249,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
@@ -222,6 +284,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);
@@ -274,7 +337,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const created = {
 					isMainChunk,
 					postcssOptions: { options: { from: file } },
-					majorVersion
+					...majorVersion === void 0 ? {} : { majorVersion }
 				};
 				cssHandlerOptionsCache.set(cacheKey, created);
 				return created;
@@ -323,14 +386,10 @@ 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();
-			const runtimeSetHash = compilerOptions.cache.computeHash([require_cache.getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
+			const runtimeSetHash = compilerOptions.cache.computeHash([require_v3_engine.getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
@@ -448,6 +507,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			require_bundle_state.pushConcurrentTaskFactories(tasks, jsTaskFactories);
 			await Promise.all(tasks);
 			debug("end");
+			require_incremental_runtime_class_set.emitHmrTiming("webpack", "processAssets", performance.now() - hmrTimingStartedAt);
 			compilerOptions.onEnd();
 		});
 	});
@@ -492,8 +552,8 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? node_fs.default.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,
@@ -509,7 +569,7 @@ function setupWebpackV5Loaders(options) {
 		type: null
 	});
 	const createCssImportRewriteLoaderEntry = () => {
-		if (!runtimeCssImportRewriteLoader) return null;
+		if (!runtimeCssImportRewriteLoader || !cssImportRewriteLoaderOptions) return null;
 		return {
 			loader: runtimeCssImportRewriteLoader,
 			options: cssImportRewriteLoaderOptions,
@@ -526,15 +586,15 @@ function setupWebpackV5Loaders(options) {
 			let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
 			const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
 			const isCssModule = isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher, appType);
-			if (node_process.default.env.WEAPP_TW_LOADER_DEBUG && isCssModule) debug("loader hook css module: %s loaders=%o anchors=%o", module.resource, loaderEntries.map((x) => x.loader), {
+			if (node_process.default.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 (node_process.default.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 (node_process.default.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 (node_process.default.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 (node_process.default.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
 			});
@@ -567,7 +627,7 @@ function setupWebpackV5Loaders(options) {
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
-const debug = require_runtime_patch.createDebug();
+const debug = require_v3_engine.createDebug();
 const weappTailwindcssPackageDir = require_bundle_state.resolvePackageDir("weapp-tailwindcss");
 /**
 * @name UnifiedWebpackPluginV5
@@ -609,7 +669,7 @@ var UnifiedWebpackPluginV5 = class {
 		const updateRuntimeWatchDependencies = async () => {
 			runtimeWatchDependencyFiles.clear();
 			runtimeWatchDependencyContexts.clear();
-			const tailwindOptions = require_cache.resolveTailwindcssOptions(runtimeState.twPatcher.options);
+			const tailwindOptions = require_v3_engine.resolveTailwindcssOptions(runtimeState.twPatcher.options);
 			if (tailwindOptions?.config) runtimeWatchDependencyFiles.add(tailwindOptions.config);
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) runtimeWatchDependencyFiles.add(entry);
 			for (const source of tailwindOptions?.v4?.cssSources ?? []) {
@@ -631,13 +691,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) => {
@@ -652,15 +723,16 @@ var UnifiedWebpackPluginV5 = class {
 			});
 			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
 		};
-		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, () => {
-			runtimeRefreshRequiredForCompilation = true;
+		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, (fileName) => {
+			if (!fileName) return;
+			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([node_path.default.resolve(fileName)]);
 		});
 		compiler.hooks.watchRun?.tap?.(require_precheck.pluginName, () => syncRuntimeRefreshRequirement(true));
 		if (compiler.hooks.thisCompilation?.tap) compiler.hooks.thisCompilation.tap(require_precheck.pluginName, resetRuntimePreparation);
 		else if (compiler.hooks.compilation?.tap) compiler.hooks.compilation.tap(require_precheck.pluginName, resetRuntimePreparation);
 		async function getClassSetInLoader() {
 			if (runtimeSetPrepared) return;
-			const signature = require_cache.getRuntimeClassSetSignature(runtimeState.twPatcher);
+			const signature = require_v3_engine.getRuntimeClassSetSignature(runtimeState.twPatcher);
 			const forceRefresh = runtimeRefreshRequiredForCompilation || signature !== runtimeSetSignature;
 			debug("runtime loader ensure class set forceRefresh=%s watchDirty=%s signatureChanged=%s", forceRefresh, runtimeRefreshRequiredForCompilation, signature !== runtimeSetSignature);
 			runtimeSetPrepared = true;

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-damWiYqY.js");
+const require_webpack = require("./webpack-wfNutjMm.js");
 exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
 exports.WeappTailwindcss = require_webpack.UnifiedWebpackPluginV5;
 exports.weappTailwindcss = require_webpack.UnifiedWebpackPluginV5;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-CAk_ITq7.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-DvptFz7B.mjs";
 export { UnifiedWebpackPluginV5, UnifiedWebpackPluginV5 as WeappTailwindcss, UnifiedWebpackPluginV5 as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.10",
+  "version": "5.0.0-next.13",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -187,13 +187,13 @@
     "micromatch": "^4.0.8",
     "postcss-load-config": "^6.0.1",
     "semver": "~7.8.0",
-    "tailwindcss-patch": "9.3.3",
+    "tailwindcss-patch": "9.3.5",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "1.1.0",
-    "@weapp-tailwindcss/postcss": "2.2.1-next.1",
+    "@weapp-tailwindcss/postcss": "2.2.1-next.2",
     "@weapp-tailwindcss/reset": "0.1.1-next.0",
-    "tailwindcss-config": "1.1.6-next.1",
-    "@weapp-tailwindcss/shared": "1.1.3"
+    "@weapp-tailwindcss/shared": "1.1.3",
+    "tailwindcss-config": "1.1.6-next.1"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",