weapp-tailwindcss 5.0.0-next.36 → 5.0.0-next.38

package/dist/{webpack-BiTMfrBW.mjs → webpack-DFlZcqAU.mjs}

@@ -1,15 +1,16 @@
-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 { 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-BrNwLG2e.mjs";
+import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-DCxNPBVs.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-B76ovqsv.mjs";
+import { d as removeTailwindSourceDirectives, i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-x10M9bn_.mjs";
 import { r as getGroupedEntries } from "./utils-DsaS975I.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 { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DWtPieNE.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-CnaJxkFY.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import process from "node:process";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import micromatch from "micromatch";
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = Module;
 const patched = /* @__PURE__ */ new WeakSet();
@@ -683,27 +684,56 @@ function setupWebpackV5Loaders(options) {
 init_defineProperty();
 const debug = createDebug();
 const weappTailwindcssPackageDir = resolvePackageDir("weapp-tailwindcss");
+const outputIgnoredPredicatePath = Symbol("weapp-tailwindcss.outputIgnoredPredicatePath");
 function normalizeIgnoredList(ignored) {
-	if (Array.isArray(ignored)) return ignored;
-	return ignored == null ? [] : [ignored];
+	if (Array.isArray(ignored)) return ignored.filter((item) => typeof item === "string" || item instanceof RegExp || typeof item === "function");
+	if (typeof ignored === "string" || ignored instanceof RegExp || typeof ignored === "function") return [ignored];
+	return [];
+}
+function createOutputIgnoredPredicate(ignoredList, ignoredPath) {
+	const predicate = (file) => {
+		const resolvedFile = path.resolve(file);
+		if (resolvedFile === ignoredPath || resolvedFile.startsWith(`${ignoredPath}${path.sep}`)) return true;
+		const normalizedFile = file.replace(/\\/g, "/");
+		return ignoredList.some((item) => {
+			if (typeof item === "string") {
+				const resolvedItem = path.resolve(item);
+				if (resolvedFile === resolvedItem || resolvedFile.startsWith(`${resolvedItem}${path.sep}`)) return true;
+				return micromatch.isMatch(normalizedFile, item);
+			}
+			if (item instanceof RegExp) return item.test(normalizedFile);
+			return item(file);
+		});
+	};
+	predicate[outputIgnoredPredicatePath] = ignoredPath;
+	return predicate;
 }
 function appendIgnoredPath(ignored, ignoredPath) {
+	if (typeof ignored === "function" && ignored[outputIgnoredPredicatePath] === ignoredPath) return ignored;
 	const ignoredList = normalizeIgnoredList(ignored);
+	if (ignoredList.some((item) => typeof item !== "string")) return createOutputIgnoredPredicate(ignoredList, ignoredPath);
 	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 appendOutputIgnoredPath = (watchOptions) => {
 		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);
-	});
+		if (!outputDir) return watchOptions;
+		if (watchOptions && typeof watchOptions === "object") {
+			watchOptions.ignored = appendIgnoredPath(watchOptions.ignored, outputDir);
+			return watchOptions;
+		}
+		return { ignored: appendIgnoredPath(void 0, outputDir) };
+	};
+	compiler.options.watchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
+	const syncOutputIgnoredPath = () => {
+		const outputPath = compiler.outputPath || compiler.options?.output?.path;
+		if (!(outputPath ? path.resolve(outputPath) : void 0)) return;
+		const watchOptions = compiler.watching?.watchOptions;
+		if (watchOptions) appendOutputIgnoredPath(watchOptions);
+	};
+	compiler.hooks.watchRun?.tap(pluginName, syncOutputIgnoredPath);
 }
 /**
 * @name WeappTailwindcss

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-2v1sQKyZ.js");
+const require_webpack = require("./webpack-Ccohlg3A.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-BiTMfrBW.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-DFlZcqAU.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/dist/wxml/utils/codegen/legacy-visitor.d.ts

@@ -1,8 +1,6 @@
-import type { StringLiteral } from '@babel/types';
+import type { TraverseOptions } from '@babel/traverse';
 import type { JsTokenUpdater } from '../../../js/JsTokenUpdater';
 import type { ITemplateHandlerOptions } from '../../../types';
-import * as t from '@babel/types';
-export declare function createLegacyTraverseOptions(options: ITemplateHandlerOptions, jsTokenUpdater: JsTokenUpdater): {
-    StringLiteral(this: t.Node, path: import("@babel/traverse").NodePath<StringLiteral>): void;
+export declare function createLegacyTraverseOptions(options: ITemplateHandlerOptions, jsTokenUpdater: JsTokenUpdater): TraverseOptions & {
     noScope: true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.36",
+  "version": "5.0.0-next.38",
   "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.4.1",
+    "tailwindcss-patch": "9.4.2",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/postcss": "3.0.0-next.10",
-    "@weapp-tailwindcss/shared": "2.0.0-next.1",
-    "@weapp-tailwindcss/reset": "0.1.1-next.1",
     "@weapp-tailwindcss/logger": "2.0.0-next.0",
-    "tailwindcss-config": "2.0.0-next.3"
+    "tailwindcss-config": "2.0.0-next.3",
+    "@weapp-tailwindcss/reset": "0.1.1-next.1",
+    "@weapp-tailwindcss/postcss": "3.0.0-next.10",
+    "@weapp-tailwindcss/shared": "2.0.0-next.1"
   },
   "devDependencies": {
     "@vue/compiler-dom": "^3.5.35",