weapp-tailwindcss 5.5.4 → 5.5.6

package/dist/{webpack-DOQ_3ViW.cjs → webpack-R2Sbggiy.cjs}

@@ -1,15 +1,15 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-RK2HtgOb.cjs");
-const require_tailwindcss = require("./tailwindcss-B03BGeTO.cjs");
+const require_generator = require("./generator-Bvr4WmuF.cjs");
+const require_tailwindcss = require("./tailwindcss-CBYjzRmV.cjs");
 const require_utils = require("./utils-CuKLf1Zv.cjs");
-const require_v4_generation_core = require("./v4-generation-core-BvW2aK23.cjs");
-const require_compiler = require("./compiler-DFROuh5Z.cjs");
+const require_v4_generation_core = require("./v4-generation-core-Cz1D7wm1.cjs");
+const require_compiler = require("./compiler-C8FqI-P3.cjs");
 const require_runtime_state = require("./runtime-state-XYSycuGu.cjs");
 const require_cache = require("./cache-CBJFB1HN.cjs");
-const require_hmr_timing = require("./hmr-timing-D45cTIzM.cjs");
-const require_scoped_generator = require("./scoped-generator-DccPwmJT.cjs");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-CnUlGWhP.cjs");
-const require_pipeline_helpers = require("./pipeline-helpers-BEhISt4D.cjs");
+const require_hmr_timing = require("./hmr-timing-CoiJIqDu.cjs");
+const require_scoped_generator = require("./scoped-generator-BUBls_oM.cjs");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-BtJZp28T.cjs");
+const require_pipeline_helpers = require("./pipeline-helpers-BOjTEmMi.cjs");
 const require_css_loader_runtime = require("./css-loader-runtime-DGqsWVua.cjs");
 const require_runtime_registry = require("./runtime-registry-BlIjpImP.cjs");
 let node_fs = require("node:fs");
@@ -186,7 +186,7 @@ function dirnameWebpackResourcePath(file) {
 	return node_path.default.dirname(file);
 }
 function resolveWebpackCssAssetModuleResource(resource, issuer, options) {
-	if (!isCssLikeModuleResource(resource, options.cssMatcher, options.appType)) return;
+	if (!isCssLikeModuleResource(resource, options.cssMatcher)) return;
 	const normalized = stripResourceQuery(resource);
 	if (!normalized) return;
 	const absoluteResource = resolveWebpackResourcePath(normalized);
@@ -642,7 +642,7 @@ async function processWebpackGeneratedCssAsset(element, context) {
 					for (const dependency of loaderGeneratedCss.dependencies) compilation.fileDependencies?.add?.(dependency);
 					const currentRawSourceWithoutBundlerMarkers = require_v4_generation_core.stripBundlerGeneratedCssMarkers(currentRawSource);
 					const currentAssetHasProcessedUrl = require_pipeline_helpers.hasProcessedCssAssetUrl(currentRawSourceWithoutBundlerMarkers) && currentRawSourceWithoutBundlerMarkers !== loaderGeneratedCss.css;
-					const currentAssetUserCss = currentAssetHasProcessedUrl ? currentRawSourceWithoutBundlerMarkers : require_pipeline_helpers.shouldUseWebpackAssetAsGeneratorUserCss(currentRawSourceWithoutBundlerMarkers, loaderGeneratedCss.css, { processed: true }) ? require_v4_generation_core.removeGeneratedSelectorCompatCss(currentRawSourceWithoutBundlerMarkers, loaderGeneratedCss.css) : void 0;
+					const currentAssetUserCss = currentAssetHasProcessedUrl ? currentRawSourceWithoutBundlerMarkers : require_pipeline_helpers.shouldUseWebpackAssetAsGeneratorUserCss(currentRawSourceWithoutBundlerMarkers, loaderGeneratedCss.css, { processed: true }) ? (0, _weapp_tailwindcss_postcss.removeGeneratedSelectorCompatCss)(currentRawSourceWithoutBundlerMarkers, loaderGeneratedCss.css) : void 0;
 					const loaderGeneratedCssWithoutMarkers = require_v4_generation_core.stripBundlerGeneratedCssMarkers(loaderGeneratedCss.css);
 					const currentAssetUserCssWithoutMarkers = currentAssetUserCss === void 0 ? "" : require_v4_generation_core.stripBundlerGeneratedCssMarkers(currentAssetUserCss);
 					const currentAssetMissingUserCss = !(currentAssetUserCssWithoutMarkers.trim().length > 0 && !require_generator.isCommentOnlyCss(currentAssetUserCssWithoutMarkers)) ? "" : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(currentAssetUserCssWithoutMarkers, loaderGeneratedCssWithoutMarkers);
@@ -655,7 +655,7 @@ async function processWebpackGeneratedCssAsset(element, context) {
 						return { result: new ConcatSource(finalizeTracedCss(userCss, cssHandlerOptions)) };
 					}
 					const mergedLoaderCss = currentAssetUserCss === void 0 ? loaderGeneratedCss.css : require_pipeline_helpers.createWebpackGeneratorUserCssSourceAppend({
-						css: currentAssetUserCss === void 0 ? loaderGeneratedCss.css : currentAssetHasProcessedUrl ? require_v4_generation_core.removeGeneratedSelectorCompatCss(loaderGeneratedCss.css, currentAssetUserCss) : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(currentAssetUserCss, loaderGeneratedCss.css),
+						css: currentAssetUserCss === void 0 ? loaderGeneratedCss.css : currentAssetHasProcessedUrl ? (0, _weapp_tailwindcss_postcss.removeGeneratedSelectorCompatCss)(loaderGeneratedCss.css, currentAssetUserCss) : (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(currentAssetUserCss, loaderGeneratedCss.css),
 						processed: true
 					}, currentAssetUserCss === void 0 ? void 0 : {
 						css: currentAssetUserCss,
@@ -1744,8 +1744,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 				debug
 			});
 			for (const [file, asset] of groupedEntries.css) {
-				const rawSource = compilation.getAsset(file)?.source.source() ?? asset.source();
-				const source = require_pipeline_helpers.stringifyWebpackSourceLike(rawSource);
+				const source = (compilation.getAsset(file)?.source.source() ?? asset.source()).toString();
 				updateAssetIfChanged(file, require_pipeline_helpers.finalizeWebpackCssAssetOutputSource(source, compilerOptions, isWebGeneratorTarget));
 			}
 		});
@@ -1961,7 +1960,7 @@ function addMpxWebpackPluginAlias(alias, pkgDir) {
 			}
 		];
 		const managedNames = new Set(entries.filter((entry) => typeof entry.name === "string").map((entry) => entry.name));
-		const managedPatterns = new Set(entries.filter((entry) => entry.name instanceof RegExp).map((entry) => `${entry.name.source}/${entry.name.flags}`));
+		const managedPatterns = new Set(entries.flatMap((entry) => entry.name instanceof RegExp ? [`${entry.name.source}/${entry.name.flags}`] : []));
 		for (let index = alias.length - 1; index >= 0; index--) {
 			const name = alias[index]?.name;
 			if (managedNames.has(name) || name instanceof RegExp && managedPatterns.has(`${name.source}/${name.flags}`)) alias.splice(index, 1);
@@ -2233,7 +2232,7 @@ function setupWebpackV5Loaders(options) {
 			const isLynxMainThreadCss = compilerOptions.platform === "lynx" && (module.layer === "react:main-thread" || loaderEntries.some((entry) => entry.loader?.includes?.("ignore-css-loader")));
 			let rewriteAnchorIdx = findRewriteAnchor(loaderEntries);
 			const classSetAnchorIdx = findClassSetAnchor(loaderEntries);
-			const isCssModule = isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher, appType);
+			const isCssModule = isCssLikeModuleResource(module.resource, compilerOptions.cssMatcher);
 			if (isCssModule) {
 				const frameworkPostcssOptions = require_v4_generation_core.collectFrameworkPostcssOptionsFromLoaderEntries(loaderEntries, _loaderContext);
 				if (frameworkPostcssOptions) require_v4_generation_core.captureResolvedFrameworkPostcssOptions(compilerOptions, frameworkPostcssOptions);
@@ -2264,7 +2263,7 @@ function setupWebpackV5Loaders(options) {
 			if (cssImportRewriteLoaderOptions && runtimeCssImportRewriteLoaderExists && runtimeCssImportRewriteLoader && isCssModule && !isLynxMainThreadCss) {
 				const existingIndex = loaderEntries.findIndex((entry) => entry.loader?.includes?.(runtimeCssImportRewriteLoader));
 				const existingOptions = existingIndex === -1 ? void 0 : loaderEntries[existingIndex]?.options;
-				const generateInRegisteredLoader = typeof existingOptions === "object" && existingOptions !== null && "generateCss" in existingOptions && existingOptions.generateCss === true;
+				const generateInRegisteredLoader = typeof existingOptions === "object" && existingOptions !== null && "generateCss" in existingOptions && existingOptions["generateCss"] === true;
 				const rewriteLoaderEntry = existingIndex !== -1 ? {
 					...loaderEntries.splice(existingIndex, 1)[0],
 					loader: runtimeCssImportRewriteLoader,
@@ -2331,6 +2330,7 @@ function appendIgnoredPath(ignored, ignoredPath) {
 	return createOutputIgnoredPredicate(normalizeIgnoredList(ignored), ignoredPath);
 }
 function setupWebpackWatchOutputIgnore(compiler) {
+	const compilerOptions = compiler.options;
 	const appendOutputIgnoredPath = (watchOptions, outputPath) => {
 		const resolvedOutputPath = outputPath || compiler.outputPath || compiler.options?.output?.path;
 		const paths = resolvedOutputPath && node_path.default.win32.isAbsolute(resolvedOutputPath) && !node_path.default.posix.isAbsolute(resolvedOutputPath) ? node_path.default.win32 : node_path.default;
@@ -2344,8 +2344,8 @@ function setupWebpackWatchOutputIgnore(compiler) {
 		}
 		return { ignored: appendIgnoredPath(void 0, outputDir) };
 	};
-	const compilerWatchOptions = appendOutputIgnoredPath(compiler.options.watchOptions);
-	if (compilerWatchOptions) compiler.options.watchOptions = compilerWatchOptions;
+	const compilerWatchOptions = appendOutputIgnoredPath(compilerOptions.watchOptions);
+	if (compilerWatchOptions) compilerOptions.watchOptions = compilerWatchOptions;
 	const syncOutputIgnoredPath = () => {
 		const outputPath = compiler.outputPath || compiler.options?.output?.path;
 		const watchOptions = compiler.watching?.watchOptions;
@@ -2357,8 +2357,8 @@ function setupWebpackWatchOutputIgnore(compiler) {
 		const watchOptions = compiler.watching?.watchOptions;
 		if (watchOptions) appendOutputIgnoredPath(watchOptions, outputPath);
 		else {
-			const compilerWatchOptions = appendOutputIgnoredPath(compiler.options.watchOptions, outputPath);
-			if (compilerWatchOptions) compiler.options.watchOptions = compilerWatchOptions;
+			const compilerWatchOptions = appendOutputIgnoredPath(compilerOptions.watchOptions, outputPath);
+			if (compilerWatchOptions) compilerOptions.watchOptions = compilerWatchOptions;
 		}
 	});
 }

package/dist/webpack.cjs

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

package/dist/webpack.js

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-8cQlXIo4.js";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-D6jp1o3m.js";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

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

@@ -1,6 +1,6 @@
-import type { TraverseOptions } from '@babel/traverse';
+import type { TraverseOptions, Visitor } from '@babel/traverse';
 import type { JsTokenUpdater } from '../../../js/JsTokenUpdater.js';
 import type { ITemplateHandlerOptions } from '../../../types/index.js';
-export declare function createLegacyTraverseOptions(options: ITemplateHandlerOptions, jsTokenUpdater: JsTokenUpdater): TraverseOptions & {
+export declare function createLegacyTraverseOptions(options: ITemplateHandlerOptions, jsTokenUpdater: JsTokenUpdater): TraverseOptions & Visitor & {
     noScope: true;
 };

package/dist/wxml/utils/custom-template.d.ts

@@ -1,3 +1,3 @@
 import type { ITemplateHandlerOptions } from '../../types/index.js';
 import type { AttributeMatcher } from '../custom-attributes.js';
-export declare function customTemplateHandler(rawSource: string, options: Required<ITemplateHandlerOptions>, cachedMatcher?: AttributeMatcher | undefined): Promise<string>;
+export declare function customTemplateHandler(rawSource: string, options: ITemplateHandlerOptions, cachedMatcher?: AttributeMatcher | undefined): Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-tailwindcss",
   "type": "module",
-  "version": "5.5.4",
+  "version": "5.5.6",
   "description": "Bring Tailwind CSS to every platform! 把 Tailwind CSS 的原子化开发体验带到全端！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -201,36 +201,34 @@
     }
   },
   "dependencies": {
-    "@babel/parser": "^8.0.4",
-    "@babel/traverse": "^8.0.4",
-    "@babel/types": "^8.0.4",
-    "@csstools/css-tokenizer": "^4.0.0",
+    "@babel/parser": "^8.0.5",
+    "@babel/traverse": "^8.0.5",
+    "@babel/types": "^8.0.5",
     "@tailwindcss-mangle/engine": "0.2.0",
     "@vue/compiler-dom": "^3.5.41",
     "@weapp-core/escape": "~8.0.0",
     "@weapp-tailwindcss/logger": "2.0.3",
-    "@weapp-tailwindcss/postcss": "3.3.3",
+    "@weapp-tailwindcss/postcss": "3.3.5",
     "@weapp-tailwindcss/reset": "0.1.4",
     "@weapp-tailwindcss/shared": "2.0.3",
     "comment-json": "^5.0.0",
     "debug": "~4.4.3",
     "fast-glob": "^3.3.3",
     "htmlparser2": "^12.0.0",
-    "lightningcss": "^1.33.0",
     "local-pkg": "^1.2.1",
     "lru-cache": "11.5.2",
-    "magic-string": "^1.2.3",
+    "magic-string": "^1.4.1",
     "micromatch": "^4.0.8",
-    "oxc-parser": "^0.149.0",
+    "oxc-parser": "^0.150.0",
     "oxc-walker": "^1.1.1",
-    "postcss-scss": "^4.0.9",
     "semver": "~7.8.5",
     "tailwindcss-config": "2.0.4",
     "weapp-style-injector": "1.0.5",
-    "yaml": "^2.9.0"
+    "yaml": "^2.9.1"
   },
   "devDependencies": {
     "@mpxjs/webpack-plugin": "^2.11.1",
+    "vite": "^7.3.6",
     "webpack": "5.105.4"
   },
   "scripts": {

package/dist/final-css-cleanup-DSjczga3.cjs

@@ -1,138 +0,0 @@
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
-//#region src/bundlers/shared/final-css-cleanup.ts
-function isCssWhitespace(code) {
-	return code === 9 || code === 10 || code === 12 || code === 13 || code === 32;
-}
-function isCssWordChar(code) {
-	return code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122 || code === 95;
-}
-const EMPTY_CSS_BLOCK_RE = /\{(?:[\t\n\f\r ]|\/\*(?:[^*]|\*(?!\/))*\*\/)*\}/;
-function findCssPreludeStart(css, start, end) {
-	let cursor = start;
-	while (cursor < end) {
-		while (cursor < end && isCssWhitespace(css.charCodeAt(cursor))) cursor++;
-		if (css.charCodeAt(cursor) !== 47 || css.charCodeAt(cursor + 1) !== 42) return cursor;
-		const commentEnd = css.indexOf("*/", cursor + 2);
-		if (commentEnd < 0 || commentEnd + 2 > end) return end;
-		cursor = commentEnd + 2;
-	}
-	return end;
-}
-function isKeyframesAtRule(css, start, end) {
-	let cursor = start + 1;
-	if (css.charCodeAt(cursor) === 45) {
-		cursor++;
-		const prefixStart = cursor;
-		while (cursor < end && isCssWordChar(css.charCodeAt(cursor))) cursor++;
-		if (cursor === prefixStart || css.charCodeAt(cursor) !== 45) return false;
-		cursor++;
-	}
-	if (cursor + 9 > end || css.slice(cursor, cursor + 9).toLowerCase() !== "keyframes") return false;
-	return !isCssWordChar(css.charCodeAt(cursor + 9));
-}
-function hasEmptyCssBlockCandidate(css) {
-	if (!EMPTY_CSS_BLOCK_RE.test(css)) return false;
-	const blocks = [];
-	let parenthesisDepth = 0;
-	let quote = 0;
-	let squareBracketDepth = 0;
-	let statementStart = 0;
-	for (let index = 0; index < css.length; index++) {
-		const code = css.charCodeAt(index);
-		if (quote !== 0) {
-			if (code === 92) index++;
-			else if (code === quote) quote = 0;
-			continue;
-		}
-		if (code === 34 || code === 39) {
-			quote = code;
-			if (blocks.length > 0) blocks[blocks.length - 1].hasContent = true;
-			continue;
-		}
-		if (code === 92) {
-			if (blocks.length > 0) blocks[blocks.length - 1].hasContent = true;
-			index++;
-			continue;
-		}
-		if (code === 47 && css.charCodeAt(index + 1) === 42) {
-			const commentEnd = css.indexOf("*/", index + 2);
-			if (commentEnd < 0) return false;
-			index = commentEnd + 1;
-			continue;
-		}
-		if (code === 40) {
-			parenthesisDepth++;
-			continue;
-		}
-		if (code === 41 && parenthesisDepth > 0) {
-			parenthesisDepth--;
-			continue;
-		}
-		if (code === 91) {
-			squareBracketDepth++;
-			continue;
-		}
-		if (code === 93 && squareBracketDepth > 0) {
-			squareBracketDepth--;
-			continue;
-		}
-		if (code === 123 && parenthesisDepth === 0 && squareBracketDepth === 0) {
-			const preludeStart = findCssPreludeStart(css, statementStart, index);
-			const isAtRule = css.charCodeAt(preludeStart) === 64;
-			const isKeyframesContainer = isAtRule && isKeyframesAtRule(css, preludeStart, index);
-			blocks.push({
-				hasContent: false,
-				isKeyframesContainer,
-				isKeyframeStep: !isAtRule && blocks[blocks.length - 1]?.isKeyframesContainer === true
-			});
-			statementStart = index + 1;
-			continue;
-		}
-		if (code === 125 && parenthesisDepth === 0 && squareBracketDepth === 0) {
-			const block = blocks.pop();
-			if (!block) continue;
-			if (!block.hasContent && !block.isKeyframeStep) return true;
-			if (blocks.length > 0) blocks[blocks.length - 1].hasContent = true;
-			statementStart = index + 1;
-			continue;
-		}
-		if (code === 59 && parenthesisDepth === 0 && squareBracketDepth === 0) {
-			statementStart = index + 1;
-			continue;
-		}
-		if (!isCssWhitespace(code) && blocks.length > 0) blocks[blocks.length - 1].hasContent = true;
-	}
-	return false;
-}
-/**
-* 在小程序样式进入最终产物图时递归清理无语义的空 CSS 块。
-*/
-function finalizeMiniProgramCssStructure(css) {
-	const repaired = (0, _weapp_tailwindcss_postcss.repairTrailingUnclosedTailwindSourceMedia)(css);
-	if (!hasEmptyCssBlockCandidate(repaired)) return repaired;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(repaired);
-		let removed = 0;
-		let passRemoved = 0;
-		do {
-			passRemoved = (0, _weapp_tailwindcss_postcss.removeEmptyRules)(root) + (0, _weapp_tailwindcss_postcss.removeEmptyAtRules)(root);
-			removed += passRemoved;
-		} while (passRemoved > 0);
-		return removed > 0 ? root.toString() : repaired;
-	} catch {
-		return repaired;
-	}
-}
-//#endregion
-Object.defineProperty(exports, "finalizeMiniProgramCssStructure", {
-	enumerable: true,
-	get: function() {
-		return finalizeMiniProgramCssStructure;
-	}
-});
-Object.defineProperty(exports, "hasEmptyCssBlockCandidate", {
-	enumerable: true,
-	get: function() {
-		return hasEmptyCssBlockCandidate;
-	}
-});

package/dist/tailwindcss/v4-engine/css-import.d.ts

@@ -1,14 +0,0 @@
-export declare function parseCssImportSpecifier(params: string): {
-    specifier: string;
-    raw: string;
-    quote: string | undefined;
-} | undefined;
-export declare function quoteCssImportSpecifier(file: string, quote?: string): string;
-export declare function isTailwindCssImport(params: string): boolean;
-export declare function parseImportSourceParam(params: string): {
-    none: boolean;
-    sourcePath: undefined;
-} | {
-    none: boolean;
-    sourcePath: string;
-} | undefined;

package/dist/uni-app-x/style-asset/source-parser.d.ts

@@ -1,2 +0,0 @@
-export declare function parseUniAppXStyleSource(source: string): import("postcss").Root;
-export declare function isUniAppXStyleSourceEmpty(source: string): boolean;