weapp-tailwindcss 5.0.0-next.17 → 5.0.0-next.19

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

@@ -1,23 +1,9 @@
-const require_postcss = require("./postcss-CZE8k8oP.js");
+const require_runtime_registry = require("./runtime-registry-D5qnaSpo.js");
 let node_buffer = require("node:buffer");
 let node_process = require("node:process");
-node_process = require_postcss.__toESM(node_process);
+node_process = require_runtime_registry.__toESM(node_process);
 let loader_utils = require("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
+loader_utils = require_runtime_registry.__toESM(loader_utils);
 //#region src/bundlers/webpack/loaders/weapp-tw-runtime-classset-loader.ts
 function isPromiseLike(value) {
 	return Boolean(value && typeof value.then === "function");
@@ -34,8 +20,8 @@ function shouldCleanRuntimeCss(css) {
 	return css.includes("@layer") || css.includes("@theme");
 }
 function cleanRuntimeCss(css) {
-	const root = require_postcss.postcss_default.parse(css);
-	removeUnsupportedCascadeLayers(root);
+	const root = require_runtime_registry.postcss_default.parse(css);
+	require_runtime_registry.removeUnsupportedCascadeLayers(root);
 	removeUnsupportedThemeKeyframes(root);
 	return root.toString();
 }
@@ -48,7 +34,8 @@ function removeUnsupportedThemeKeyframes(root) {
 }
 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`);
-	const opt = getLoaderOptions(this);
+	const rawOptions = getLoaderOptions(this);
+	const opt = require_runtime_registry.getWebpackLoaderRuntime(rawOptions?.weappTailwindcssRuntimeKey)?.classSet ?? rawOptions;
 	const maybePromise = opt?.getClassSet?.();
 	const applyWatchDependencies = (dependencies) => {
 		for (const file of dependencies?.files ?? []) this.addDependency?.(file);

package/dist/{webpack-BkBoEn4k.mjs → webpack-BY-mkkMS.mjs}

@@ -1,9 +1,9 @@
-import { F as createDebug, l as getRuntimeClassSetSignature, z as resolveTailwindcssOptions } from "./v3-engine-CCxDqZ8e.mjs";
-import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-DC0RsBbK.mjs";
-import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-CX-5VqM1.mjs";
+import { G as resolveTailwindcssOptions, V as createDebug, l as getRuntimeClassSetSignature } from "./v3-engine-DHsPM4ye.mjs";
+import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-Cwq1Wbo2.mjs";
+import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-Bbcmh24Z.mjs";
 import { r as getGroupedEntries } from "./utils-CGBVVNm6.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-D74Wk4ys.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-YW-zLcsc.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-P0OQvEif.mjs";
+import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-u4DFiZEj.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -264,7 +264,7 @@ function createWebpackSnapshotAssets(assets) {
 	}));
 }
 function setupWebpackV5ProcessAssetsHook(options) {
-	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
+	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
@@ -352,7 +352,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
 			let runtimeSet;
-			if (isWatchMode?.() === true && runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) {
+			const watchMode = isWatchMode?.() === true;
+			if (watchMode && runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) {
 				const snapshot = buildBundleSnapshot(createWebpackSnapshotAssets(assets), compilerOptions, outputDir, bundleBuildState);
 				if (!webpackWatchRuntimeScanInitialized) {
 					for (const entry of snapshot.entries) if (entry.type === "html" || entry.type === "js") snapshot.runtimeAffectingChangedByType[entry.type].add(entry.file);
@@ -378,7 +379,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				}
 				runtimeSet = await ensureRuntimeClassSet(runtimeState, {
 					forceRefresh: forceRuntimeRefresh,
-					forceCollect: true,
+					forceCollect: !watchMode || forceRuntimeRefresh,
 					clearCache: forceRuntimeRefresh,
 					allowEmpty: false
 				});
@@ -463,6 +464,28 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			if (Array.isArray(groupedEntries.css)) for (const element of groupedEntries.css) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
+				if (isWebpackProcessedCssAsset?.(file, rawSource)) {
+					const nextCss = stripBundlerGeneratedCssMarkers(rawSource);
+					tasks.push(processCachedTask({
+						cache: compilerOptions.cache,
+						cacheKey: file,
+						hashKey: `${file}:asset`,
+						rawSource,
+						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash),
+						applyResult(source) {
+							compilation.updateAsset(file, source);
+						},
+						onCacheHit() {
+							debug("css webpack-loader-pipeline cache hit: %s", file);
+						},
+						transform: async () => {
+							compilerOptions.onUpdate(file, rawSource, nextCss);
+							debug("css skip webpack-loader-pipeline asset: %s", file);
+							return { result: new ConcatSource(nextCss) };
+						}
+					}));
+					continue;
+				}
 				const cacheKey = file;
 				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(processCachedTask({
@@ -514,6 +537,13 @@ const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
 //#endregion
+//#region src/bundlers/webpack/loaders/runtime-registry.ts
+const runtimeRegistryHolder = globalThis;
+const runtimeRegistry = runtimeRegistryHolder.__WEAPP_TW_WEBPACK_LOADER_RUNTIME_REGISTRY__ ?? (runtimeRegistryHolder.__WEAPP_TW_WEBPACK_LOADER_RUNTIME_REGISTRY__ = /* @__PURE__ */ new Map());
+function setWebpackLoaderRuntime(key, entry) {
+	runtimeRegistry.set(key, entry);
+}
+//#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";
@@ -544,7 +574,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, runtimeState, getClassSetInLoader, getRuntimeSetInLoader, markWebpackProcessedCssSource, getRuntimeWatchDependencies, runtimeRegistryKey = `weapp-tailwindcss-${Date.now()}-${Math.random().toString(36).slice(2)}`, debug } = options;
 	const isMpxApp = isMpx(appType);
 	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
@@ -553,19 +583,26 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
+		compilerOptions,
+		runtimeState,
 		...appType === void 0 ? {} : { appType },
-		...registerAutoCssSource === void 0 ? {} : { registerCssSource: registerAutoCssSource }
+		...registerAutoCssSource === void 0 ? {} : { registerCssSource: registerAutoCssSource },
+		getRuntimeSet: getRuntimeSetInLoader,
+		...markWebpackProcessedCssSource === void 0 ? {} : { markGeneratedCssSource: markWebpackProcessedCssSource }
 	} : void 0;
-	const classSetLoaderOptions = {
-		getClassSet: getClassSetInLoader,
-		getWatchDependencies: getRuntimeWatchDependencies
-	};
+	setWebpackLoaderRuntime(runtimeRegistryKey, {
+		classSet: {
+			getClassSet: getClassSetInLoader,
+			getWatchDependencies: getRuntimeWatchDependencies
+		},
+		...runtimeLoaderRewriteOptions === void 0 ? {} : { cssImportRewrite: runtimeLoaderRewriteOptions }
+	});
 	const { findRewriteAnchor, findClassSetAnchor } = createLoaderAnchorFinders(appType);
-	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewrite: runtimeLoaderRewriteOptions } : void 0;
+	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewriteRuntimeKey: runtimeRegistryKey } : void 0;
 	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
 	const createRuntimeClassSetLoaderEntry = () => ({
 		loader: runtimeClassSetLoader,
-		options: classSetLoaderOptions,
+		options: { weappTailwindcssRuntimeKey: runtimeRegistryKey },
 		ident: null,
 		type: null
 	});
@@ -666,6 +703,7 @@ var UnifiedWebpackPluginV5 = class {
 		let watchRunObserved = false;
 		const runtimeWatchDependencyFiles = /* @__PURE__ */ new Set();
 		const runtimeWatchDependencyContexts = /* @__PURE__ */ new Set();
+		const webpackProcessedCssSourceFiles = /* @__PURE__ */ new Set();
 		let runtimeMetadataPrepared = false;
 		const updateRuntimeWatchDependencies = async () => {
 			runtimeWatchDependencyFiles.clear();
@@ -724,6 +762,9 @@ var UnifiedWebpackPluginV5 = class {
 			});
 			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
 		};
+		const markWebpackProcessedCssSource = (file) => {
+			webpackProcessedCssSourceFiles.add(path.resolve(file));
+		};
 		compiler.hooks.invalid?.tap?.(pluginName, (fileName) => {
 			if (!fileName) return;
 			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([path.resolve(fileName)]);
@@ -747,6 +788,10 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeSetSignature = signature;
 			runtimeRefreshRequiredForCompilation = false;
 		}
+		async function getRuntimeSetInLoader() {
+			await getClassSetInLoader();
+			return ensureRuntimeClassSet(runtimeState, { allowEmpty: true });
+		}
 		onLoad();
 		setupWebpackV5Loaders({
 			compiler,
@@ -756,7 +801,10 @@ var UnifiedWebpackPluginV5 = class {
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
 			registerAutoCssSource,
+			runtimeState,
 			getClassSetInLoader,
+			getRuntimeSetInLoader,
+			markWebpackProcessedCssSource,
 			getRuntimeWatchDependencies() {
 				return {
 					files: runtimeWatchDependencyFiles,
@@ -772,6 +820,9 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeState,
 			getRuntimeRefreshRequirement: () => runtimeRefreshRequiredForCompilation,
 			refreshRuntimeMetadata: ensureRuntimeMetadata,
+			isWebpackProcessedCssAsset(file, rawSource) {
+				return webpackProcessedCssSourceFiles.has(path.resolve(file)) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
+			},
 			consumeRuntimeRefreshRequirement() {
 				runtimeRefreshRequiredForCompilation = false;
 			},

package/dist/{webpack-SxEdWHlL.js → webpack-cMf0bWIS.js}

@@ -1,10 +1,10 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-BRInt2DS.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CfznDtJ0.js");
-const require_precheck = require("./precheck-CZfnh4T6.js");
+const require_v3_engine = require("./v3-engine-DpaX1FqH.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BMo8s7do.js");
+const require_precheck = require("./precheck-CTRQCNuH.js");
 const require_utils = require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-BVoa7vx-.js");
-const require_bundle_state = require("./bundle-state-DDgxuERW.js");
+const require_tailwindcss = require("./tailwindcss-DO30H8ux.js");
+const require_bundle_state = require("./bundle-state-C9G1XBp0.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
@@ -268,7 +268,7 @@ function createWebpackSnapshotAssets(assets) {
 	}));
 }
 function setupWebpackV5ProcessAssetsHook(options) {
-	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
+	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
 	const { ConcatSource } = sources;
 	const cssHandlerOptionsCache = /* @__PURE__ */ new Map();
@@ -356,7 +356,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
 			let runtimeSet;
-			if (isWatchMode?.() === true && runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) {
+			const watchMode = isWatchMode?.() === true;
+			if (watchMode && runtimeState.twPatcher.majorVersion === 4 && !forceRuntimeRefresh) {
 				const snapshot = require_bundle_state.buildBundleSnapshot(createWebpackSnapshotAssets(assets), compilerOptions, outputDir, bundleBuildState);
 				if (!webpackWatchRuntimeScanInitialized) {
 					for (const entry of snapshot.entries) if (entry.type === "html" || entry.type === "js") snapshot.runtimeAffectingChangedByType[entry.type].add(entry.file);
@@ -382,7 +383,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				}
 				runtimeSet = await require_precheck.ensureRuntimeClassSet(runtimeState, {
 					forceRefresh: forceRuntimeRefresh,
-					forceCollect: true,
+					forceCollect: !watchMode || forceRuntimeRefresh,
 					clearCache: forceRuntimeRefresh,
 					allowEmpty: false
 				});
@@ -467,6 +468,28 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			if (Array.isArray(groupedEntries.css)) for (const element of groupedEntries.css) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
+				if (isWebpackProcessedCssAsset?.(file, rawSource)) {
+					const nextCss = require_bundle_state.stripBundlerGeneratedCssMarkers(rawSource);
+					tasks.push(require_incremental_runtime_class_set.processCachedTask({
+						cache: compilerOptions.cache,
+						cacheKey: file,
+						hashKey: `${file}:asset`,
+						rawSource,
+						hash: createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash),
+						applyResult(source) {
+							compilation.updateAsset(file, source);
+						},
+						onCacheHit() {
+							debug("css webpack-loader-pipeline cache hit: %s", file);
+						},
+						transform: async () => {
+							compilerOptions.onUpdate(file, rawSource, nextCss);
+							debug("css skip webpack-loader-pipeline asset: %s", file);
+							return { result: new ConcatSource(nextCss) };
+						}
+					}));
+					continue;
+				}
 				const cacheKey = file;
 				const runtimeAwareHash = createRuntimeAwareCssHash(assetHashByChunk.get(file), compilerOptions.cache.computeHash(rawSource), runtimeSetHash);
 				tasks.push(require_incremental_runtime_class_set.processCachedTask({
@@ -513,6 +536,13 @@ function setupWebpackV5ProcessAssetsHook(options) {
 	});
 }
 //#endregion
+//#region src/bundlers/webpack/loaders/runtime-registry.ts
+const runtimeRegistryHolder = globalThis;
+const runtimeRegistry = runtimeRegistryHolder.__WEAPP_TW_WEBPACK_LOADER_RUNTIME_REGISTRY__ ?? (runtimeRegistryHolder.__WEAPP_TW_WEBPACK_LOADER_RUNTIME_REGISTRY__ = /* @__PURE__ */ new Map());
+function setWebpackLoaderRuntime(key, entry) {
+	runtimeRegistry.set(key, entry);
+}
+//#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";
@@ -543,7 +573,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, runtimeState, getClassSetInLoader, getRuntimeSetInLoader, markWebpackProcessedCssSource, getRuntimeWatchDependencies, runtimeRegistryKey = `weapp-tailwindcss-${Date.now()}-${Math.random().toString(36).slice(2)}`, 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");
@@ -552,19 +582,26 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? node_fs.default.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
+		compilerOptions,
+		runtimeState,
 		...appType === void 0 ? {} : { appType },
-		...registerAutoCssSource === void 0 ? {} : { registerCssSource: registerAutoCssSource }
+		...registerAutoCssSource === void 0 ? {} : { registerCssSource: registerAutoCssSource },
+		getRuntimeSet: getRuntimeSetInLoader,
+		...markWebpackProcessedCssSource === void 0 ? {} : { markGeneratedCssSource: markWebpackProcessedCssSource }
 	} : void 0;
-	const classSetLoaderOptions = {
-		getClassSet: getClassSetInLoader,
-		getWatchDependencies: getRuntimeWatchDependencies
-	};
+	setWebpackLoaderRuntime(runtimeRegistryKey, {
+		classSet: {
+			getClassSet: getClassSetInLoader,
+			getWatchDependencies: getRuntimeWatchDependencies
+		},
+		...runtimeLoaderRewriteOptions === void 0 ? {} : { cssImportRewrite: runtimeLoaderRewriteOptions }
+	});
 	const { findRewriteAnchor, findClassSetAnchor } = createLoaderAnchorFinders(appType);
-	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewrite: runtimeLoaderRewriteOptions } : void 0;
+	const cssImportRewriteLoaderOptions = runtimeLoaderRewriteOptions ? { tailwindcssImportRewriteRuntimeKey: runtimeRegistryKey } : void 0;
 	if (runtimeCssImportRewriteLoader && shouldRewriteCssImports && cssImportRewriteLoaderOptions && isMpxApp) injectMpxCssRewritePreRules(compiler, runtimeCssImportRewriteLoader, cssImportRewriteLoaderOptions);
 	const createRuntimeClassSetLoaderEntry = () => ({
 		loader: runtimeClassSetLoader,
-		options: classSetLoaderOptions,
+		options: { weappTailwindcssRuntimeKey: runtimeRegistryKey },
 		ident: null,
 		type: null
 	});
@@ -665,6 +702,7 @@ var UnifiedWebpackPluginV5 = class {
 		let watchRunObserved = false;
 		const runtimeWatchDependencyFiles = /* @__PURE__ */ new Set();
 		const runtimeWatchDependencyContexts = /* @__PURE__ */ new Set();
+		const webpackProcessedCssSourceFiles = /* @__PURE__ */ new Set();
 		let runtimeMetadataPrepared = false;
 		const updateRuntimeWatchDependencies = async () => {
 			runtimeWatchDependencyFiles.clear();
@@ -723,6 +761,9 @@ var UnifiedWebpackPluginV5 = class {
 			});
 			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
 		};
+		const markWebpackProcessedCssSource = (file) => {
+			webpackProcessedCssSourceFiles.add(node_path.default.resolve(file));
+		};
 		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, (fileName) => {
 			if (!fileName) return;
 			runtimeRefreshRequiredForCompilation = runtimeRefreshRequiredForCompilation || hasRuntimeDependencyChanges([node_path.default.resolve(fileName)]);
@@ -746,6 +787,10 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeSetSignature = signature;
 			runtimeRefreshRequiredForCompilation = false;
 		}
+		async function getRuntimeSetInLoader() {
+			await getClassSetInLoader();
+			return require_precheck.ensureRuntimeClassSet(runtimeState, { allowEmpty: true });
+		}
 		onLoad();
 		setupWebpackV5Loaders({
 			compiler,
@@ -755,7 +800,10 @@ var UnifiedWebpackPluginV5 = class {
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
 			registerAutoCssSource,
+			runtimeState,
 			getClassSetInLoader,
+			getRuntimeSetInLoader,
+			markWebpackProcessedCssSource,
 			getRuntimeWatchDependencies() {
 				return {
 					files: runtimeWatchDependencyFiles,
@@ -771,6 +819,9 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeState,
 			getRuntimeRefreshRequirement: () => runtimeRefreshRequiredForCompilation,
 			refreshRuntimeMetadata: ensureRuntimeMetadata,
+			isWebpackProcessedCssAsset(file, rawSource) {
+				return webpackProcessedCssSourceFiles.has(node_path.default.resolve(file)) || rawSource.includes("weapp-tailwindcss webpack-generated-css");
+			},
 			consumeRuntimeRefreshRequirement() {
 				runtimeRefreshRequiredForCompilation = false;
 			},

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-SxEdWHlL.js");
+const require_webpack = require("./webpack-cMf0bWIS.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-BkBoEn4k.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-BY-mkkMS.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.17",
+  "version": "5.0.0-next.19",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -186,14 +186,14 @@
     "magic-string": "0.30.21",
     "micromatch": "^4.0.8",
     "postcss-load-config": "^6.0.1",
-    "semver": "~7.8.0",
-    "tailwindcss-patch": "9.3.5",
+    "semver": "~7.8.1",
+    "tailwindcss-patch": "9.3.7",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/postcss": "2.2.1-next.3",
+    "@weapp-tailwindcss/postcss": "2.2.1-next.4",
     "@weapp-tailwindcss/reset": "0.1.1-next.0",
     "@weapp-tailwindcss/shared": "1.1.3",
-    "@weapp-tailwindcss/logger": "1.1.0",
-    "tailwindcss-config": "1.1.6-next.1"
+    "tailwindcss-config": "1.1.6-next.1",
+    "@weapp-tailwindcss/logger": "1.1.0"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",