weapp-tailwindcss 5.0.0-next.32 → 5.0.0-next.35

package/dist/{webpack-xxmiRxcy.mjs → webpack-pdpdIv_X.mjs}

@@ -1,10 +1,10 @@
-import { b as ensureRuntimeClassSet, d as _defineProperty, f as init_defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-nITnYBDn.mjs";
-import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-C_KeUQG3.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CpsHA4Wd.mjs";
-import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-D2fsgk5t.mjs";
+import { b as ensureRuntimeClassSet, d as _defineProperty, f as init_defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-nPDKYr8V.mjs";
+import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-BYcGCWUY.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CmLpVJgw.mjs";
+import { d as removeTailwindSourceDirectives, i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-W61zZU00.mjs";
 import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-udhXxMX9.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-BIsgsoNW.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-D6zEhnyE.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-Bsr05EFW.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import process from "node:process";
@@ -264,6 +264,10 @@ function createWebpackSnapshotAssets(assets) {
 		}];
 	}));
 }
+function stringifyWebpackSource(source) {
+	if (typeof source === "string") return source;
+	return source?.toString() ?? "";
+}
 function setupWebpackV5ProcessAssetsHook(options) {
 	const { compiler, options: compilerOptions, appType, runtimeState, getRuntimeRefreshRequirement, refreshRuntimeMetadata, isWebpackProcessedCssAsset, consumeRuntimeRefreshRequirement, isWatchMode, runtimeClassSetManager, debug } = options;
 	const { Compilation, sources } = compiler.webpack;
@@ -285,6 +289,22 @@ function setupWebpackV5ProcessAssetsHook(options) {
 			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 getCurrentAssetSource = (file) => {
+				const asset = compilation.getAsset(file);
+				if (!asset) return;
+				return stringifyWebpackSource(asset.source.source());
+			};
+			const updateAssetIfChanged = (file, source, { notifyUpdate = true } = {}) => {
+				const nextSource = stringifyWebpackSource(source.source());
+				const previousSource = getCurrentAssetSource(file);
+				if (previousSource === nextSource) {
+					debug("asset unchanged, skip update: %s", file);
+					return false;
+				}
+				compilation.updateAsset(file, source);
+				if (notifyUpdate) compilerOptions.onUpdate(file, previousSource ?? "", nextSource);
+				return true;
+			};
 			const entries = Object.entries(assets);
 			const compilerOutputPath = compilation.compiler?.outputPath ?? compiler.outputPath;
 			const outputDir = compilerOutputPath ? path.resolve(compilerOutputPath) : compilation.outputOptions?.path ?? process.cwd();
@@ -317,12 +337,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					const asset = compilation.getAsset(assetName);
 					if (!asset) continue;
 					const previousSource = asset.source.source();
-					const previous = typeof previousSource === "string" ? previousSource : previousSource.toString();
-					if (previous === code) continue;
-					const source = new ConcatSource(code);
-					compilation.updateAsset(assetName, source);
-					compilerOptions.onUpdate(assetName, previous, code);
-					debug("js linked handle: %s", assetName);
+					if ((typeof previousSource === "string" ? previousSource : previousSource.toString()) === code) continue;
+					if (updateAssetIfChanged(assetName, new ConcatSource(code))) debug("js linked handle: %s", assetName);
 				}
 			};
 			const groupedEntries = getGroupedEntries(entries, compilerOptions);
@@ -351,6 +367,9 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				cssUserHandlerOptionsCache.set(cacheKey, created);
 				return created;
 			};
+			const finalizeCssAssetSource = (source) => {
+				return removeTailwindSourceDirectives(stripBundlerGeneratedCssMarkers(source), { importFallback: true });
+			};
 			const forceRuntimeRefresh = getRuntimeRefreshRequirement();
 			debug("processAssets ensure runtime set forceRefresh=%s major=%s", forceRuntimeRefresh, runtimeState.twPatcher.majorVersion ?? "unknown");
 			let runtimeSet;
@@ -403,16 +422,14 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					hashKey: `${file}:asset`,
 					rawSource,
 					hash: chunkHash,
-					applyResult(source) {
-						compilation.updateAsset(file, source);
+					applyResult(source, { cacheHit }) {
+						updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 					},
 					onCacheHit() {
 						debug("html cache hit: %s", file);
 					},
 					transform: async () => {
-						const wxml = await compilerOptions.templateHandler(rawSource, defaultTemplateHandlerOptions);
-						const source = new ConcatSource(wxml);
-						compilerOptions.onUpdate(file, rawSource, wxml);
+						const source = new ConcatSource(await compilerOptions.templateHandler(rawSource, defaultTemplateHandlerOptions));
 						debug("html handle: %s", file);
 						return { result: source };
 					}
@@ -434,8 +451,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 						hashKey: `${file}:asset`,
 						rawSource: initialRawSource,
 						hash: chunkHash,
-						applyResult(source) {
-							compilation.updateAsset(file, source);
+						applyResult(source, { cacheHit }) {
+							updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 						},
 						onCacheHit() {
 							debug("js cache hit: %s", file);
@@ -455,7 +472,6 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							})) return { result: new ConcatSource(currentSource) };
 							const { code, linked } = await compilerOptions.jsHandler(currentSource, runtimeSet, handlerOptions);
 							const source = new ConcatSource(code);
-							compilerOptions.onUpdate(file, currentSource, code);
 							debug("js handle: %s", file);
 							applyLinkedResults(linked);
 							return { result: source };
@@ -467,21 +483,20 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				const [file, originalSource] = element;
 				const rawSource = originalSource.source().toString();
 				if (isWebpackProcessedCssAsset?.(file, rawSource)) {
-					const nextCss = stripBundlerGeneratedCssMarkers(rawSource);
+					const nextCss = finalizeCssAssetSource(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);
+						applyResult(source, { cacheHit }) {
+							updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 						},
 						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) };
 						}
@@ -496,8 +511,8 @@ function setupWebpackV5ProcessAssetsHook(options) {
 					hashKey: `${file}:asset`,
 					rawSource,
 					hash: runtimeAwareHash,
-					applyResult(source) {
-						compilation.updateAsset(file, source);
+					applyResult(source, { cacheHit }) {
+						updateAssetIfChanged(file, source, { notifyUpdate: !cacheHit });
 					},
 					onCacheHit() {
 						debug("css cache hit: %s", file);
@@ -516,9 +531,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 							styleHandler: compilerOptions.styleHandler,
 							debug
 						});
-						const css = generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css;
-						const source = new ConcatSource(css);
-						compilerOptions.onUpdate(file, rawSource, css);
+						const source = new ConcatSource(finalizeCssAssetSource(generated?.css ?? (await compilerOptions.styleHandler(rawSource, cssHandlerOptions)).css));
 						if (generated) debug("css handle via tailwind v%s engine(%s): %s", runtimeState.twPatcher.majorVersion, generated.target, file);
 						else debug("css handle: %s", file);
 						return { result: source };
@@ -670,6 +683,28 @@ function setupWebpackV5Loaders(options) {
 init_defineProperty();
 const debug = createDebug();
 const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
+function normalizeIgnoredList(ignored) {
+	if (Array.isArray(ignored)) return ignored;
+	return ignored == null ? [] : [ignored];
+}
+function appendIgnoredPath(ignored, ignoredPath) {
+	const ignoredList = normalizeIgnoredList(ignored);
+	if (ignoredList.some((item) => typeof item === "string" && path.resolve(item) === ignoredPath)) return ignored;
+	return [...ignoredList, ignoredPath];
+}
+function setupWebpackWatchOutputIgnore(compiler) {
+	const originalWatch = compiler.watch?.bind(compiler);
+	if (typeof originalWatch !== "function") return;
+	compiler.watch = ((watchOptions, handler) => {
+		const outputPath = compiler.outputPath || compiler.options?.output?.path;
+		const outputDir = outputPath ? path.resolve(outputPath) : void 0;
+		if (!outputDir) return originalWatch(watchOptions, handler);
+		return originalWatch({
+			...watchOptions,
+			ignored: appendIgnoredPath(watchOptions.ignored, outputDir)
+		}, handler);
+	});
+}
 /**
 * @name WeappTailwindcss
 * @description webpack5 核心转义插件
@@ -697,6 +732,7 @@ var WeappTailwindcss = class {
 		const isMpxApp = isMpx(this.appType);
 		if (shouldRewriteCssImports) setupMpxTailwindcssRedirect(weappTailwindcssPackageDir, isMpxApp);
 		if (disabledOptions.plugin) return;
+		setupWebpackWatchOutputIgnore(compiler);
 		const runtimeState = {
 			twPatcher: initialTwPatcher,
 			readyPromise: createTailwindRuntimeReadyPromise(initialTwPatcher),

package/dist/webpack.js

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

package/dist/webpack.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.32",
+  "version": "5.0.0-next.35",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -182,13 +182,13 @@
     "micromatch": "^4.0.8",
     "postcss-load-config": "^6.0.1",
     "semver": "~7.8.1",
-    "tailwindcss-patch": "9.3.7",
+    "tailwindcss-patch": "9.4.1",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0-next.0",
-    "@weapp-tailwindcss/reset": "0.1.1-next.1",
-    "@weapp-tailwindcss/postcss": "3.0.0-next.8",
-    "tailwindcss-config": "2.0.0-next.2",
-    "@weapp-tailwindcss/shared": "2.0.0-next.0"
+    "@weapp-tailwindcss/shared": "2.0.0-next.1",
+    "tailwindcss-config": "2.0.0-next.3",
+    "@weapp-tailwindcss/postcss": "3.0.0-next.9",
+    "@weapp-tailwindcss/reset": "0.1.1-next.1"
   },
   "devDependencies": {
     "@vue/compiler-dom": "^3.5.35",