weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.7

package/dist/vite.d.ts

@@ -1,4 +1,3 @@
 export * from './bundlers/vite/index';
-export { UnifiedViteWeappTailwindcssPlugin as WeappTailwindcss } from './bundlers/vite/index';
-export { UnifiedViteWeappTailwindcssPlugin as weappTailwindcss } from './bundlers/vite/index';
+export { WeappTailwindcss as weappTailwindcss } from './bundlers/vite/index';
 export type { UserDefinedOptions } from './types';

package/dist/vite.js

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-DgRh_GXn.js");
-exports.UnifiedViteWeappTailwindcssPlugin = require_vite.UnifiedViteWeappTailwindcssPlugin;
-exports.WeappTailwindcss = require_vite.UnifiedViteWeappTailwindcssPlugin;
-exports.weappTailwindcss = require_vite.UnifiedViteWeappTailwindcssPlugin;
+const require_vite = require("./vite-D0CoRblu.js");
+exports.WeappTailwindcss = require_vite.WeappTailwindcss;
+exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as UnifiedViteWeappTailwindcssPlugin } from "./vite-BDywuCjn.mjs";
-export { UnifiedViteWeappTailwindcssPlugin, UnifiedViteWeappTailwindcssPlugin as WeappTailwindcss, UnifiedViteWeappTailwindcssPlugin as weappTailwindcss };
+import { t as WeappTailwindcss } from "./vite-BXChkciE.mjs";
+export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

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

@@ -47,7 +47,7 @@ function joinPosixPath(base, subpath) {
 	return `${base}/${subpath}`;
 }
 function applyCssImportRewrite(source, options) {
-	const rewriteOptions = options?.rewriteCssImports;
+	const rewriteOptions = options?.tailwindcssImportRewrite;
 	const pkgDir = rewriteOptions?.pkgDir;
 	if (!pkgDir) return source;
 	return rewriteTailwindcssImportsInCode(source, (0, _weapp_tailwindcss_shared.ensurePosix)(pkgDir), {

package/dist/{webpack-CiHqVZTg.mjs → webpack-BNdGm9KL.mjs}

@@ -1,18 +1,183 @@
-import { r as resolveTailwindcssOptions } from "./patcher-options-DQfR5xxT.mjs";
-import { g as ensureRuntimeClassSet, n as shouldSkipJsTransform, p as pluginName, r as getCompilerContext, t as setupPatchRecorder, v as createDebug } from "./recorder-XdFvVASS.mjs";
-import { r as getGroupedEntries } from "./utils-7DUGTFED.mjs";
-import { d as getRuntimeClassSetSignature } from "./logger-BoVx1Dbt.mjs";
-import { i as processCachedTask, t as generateCssByGenerator } from "./generator-css-Bwy_Uz89.mjs";
-import { a as resolveDisabledOptions, c as toAbsoluteOutputPath, i as resolvePackageDir, r as pushConcurrentTaskFactories, s as resolveOutputSpecifier } from "./css-imports-CSdPq_Sc.mjs";
-import { a as hasLoaderEntry, c as applyTailwindcssCssImportRewrite, d as isMpx, f as patchMpxLoaderResolve, i as getCacheKey, l as ensureMpxTailwindcssAliases, n as __dirname, o as hasWatchChanges, p as setupMpxTailwindcssRedirect, r as createAssetHashByChunkMap, s as isCssLikeModuleResource, t as createLoaderAnchorFinders, u as injectMpxCssRewritePreRules } from "./loader-anchors-1MumTAtA.mjs";
+import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-nq0_XJoS.mjs";
+import { n as createDebug } from "./runtime-patch-pGdCqAEu.mjs";
+import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform } from "./precheck-DlrmwCc-.mjs";
+import { r as getGroupedEntries } from "./utils-BJjKRQgf.mjs";
+import { a as processCachedTask, t as generateCssByGenerator } from "./generator-css-B938WI9a.mjs";
+import { a as resolveOutputSpecifier, n as resolvePackageDir, o as toAbsoluteOutputPath, r as resolvePluginDisabledState, t as pushConcurrentTaskFactories } from "./run-tasks-DdNi-hkk.mjs";
+import Module, { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
 import fs from "node:fs";
-//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
-function resolveWebpackStaleClassNameFallback(option, _compiler) {
-	if (typeof option === "boolean") return option;
+import { fileURLToPath } from "node:url";
+//#region src/shared/tailwindcss-css-redirect.ts
+const moduleWithMutableResolve = Module;
+const patched = /* @__PURE__ */ new WeakSet();
+function installTailwindcssCssRedirect(pkgDir) {
+	const target = path.join(pkgDir, "index.css");
+	const original = moduleWithMutableResolve._resolveFilename;
+	if (patched.has(original)) return;
+	const replacements = new Set(["tailwindcss", "tailwindcss$"]);
+	const resolveTailwindcssCss = (request, parent, isMain, options) => {
+		if (replacements.has(request)) return target;
+		if (request.startsWith("tailwindcss/")) return path.join(pkgDir, request.slice(12));
+		return original(request, parent, isMain, options);
+	};
+	moduleWithMutableResolve._resolveFilename = resolveTailwindcssCss;
+	patched.add(moduleWithMutableResolve._resolveFilename);
+}
+//#endregion
+//#region src/shared/mpx.ts
+const require = createRequire(import.meta.url);
+const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
+function isMpxStyleResourceQuery(query) {
+	if (typeof query !== "string") return false;
+	return MPX_STYLE_RESOURCE_QUERY_RE$1.test(query);
+}
+function isMpx(appType) {
+	return appType === "mpx";
+}
+function getTailwindcssCssEntry(pkgDir) {
+	return path.join(pkgDir, "index.css");
+}
+function isMpxWebpackPluginRequest(request) {
+	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
+}
+function addMpxWebpackPluginAlias(alias, pkgDir) {
+	if (Array.isArray(alias)) alias.push({
+		name: /^@mpxjs\/webpack-plugin\//,
+		alias: pkgDir
+	});
+	else {
+		alias["@mpxjs/webpack-plugin"] = pkgDir;
+		alias["@mpxjs/webpack-plugin$"] = pkgDir;
+	}
+}
+function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
+	compiler.options.resolveLoader = compiler.options.resolveLoader || {};
+	const alias = compiler.options.resolveLoader.alias ?? {};
+	compiler.options.resolveLoader.alias = alias;
+	addMpxWebpackPluginAlias(alias, mpxWebpackPluginDir);
+}
+function ensureMpxTailwindcssAliases(compiler, pkgDir) {
+	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
+	const mpxWebpackPluginDir = path.dirname(require.resolve("@mpxjs/webpack-plugin/package.json"));
+	compiler.options = compiler.options || {};
+	compiler.options.resolve = compiler.options.resolve || {};
+	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
+	}, {
+		name: "tailwindcss$",
+		alias: tailwindcssCssEntry
+	});
+	else {
+		alias["@mpxjs/webpack-plugin"] = mpxWebpackPluginDir;
+		alias["@mpxjs/webpack-plugin$"] = mpxWebpackPluginDir;
+		alias.tailwindcss = tailwindcssCssEntry;
+		alias.tailwindcss$ = tailwindcssCssEntry;
+	}
+	return tailwindcssCssEntry;
+}
+function patchMpxLoaderResolve(loaderContext, pkgDir, enabled) {
+	if (!enabled || typeof loaderContext.resolve !== "function") return;
+	const originalResolve = loaderContext.resolve;
+	if (originalResolve.__weappTwPatched) return;
+	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
+	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);
+		return originalResolve.call(this, context, request, callback);
+	};
+	wrappedResolve.__weappTwPatched = true;
+	loaderContext.resolve = wrappedResolve;
+}
+function setupMpxTailwindcssRedirect(pkgDir, enabled) {
+	if (enabled) installTailwindcssCssRedirect(pkgDir);
+}
+const CSS_EXT_RE = /\.css$/i;
+function injectMpxCssRewritePreRules(compiler, loader, loaderOptions) {
+	var _compiler$options;
+	if (!loader) return;
+	const moduleOptions = (_compiler$options = compiler.options).module ?? (_compiler$options.module = { rules: [] });
+	moduleOptions.rules = moduleOptions.rules || [];
+	const createRule = (match) => ({
+		...match,
+		enforce: "pre",
+		use: [{
+			loader,
+			options: loaderOptions
+		}]
+	});
+	moduleOptions.rules.unshift(createRule({ resourceQuery: (query) => isMpxStyleResourceQuery(query) }), createRule({
+		test: CSS_EXT_RE,
+		resourceQuery: (query) => !isMpxStyleResourceQuery(query)
+	}));
+}
+//#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/shared.ts
+const MPX_STYLE_RESOURCE_QUERY_RE = /(?:\?|&)type=styles\b/;
+function getCacheKey(filename) {
+	return 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;
+}
+function isCssLikeModuleResource(resource, cssMatcher, appType) {
+	if (typeof resource !== "string") return false;
+	const normalizedResource = stripResourceQuery(resource);
+	if (normalizedResource && cssMatcher(normalizedResource)) return true;
+	if (appType === "mpx") return MPX_STYLE_RESOURCE_QUERY_RE.test(resource);
 	return false;
 }
+function hasLoaderEntry(entries, target) {
+	if (!target) return false;
+	return entries.some((entry) => entry.loader?.includes?.(target));
+}
+function toChunkFiles(files) {
+	if (!files) return [];
+	if (Array.isArray(files)) return files;
+	return [...files];
+}
+function createAssetHashByChunkMap(chunks) {
+	const partsByFile = /* @__PURE__ */ new Map();
+	for (const chunk of chunks) {
+		const hash = typeof chunk.hash === "string" ? chunk.hash : void 0;
+		if (!hash) continue;
+		const chunkId = String(chunk.id ?? chunk.name ?? "");
+		for (const file of toChunkFiles(chunk.files)) {
+			if (!file) continue;
+			let parts = partsByFile.get(file);
+			if (!parts) {
+				parts = [];
+				partsByFile.set(file, parts);
+			}
+			parts.push(`${chunkId}:${hash}`);
+		}
+	}
+	const hashByFile = /* @__PURE__ */ new Map();
+	for (const [file, parts] of partsByFile.entries()) hashByFile.set(file, parts.sort().join("|"));
+	return hashByFile;
+}
+function createRuntimeAwareCssHash(assetHash, sourceHash, runtimeSetHash) {
+	return `${assetHash ?? sourceHash}:${runtimeSetHash}`;
+}
+function hasWatchChanges(compiler) {
+	return (compiler.modifiedFiles?.size ?? 0) > 0 || (compiler.removedFiles?.size ?? 0) > 0;
+}
+//#endregion
+//#region src/bundlers/webpack/BaseUnifiedPlugin/v5-assets.ts
 function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, consumeRuntimeRefreshRequirement, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
@@ -26,7 +191,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 		}, async (assets) => {
 			compilerOptions.onStart();
 			debug("start");
-			await runtimeState.patchPromise;
+			await runtimeState.readyPromise;
 			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);
@@ -95,7 +260,6 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				cssUserHandlerOptionsCache.set(cacheKey, created);
 				return created;
 			};
-			const staleClassNameFallback = resolveWebpackStaleClassNameFallback(compilerOptions.staleClassNameFallback, compiler);
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
 			const runtimeSet = await ensureRuntimeClassSet(runtimeState, {
@@ -106,6 +270,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			});
 			await refreshRuntimeMetadata(forceRuntimeRefresh);
 			consumeRuntimeRefreshRequirement();
+			const runtimeSetHash = compilerOptions.cache.computeHash([getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
@@ -161,7 +326,6 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							const currentSourceValue = compilation.getAsset(file)?.source.source();
 							const currentSource = typeof currentSourceValue === "string" ? currentSourceValue : currentSourceValue?.toString() ?? "";
 							const handlerOptions = {
-								staleClassNameFallback,
 								tailwindcssMajorVersion: runtimeState.twPatcher.majorVersion,
 								filename: absoluteFile,
 								moduleGraph: moduleGraphOptions,
@@ -182,13 +346,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
-				const chunkHash = assetHashByChunk.get(file);
+				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
 					hashKey: `${file}:asset`,
 					rawSource,
-					hash: chunkHash,
+					hash: runtimeAwareHash,
 					applyResult(source) {
 						compilation.updateAsset(file, source);
 					},
@@ -196,7 +360,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 						debug("css cache hit: %s", file);
 					},
 					transform: async () => {
-						await runtimeState.patchPromise;
+						await runtimeState.readyPromise;
 						const cssHandlerOptions = getCssHandlerOptions(file);
 						const generated = await generateCssByGenerator({
 							opts: compilerOptions,
@@ -226,13 +390,46 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	});
 }
 //#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.8_typescript@6.0.3_/node_modules/tsdown/esm-shims.js
+const getFilename = () => fileURLToPath(import.meta.url);
+const getDirname = () => path.dirname(getFilename());
+const __dirname = /* @__PURE__ */ getDirname();
+//#endregion
+//#region src/bundlers/webpack/shared/loader-anchors.ts
+const MPX_STRIP_CONDITIONAL_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/strip-conditional-loader";
+const MPX_STYLE_COMPILER_LOADER = "@mpxjs/webpack-plugin/lib/style-compiler/index";
+const MPX_REWRITE_PRECEDENCE_LOADERS = [MPX_STYLE_COMPILER_LOADER, MPX_STRIP_CONDITIONAL_LOADER];
+function createFinder(targets) {
+	return (entries) => entries.findIndex((entry) => targets.some((target) => entry?.loader?.includes?.(target)));
+}
+function createPrioritizedFinder(targets) {
+	return (entries) => {
+		for (const target of targets) {
+			const idx = entries.findIndex((entry) => entry?.loader?.includes?.(target));
+			if (idx !== -1) return idx;
+		}
+		return -1;
+	};
+}
+function createLoaderAnchorFinders(appType) {
+	if (isMpx(appType)) return {
+		findRewriteAnchor: createPrioritizedFinder(MPX_REWRITE_PRECEDENCE_LOADERS),
+		findClassSetAnchor: createFinder([MPX_STYLE_COMPILER_LOADER])
+	};
+	const fallbackFinder = createFinder(["postcss-loader"]);
+	return {
+		findRewriteAnchor: fallbackFinder,
+		findClassSetAnchor: fallbackFinder
+	};
+}
+//#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, runtimeCssImportRewriteLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
 	const isMpxApp = isMpx(appType);
 	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
-	const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? runtimeCssImportRewriteLoaderPath ?? path.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
+	const runtimeCssImportRewriteLoader = shouldRewriteCssImports ? path.resolve(__dirname, "./weapp-tw-css-import-rewrite-loader.js") : void 0;
 	const runtimeClassSetLoaderExists = fs.existsSync(runtimeClassSetLoader);
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
@@ -244,7 +441,7 @@ function setupWebpackV5Loaders(options) {
 		getWatchDependencies: getRuntimeWatchDependencies
 	};
 	const { findRewriteAnchor, findClassSetAnchor } = createLoaderAnchorFinders(appType);
-	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { rewriteCssImports: runtimeLoaderRewriteOptions } : void 0;
+	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewrite: runtimeLoaderRewriteOptions } : void 0;
 	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
 	const createRuntimeClassSetLoaderEntry = () => ({
 		loader: runtimeClassSetLoader,
@@ -320,33 +517,23 @@ const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 */
 var UnifiedWebpackPluginV5 = class {
 	constructor(options = {}) {
+		_defineProperty(this, "options", void 0);
+		_defineProperty(this, "appType", void 0);
 		this.options = getCompilerContext(options);
 		this.appType = this.options.appType;
 	}
 	apply(compiler) {
 		compiler.options = compiler.options || {};
-		const { disabled, onLoad, runtimeLoaderPath, runtimeCssImportRewriteLoaderPath, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = this.options;
-		const disabledOptions = resolveDisabledOptions(disabled);
-		const shouldRewriteCssImports = (initialTwPatcher.majorVersion ?? 0) >= 4 && this.options.rewriteCssImports !== false && !disabledOptions.rewriteCssImports;
+		const { disabled, onLoad, runtimeLoaderPath, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = this.options;
+		const disabledOptions = resolvePluginDisabledState(disabled);
+		const shouldRewriteCssImports = (initialTwPatcher.majorVersion ?? 0) >= 4;
 		const isMpxApp = isMpx(this.appType);
-		if (shouldRewriteCssImports) {
-			applyTailwindcssCssImportRewrite(compiler, {
-				pkgDir: weappTailwindcssPackageDir,
-				enabled: true,
-				appType: this.appType
-			});
-			setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
-		}
+		if (shouldRewriteCssImports) setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
 		if (disabledOptions.plugin) return;
-		const patchRecorderState = setupPatchRecorder(initialTwPatcher, this.options.tailwindcssBasedir, {
-			source: "runtime",
-			cwd: this.options.tailwindcssBasedir ?? process.cwd()
-		});
 		const runtimeState = {
 			twPatcher: initialTwPatcher,
-			patchPromise: patchRecorderState.patchPromise,
-			refreshTailwindcssPatcher,
-			onPatchCompleted: patchRecorderState.onPatchCompleted
+			readyPromise: createTailwindRuntimeReadyPromise(initialTwPatcher),
+			refreshTailwindcssPatcher
 		};
 		let runtimeSetPrepared = false;
 		let runtimeSetSignature;
@@ -413,7 +600,6 @@ var UnifiedWebpackPluginV5 = class {
 			weappTailwindcssPackageDir,
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
-			runtimeCssImportRewriteLoaderPath,
 			getClassSetInLoader,
 			getRuntimeWatchDependencies() {
 				return {