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

package/dist/index.js

@@ -3,7 +3,7 @@ const require_generator = require("./generator-BtpQoQEH.js");
 const require_gulp = require("./gulp.js");
 const require_postcss = require("./postcss-DSvNrY0J.js");
 const require_vite = require("./vite-CMzi0wR2.js");
-const require_webpack = require("./webpack-2v1sQKyZ.js");
+const require_webpack = require("./webpack-DPF0Iabe.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -2,6 +2,6 @@ import { t as createWeappTailwindcssGenerator } from "./generator-CmLpVJgw.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
 import { t as weappTailwindcssPostcssPlugin } from "./postcss-DGprmeke.mjs";
 import { t as WeappTailwindcss } from "./vite-C8SUICPv.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-BiTMfrBW.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-BQ43oxhq.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

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

@@ -10,6 +10,7 @@ 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-2v1sQKyZ.js → webpack-DPF0Iabe.js}

@@ -14,6 +14,8 @@ let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
+let micromatch = require("micromatch");
+micromatch = require_chunk.__toESM(micromatch);
 //#region src/shared/tailwindcss-css-redirect.ts
 const moduleWithMutableResolve = node_module.default;
 const patched = /* @__PURE__ */ new WeakSet();
@@ -682,27 +684,56 @@ function setupWebpackV5Loaders(options) {
 require_precheck.init_defineProperty();
 const debug = require_v3_engine.createDebug();
 const weappTailwindcssPackageDir = require_bundle_state.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 = node_path.default.resolve(file);
+		if (resolvedFile === ignoredPath || resolvedFile.startsWith(`${ignoredPath}${node_path.default.sep}`)) return true;
+		const normalizedFile = file.replace(/\\/g, "/");
+		return ignoredList.some((item) => {
+			if (typeof item === "string") {
+				const resolvedItem = node_path.default.resolve(item);
+				if (resolvedFile === resolvedItem || resolvedFile.startsWith(`${resolvedItem}${node_path.default.sep}`)) return true;
+				return micromatch.default.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" && node_path.default.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 ? node_path.default.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 ? node_path.default.resolve(outputPath) : void 0)) return;
+		const watchOptions = compiler.watching?.watchOptions;
+		if (watchOptions) appendOutputIgnoredPath(watchOptions);
+	};
+	compiler.hooks.watchRun?.tap(require_precheck.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-DPF0Iabe.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-BQ43oxhq.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.36",
+  "version": "5.0.0-next.37",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -184,11 +184,11 @@
     "semver": "~7.8.1",
     "tailwindcss-patch": "9.4.1",
     "yaml": "^2.9.0",
+    "@weapp-tailwindcss/logger": "2.0.0-next.0",
+    "tailwindcss-config": "2.0.0-next.3",
     "@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"
+    "@weapp-tailwindcss/reset": "0.1.1-next.1"
   },
   "devDependencies": {
     "@vue/compiler-dom": "^3.5.35",