weapp-tailwindcss 5.0.0-next.5 → 5.0.0-next.8

package/dist/vite.js

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

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

@@ -41,6 +41,7 @@ function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
 }
 //#endregion
 //#region src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts
+const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const getLoaderOptions = loader_utils.default.getOptions;
 function joinPosixPath(base, subpath) {
 	if (base.endsWith("/")) return `${base}${subpath}`;
@@ -67,7 +68,15 @@ function transformCssImportRewriteSource(source, options) {
 }
 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`);
-	return transformCssImportRewriteSource(source, getLoaderOptions(this));
+	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?.({
+		file: this.resourcePath,
+		css: input
+	}) : void 0;
+	const transform = () => transformCssImportRewriteSource(source, opt);
+	if (registerTask && typeof registerTask.then === "function") return Promise.resolve(registerTask).then(transform);
+	return transform();
 };
 //#endregion
 exports.default = WeappTwCssImportRewriteLoader;

package/dist/{webpack-CICGEKT9.js → webpack-CNV2dx3Q.js}

@@ -1,10 +1,11 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_patcher_options = require("./patcher-options-DnqazL9E.js");
-const require_recorder = require("./recorder-D4BKt75Q.js");
-const require_utils = require("./utils-DmC9_In3.js");
-const require_logger = require("./logger-D9clu_3f.js");
-const require_generator_css = require("./generator-css-CGueCYbX.js");
-const require_run_tasks = require("./run-tasks-Cq5A5nVD.js");
+const require_cache = require("./cache-BVAiJV3J.js");
+const require_runtime_patch = require("./runtime-patch-D6mBo_KB.js");
+const require_generator_css = require("./generator-css-Mksw8PgB.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_run_tasks = require("./run-tasks-B50A3pxt.js");
 let node_module = require("node:module");
 node_module = require_chunk.__toESM(node_module);
 let node_path = require("node:path");
@@ -31,7 +32,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 }
 //#endregion
 //#region src/shared/mpx.ts
-const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const localRequire = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
@@ -43,6 +44,18 @@ function isMpx(appType) {
 function getTailwindcssCssEntry(pkgDir) {
 	return node_path.default.join(pkgDir, "index.css");
 }
+function resolveMpxWebpackPluginDir(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"));
+		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"));
+}
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
@@ -64,9 +77,9 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 }
 function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
-	const mpxWebpackPluginDir = node_path.default.dirname(require$1.resolve("@mpxjs/webpack-plugin/package.json"));
 	compiler.options = compiler.options || {};
 	compiler.options.resolve = compiler.options.resolve || {};
+	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
 	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
 	const alias = compiler.options.resolve.alias ?? {};
 	compiler.options.resolve.alias = alias;
@@ -174,6 +187,9 @@ function createAssetHashByChunkMap(chunks) {
 	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;
 }
@@ -185,14 +201,14 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	const { ConcatSource } = sources;
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
 	const cssUserHandlerOptionsCache = /* @__PURE__ */ new Map();
-	compiler.hooks.compilation.tap(require_recorder.pluginName, (compilation) => {
+	compiler.hooks.compilation.tap(require_precheck.pluginName, (compilation) => {
 		compilation.hooks.processAssets.tapPromise({
-			name: require_recorder.pluginName,
+			name: require_precheck.pluginName,
 			stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
 		}, 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);
@@ -263,7 +279,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			};
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
-			const runtimeSet = await require_recorder.ensureRuntimeClassSet(runtimeState, {
+			const runtimeSet = await require_precheck.ensureRuntimeClassSet(runtimeState, {
 				forceRefresh: forceRuntimeRefresh,
 				forceCollect: true,
 				clearCache: forceRuntimeRefresh,
@@ -271,7 +287,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			});
 			await refreshRuntimeMetadata(forceRuntimeRefresh);
 			consumeRuntimeRefreshRequirement();
-			const runtimeSetHash = compilerOptions.cache.computeHash([require_logger.getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
+			const runtimeSetHash = compilerOptions.cache.computeHash([require_cache.getRuntimeClassSetSignature(runtimeState.twPatcher), [...runtimeSet].sort().join("\n")].join("\n\n"));
 			const defaultTemplateHandlerOptions = { runtimeSet };
 			debug("get runtimeSet, class count: %d", runtimeSet.size);
 			const tasks = [];
@@ -332,7 +348,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								moduleGraph: moduleGraphOptions,
 								babelParserOptions: { sourceFilename: absoluteFile }
 							};
-							if (require_recorder.shouldSkipJsTransform(currentSource, handlerOptions)) return { result: new ConcatSource(currentSource) };
+							if (require_precheck.shouldSkipJsTransform(currentSource, handlerOptions)) return { result: new ConcatSource(currentSource) };
 							const { code, linked } = await compilerOptions.jsHandler(currentSource, runtimeSet, handlerOptions);
 							const source = new ConcatSource(code);
 							compilerOptions.onUpdate(file, currentSource, code);
@@ -347,8 +363,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
-				const chunkHash = assetHashByChunk.get(file);
-				const runtimeAwareHash = chunkHash ? `${chunkHash}:${runtimeSetHash}` : void 0;
+				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(require_generator_css.processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
@@ -362,7 +377,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 require_generator_css.generateCssByGenerator({
 							opts: compilerOptions,
@@ -422,7 +437,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
 	const isMpxApp = isMpx(appType);
 	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? node_path.default.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
@@ -431,7 +446,8 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? node_fs.default.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
-		appType
+		appType,
+		registerCssSource: registerAutoCssSource
 	} : void 0;
 	const classSetLoaderOptions = {
 		getClassSet: getClassSetInLoader,
@@ -456,8 +472,8 @@ function setupWebpackV5Loaders(options) {
 		};
 	};
 	const { NormalModule } = compiler.webpack;
-	compiler.hooks.compilation.tap(require_recorder.pluginName, (compilation) => {
-		NormalModule.getCompilationHooks(compilation).loader.tap(require_recorder.pluginName, (_loaderContext, module) => {
+	compiler.hooks.compilation.tap(require_precheck.pluginName, (compilation) => {
+		NormalModule.getCompilationHooks(compilation).loader.tap(require_precheck.pluginName, (_loaderContext, module) => {
 			if (!(runtimeClassSetLoaderExists || runtimeCssImportRewriteLoaderExists)) return;
 			patchMpxLoaderResolve(_loaderContext, weappTailwindcssPackageDir, shouldRewriteCssImports && isMpxApp);
 			const loaderEntries = module.loaders || [];
@@ -505,7 +521,7 @@ function setupWebpackV5Loaders(options) {
 }
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5.ts
-const debug = require_recorder.createDebug();
+const debug = require_runtime_patch.createDebug();
 const weappTailwindcssPackageDir = require_run_tasks.resolvePackageDir("weapp-tailwindcss");
 /**
 * @name UnifiedWebpackPluginV5
@@ -514,7 +530,14 @@ const weappTailwindcssPackageDir = require_run_tasks.resolvePackageDir("weapp-ta
 */
 var UnifiedWebpackPluginV5 = class {
 	constructor(options = {}) {
-		this.options = require_recorder.getCompilerContext(options);
+		require_precheck._defineProperty(this, "options", void 0);
+		require_precheck._defineProperty(this, "appType", void 0);
+		require_precheck._defineProperty(this, "hasInitialTailwindCssRoots", void 0);
+		this.hasInitialTailwindCssRoots = require_tailwindcss.hasConfiguredTailwindV4CssRoots(options);
+		this.options = require_precheck.getCompilerContext({
+			...options,
+			__internalDeferMissingCssEntriesWarning: true
+		});
 		this.appType = this.options.appType;
 	}
 	apply(compiler) {
@@ -525,15 +548,10 @@ var UnifiedWebpackPluginV5 = class {
 		const isMpxApp = isMpx(this.appType);
 		if (shouldRewriteCssImports) setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
 		if (disabledOptions.plugin) return;
-		const patchRecorderState = require_recorder.setupPatchRecorder(initialTwPatcher, this.options.tailwindcssBasedir, {
-			source: "runtime",
-			cwd: this.options.tailwindcssBasedir ?? node_process.default.cwd()
-		});
 		const runtimeState = {
 			twPatcher: initialTwPatcher,
-			patchPromise: patchRecorderState.patchPromise,
-			refreshTailwindcssPatcher,
-			onPatchCompleted: patchRecorderState.onPatchCompleted
+			readyPromise: require_precheck.createTailwindRuntimeReadyPromise(initialTwPatcher),
+			refreshTailwindcssPatcher
 		};
 		let runtimeSetPrepared = false;
 		let runtimeSetSignature;
@@ -544,9 +562,13 @@ var UnifiedWebpackPluginV5 = class {
 		const updateRuntimeWatchDependencies = async () => {
 			runtimeWatchDependencyFiles.clear();
 			runtimeWatchDependencyContexts.clear();
-			const tailwindOptions = require_patcher_options.resolveTailwindcssOptions(runtimeState.twPatcher.options);
+			const tailwindOptions = require_cache.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 ?? []) {
+				if (source.file) runtimeWatchDependencyFiles.add(source.file);
+				for (const dependency of source.dependencies ?? []) runtimeWatchDependencyFiles.add(dependency);
+			}
 			for (const source of tailwindOptions?.v4?.sources ?? []) if (source?.base) runtimeWatchDependencyContexts.add(source.base);
 			if (typeof runtimeState.twPatcher.collectContentTokens !== "function") return;
 			try {
@@ -570,19 +592,31 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
-		compiler.hooks.invalid?.tap?.(require_recorder.pluginName, () => {
+		const registerAutoCssSource = async (source) => {
+			if (this.hasInitialTailwindCssRoots || (runtimeState.twPatcher.majorVersion ?? 0) < 4 || !source.file) return;
+			if (!require_tailwindcss.upsertTailwindV4CssSource(this.options, source)) return;
+			runtimeSetPrepared = false;
+			runtimeMetadataPrepared = false;
+			runtimeRefreshRequiredForCompilation = true;
+			await require_precheck.refreshTailwindRuntimeState(runtimeState, {
+				force: true,
+				clearCache: true
+			});
+			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
+		};
+		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, () => {
 			runtimeRefreshRequiredForCompilation = true;
 		});
-		compiler.hooks.watchRun?.tap?.(require_recorder.pluginName, syncRuntimeRefreshRequirement);
-		if (compiler.hooks.thisCompilation?.tap) compiler.hooks.thisCompilation.tap(require_recorder.pluginName, resetRuntimePreparation);
-		else if (compiler.hooks.compilation?.tap) compiler.hooks.compilation.tap(require_recorder.pluginName, resetRuntimePreparation);
+		compiler.hooks.watchRun?.tap?.(require_precheck.pluginName, syncRuntimeRefreshRequirement);
+		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_logger.getRuntimeClassSetSignature(runtimeState.twPatcher);
+			const signature = require_cache.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;
-			await require_recorder.ensureRuntimeClassSet(runtimeState, {
+			await require_precheck.ensureRuntimeClassSet(runtimeState, {
 				forceRefresh,
 				forceCollect: true,
 				clearCache: forceRefresh,
@@ -600,6 +634,7 @@ var UnifiedWebpackPluginV5 = class {
 			weappTailwindcssPackageDir,
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
+			registerAutoCssSource,
 			getClassSetInLoader,
 			getRuntimeWatchDependencies() {
 				return {

package/dist/{webpack-D2Wdk28V.mjs → webpack-CT6EEENx.mjs}

@@ -1,9 +1,10 @@
-import { r as resolveTailwindcssOptions } from "./patcher-options-GuOwX0-k.mjs";
-import { g as ensureRuntimeClassSet, n as shouldSkipJsTransform, p as pluginName, r as getCompilerContext, t as setupPatchRecorder, v as createDebug } from "./recorder-BIW3Kuke.mjs";
-import { r as getGroupedEntries } from "./utils-7DUGTFED.mjs";
-import { d as getRuntimeClassSetSignature } from "./logger-1gx9UllH.mjs";
-import { i as processCachedTask, t as generateCssByGenerator } from "./generator-css-MyjZhF0z.mjs";
-import { a as resolveOutputSpecifier, n as resolvePackageDir, o as toAbsoluteOutputPath, r as resolvePluginDisabledState, t as pushConcurrentTaskFactories } from "./run-tasks-DUVrDJGl.mjs";
+import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-CHs4DXui.mjs";
+import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
+import { r as processCachedTask, t as generateCssByGenerator } from "./generator-css-BIapP56i.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 { 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";
@@ -27,7 +28,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 }
 //#endregion
 //#region src/shared/mpx.ts
-const require = createRequire(import.meta.url);
+const localRequire = createRequire(import.meta.url);
 const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
@@ -39,6 +40,18 @@ function isMpx(appType) {
 function getTailwindcssCssEntry(pkgDir) {
 	return path.join(pkgDir, "index.css");
 }
+function resolveMpxWebpackPluginDir(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"));
+		return path.dirname(projectRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	} catch {}
+	return path.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+}
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
@@ -60,9 +73,9 @@ function ensureResolveLoaderAlias(compiler, 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 || {};
+	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
 	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
 	const alias = compiler.options.resolve.alias ?? {};
 	compiler.options.resolve.alias = alias;
@@ -170,6 +183,9 @@ function createAssetHashByChunkMap(chunks) {
 	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;
 }
@@ -188,7 +204,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);
@@ -343,8 +359,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				const cacheKey = file;
-				const chunkHash = assetHashByChunk.get(file);
-				const runtimeAwareHash = chunkHash ? `${chunkHash}:${runtimeSetHash}` : void 0;
+				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(processCachedTask({
 					cache: compilerOptions.cache,
 					cacheKey,
@@ -358,7 +373,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,
@@ -388,7 +403,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	});
 }
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.21.10_synckit@0.11.12_typescript@5.9.3_vue-tsc@3.2.8_typescript@5.9.3_/node_modules/tsdown/esm-shims.js
+//#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();
@@ -423,7 +438,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, 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");
@@ -432,7 +447,8 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
-		appType
+		appType,
+		registerCssSource: registerAutoCssSource
 	} : void 0;
 	const classSetLoaderOptions = {
 		getClassSet: getClassSetInLoader,
@@ -515,7 +531,14 @@ const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
 */
 var UnifiedWebpackPluginV5 = class {
 	constructor(options = {}) {
-		this.options = getCompilerContext(options);
+		_defineProperty(this, "options", void 0);
+		_defineProperty(this, "appType", void 0);
+		_defineProperty(this, "hasInitialTailwindCssRoots", void 0);
+		this.hasInitialTailwindCssRoots = hasConfiguredTailwindV4CssRoots(options);
+		this.options = getCompilerContext({
+			...options,
+			__internalDeferMissingCssEntriesWarning: true
+		});
 		this.appType = this.options.appType;
 	}
 	apply(compiler) {
@@ -526,15 +549,10 @@ var UnifiedWebpackPluginV5 = class {
 		const isMpxApp = isMpx(this.appType);
 		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;
@@ -548,6 +566,10 @@ var UnifiedWebpackPluginV5 = class {
 			const tailwindOptions = 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 ?? []) {
+				if (source.file) runtimeWatchDependencyFiles.add(source.file);
+				for (const dependency of source.dependencies ?? []) runtimeWatchDependencyFiles.add(dependency);
+			}
 			for (const source of tailwindOptions?.v4?.sources ?? []) if (source?.base) runtimeWatchDependencyContexts.add(source.base);
 			if (typeof runtimeState.twPatcher.collectContentTokens !== "function") return;
 			try {
@@ -571,6 +593,18 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
+		const registerAutoCssSource = async (source) => {
+			if (this.hasInitialTailwindCssRoots || (runtimeState.twPatcher.majorVersion ?? 0) < 4 || !source.file) return;
+			if (!upsertTailwindV4CssSource(this.options, source)) return;
+			runtimeSetPrepared = false;
+			runtimeMetadataPrepared = false;
+			runtimeRefreshRequiredForCompilation = true;
+			await refreshTailwindRuntimeState(runtimeState, {
+				force: true,
+				clearCache: true
+			});
+			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
+		};
 		compiler.hooks.invalid?.tap?.(pluginName, () => {
 			runtimeRefreshRequiredForCompilation = true;
 		});
@@ -601,6 +635,7 @@ var UnifiedWebpackPluginV5 = class {
 			weappTailwindcssPackageDir,
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
+			registerAutoCssSource,
 			getClassSetInLoader,
 			getRuntimeWatchDependencies() {
 				return {

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-CICGEKT9.js");
+const require_webpack = require("./webpack-CNV2dx3Q.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-D2Wdk28V.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-CT6EEENx.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.5",
+  "version": "5.0.0-next.8",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -172,12 +172,10 @@
     "@babel/parser": "~7.29.3",
     "@babel/traverse": "~7.29.0",
     "@babel/types": "~7.29.0",
-    "@tailwindcss-mangle/config": "^7.0.1",
     "@vue/compiler-dom": "^3.5.34",
     "@vue/compiler-sfc": "^3.5.34",
     "@weapp-core/escape": "~7.0.0",
     "@weapp-core/regex": "~1.0.1",
-    "cac": "6.7.14",
     "comment-json": "^4.6.2",
     "debug": "~4.4.3",
     "fast-glob": "^3.3.3",
@@ -187,15 +185,14 @@
     "lru-cache": "10.4.3",
     "magic-string": "0.30.21",
     "postcss-load-config": "^6.0.1",
-    "semver": "~7.7.4",
-    "tailwindcss-patch": "9.3.2",
-    "webpack-sources": "3.3.4",
-    "yaml": "^2.8.4",
-    "@weapp-tailwindcss/postcss": "2.2.1-next.0",
+    "semver": "~7.8.0",
+    "tailwindcss-patch": "9.3.3",
+    "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "1.1.0",
+    "@weapp-tailwindcss/postcss": "2.2.1-next.1",
     "@weapp-tailwindcss/reset": "0.1.1-next.0",
     "@weapp-tailwindcss/shared": "1.1.3",
-    "tailwindcss-config": "1.1.6-next.0"
+    "tailwindcss-config": "1.1.6-next.1"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",

package/dist/bundlers/shared/generator-candidates.d.ts

@@ -1,5 +0,0 @@
-export interface GeneratorCandidateSource {
-    content: string;
-    extension?: string;
-}
-export declare function collectGeneratorCandidatesFromSources(sources: GeneratorCandidateSource[], baseCandidates?: Iterable<string>): Promise<Set<string>>;

package/dist/bundlers/webpack/shared/css-imports.d.ts

@@ -1,6 +0,0 @@
-import type { AppType } from '../../../types';
-export declare function applyTailwindcssCssImportRewrite(compiler: any, options: {
-    pkgDir: string;
-    enabled: boolean;
-    appType?: AppType;
-}): void;

package/dist/cli/config.d.ts

@@ -1,5 +0,0 @@
-export interface TailwindcssMangleConfigModule {
-    initConfig: (cwd: string) => Promise<void>;
-    CONFIG_NAME: string;
-}
-export declare function loadTailwindcssMangleConfig(): Promise<TailwindcssMangleConfigModule | undefined>;

package/dist/cli/helpers/patch-cwd.d.ts

@@ -1 +0,0 @@
-export declare function resolvePatchDefaultCwd(currentCwd?: string): string;

package/dist/cli/mount-options/patch-status.d.ts

@@ -1,2 +0,0 @@
-import type { PatchStatusReport } from 'tailwindcss-patch';
-export declare function logPatchStatusReport(report: PatchStatusReport): void;

package/dist/cli/patch-options.d.ts

@@ -1,6 +0,0 @@
-import type { TailwindCssPatchOptions } from 'tailwindcss-patch';
-type ExtendLengthUnitsFeature = Exclude<NonNullable<NonNullable<TailwindCssPatchOptions['apply']>['extendLengthUnits']>, false>;
-export declare const DEFAULT_EXTEND_LENGTH_UNITS_FEATURE: ExtendLengthUnitsFeature;
-export declare function withDefaultExtendLengthUnits(options: TailwindCssPatchOptions | undefined): TailwindCssPatchOptions;
-export declare function buildExtendLengthUnitsOverride(options: TailwindCssPatchOptions | undefined): TailwindCssPatchOptions | undefined;
-export {};

package/dist/cli/tokens.d.ts

@@ -1,4 +0,0 @@
-import type { TailwindTokenReport } from 'tailwindcss-patch';
-export declare function collectTailwindTokens(patcher: unknown): Promise<TailwindTokenReport>;
-export declare function formatTokenLine(entry: TailwindTokenReport['entries'][number]): string;
-export declare function logTokenPreview(report: TailwindTokenReport, format: string, groupKey: 'relative' | 'absolute'): void;

package/dist/cli/workspace/package-dirs.d.ts

@@ -1,3 +0,0 @@
-import { tryReadJson } from './workspace-io';
-export declare function resolveWorkspacePackageDirs(workspaceRoot: string): Promise<string[]>;
-export { tryReadJson };

package/dist/cli/workspace/patch-package.d.ts

@@ -1,3 +0,0 @@
-import type { WorkspacePatchOptions, WorkspacePatchResult } from './types';
-export declare function patchWorkspacePackage(workspaceRoot: string, dir: string, pkgName: string | undefined, options: WorkspacePatchOptions): Promise<WorkspacePatchResult>;
-export { summarizeWorkspaceResults } from './patch-utils';

package/dist/cli/workspace/patch-utils.d.ts

@@ -1,3 +0,0 @@
-import type { WorkspacePatchResult } from './types';
-export declare function formatDisplayName(workspaceRoot: string, dir: string, name?: string): string;
-export declare function summarizeWorkspaceResults(results: WorkspacePatchResult[]): void;

package/dist/cli/workspace/types.d.ts

@@ -1,11 +0,0 @@
-export interface WorkspacePatchOptions {
-    cwd: string | undefined;
-    clearCache?: boolean;
-    recordTarget?: boolean;
-}
-export interface WorkspacePatchResult {
-    dir: string;
-    name?: string;
-    status: 'patched' | 'skipped' | 'failed';
-    message?: string;
-}

package/dist/cli/workspace/workspace-globs.d.ts

@@ -1,2 +0,0 @@
-export declare function parseWorkspaceGlobsFromPackageJson(workspaceRoot: string): string[];
-export declare function parseWorkspaceGlobsFromWorkspaceFile(workspaceRoot: string): string[];

package/dist/cli/workspace/workspace-io.d.ts

@@ -1 +0,0 @@
-export declare function tryReadJson<T extends Record<string, any>>(file: string): T | undefined;

package/dist/cli/workspace/workspace-lock.d.ts

@@ -1 +0,0 @@
-export declare function parseImportersFromLock(workspaceRoot: string): string[];

package/dist/cli/workspace.d.ts

@@ -1,2 +0,0 @@
-import type { WorkspacePatchOptions } from './workspace/types';
-export declare function patchWorkspace(options: WorkspacePatchOptions): Promise<void>;

package/dist/js/syntax.d.ts

@@ -1,10 +0,0 @@
-export interface DetectSyntaxOptions {
-    stripComments?: boolean;
-}
-export declare function hasESMSyntax(code: string, opts?: DetectSyntaxOptions): boolean;
-export declare function hasCJSSyntax(code: string, opts?: DetectSyntaxOptions): boolean;
-export declare function detectSyntax(code: string, opts?: DetectSyntaxOptions): {
-    hasESM: boolean;
-    hasCJS: boolean;
-    isMixed: boolean;
-};