weapp-tailwindcss 5.1.8 → 5.1.9

package/dist/index.js

@@ -3,7 +3,7 @@ const require_framework = require("./framework.js");
 const require_generator = require("./generator-DaaFxR5V.js");
 const require_gulp = require("./gulp-JUfnhOOo.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-GdzlG_lx.js");
+const require_vite = require("./vite-CHk7V9EA.js");
 const require_webpack = require("./webpack-BhM4Hqla.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMp
 import { t as createWeappTailwindcssGenerator } from "./generator-DugIHBgl.mjs";
 import { t as createPlugins } from "./gulp-CRjkPsbX.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-vf2-cDdk.mjs";
+import { t as WeappTailwindcss } from "./vite-ClpyoD9e.mjs";
 import { n as weappTailwindcssPackageDir } from "./webpack-2s-TFhgm.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";

package/dist/{vite-GdzlG_lx.js → vite-CHk7V9EA.js}

@@ -1816,30 +1816,63 @@ function dedupeViteCssResults(records) {
 		return true;
 	});
 }
-function removeTailwindSourceMediaWrappers(css) {
-	if (!css.includes("@media source(")) return css;
+function removeTailwindSourceMediaWrappersRoot(root) {
+	let changed = false;
+	root.walkAtRules("media", (atRule) => {
+		if (!atRule.params.startsWith("source(")) return;
+		if (atRule.nodes && atRule.nodes.length > 0) atRule.replaceWith(...atRule.nodes);
+		else atRule.remove();
+		changed = true;
+	});
+	if (changed) root.walkAtRules((atRule) => {
+		if (atRule.nodes && atRule.nodes.length === 0) atRule.remove();
+	});
+	return changed;
+}
+function removeTailwindSourceMediaWrappersFallback(css) {
+	return css.replace(/@media\s+source\([^)]*\)\s*\{\s*\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/?\s*\}/gi, "").replace(/@media\s+source\([^)]*\)\s*\{\s*\}/gi, "");
+}
+function removeTailwindEntryDirectivesFromCss(css) {
 	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		let changed = false;
-		root.walkAtRules("media", (atRule) => {
-			if (!atRule.params.startsWith("source(")) return;
-			if (atRule.nodes && atRule.nodes.length > 0) atRule.replaceWith(...atRule.nodes);
-			else atRule.remove();
-			changed = true;
-		});
-		root.walkAtRules((atRule) => {
-			if (atRule.nodes && atRule.nodes.length === 0) {
-				atRule.remove();
-				changed = true;
-			}
-		});
-		return changed ? root.toString() : css;
+		const source = require_v4_engine.stripGeneratorPlaceholderMarkers(css);
+		const root = _weapp_tailwindcss_postcss.postcss.parse(source);
+		const removedMediaWrappers = removeTailwindSourceMediaWrappersRoot(root);
+		const removedTailwindDirectives = (0, _weapp_tailwindcss_postcss.removeTailwindSourceDirectivesRoot)(root);
+		return removedMediaWrappers || removedTailwindDirectives ? root.toString() : source;
 	} catch {
-		return css.replace(/@media\s+source\([^)]*\)\s*\{\s*\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/?\s*\}/gi, "").replace(/@media\s+source\([^)]*\)\s*\{\s*\}/gi, "");
+		return require_v4_engine.removeTailwindSourceDirectives(removeTailwindSourceMediaWrappersFallback(css));
 	}
 }
-function removeTailwindEntryDirectivesFromCss(css) {
-	return require_v4_engine.removeTailwindSourceDirectives(removeTailwindSourceMediaWrappers(css));
+function removeUnsupportedMiniProgramCssImportsFallback(css, file) {
+	if (!isMiniProgramStyleOutputFile(file) || !css.includes("@import")) return css;
+	return css.split(/\r?\n/).filter((line) => {
+		const trimmed = line.trim();
+		if (!trimmed.startsWith("@import")) return true;
+		const request = (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(trimmed.slice(7).trim().replace(/;$/, "").trim());
+		return request === void 0 || (0, _weapp_tailwindcss_postcss.isMiniProgramLocalCssImportRequest)(request);
+	}).join("\n");
+}
+function normalizeInjectableCssForTarget(css, file) {
+	return normalizeInjectableCssForTargetWithImports(css, file).css;
+}
+function normalizeInjectableCssForTargetWithImports(css, file) {
+	if (!css.includes("@import")) return {
+		css,
+		importedStyleFiles: /* @__PURE__ */ new Set()
+	};
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
+		return {
+			css: (isMiniProgramStyleOutputFile(file) ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramCssImportsRoot)(root) : false) ? root.toString() : css,
+			importedStyleFiles: collectImportedStyleFilesRoot(root, file)
+		};
+	} catch {
+		const fallbackCss = removeUnsupportedMiniProgramCssImportsFallback(css, file);
+		return {
+			css: fallbackCss,
+			importedStyleFiles: collectImportedStyleFiles(fallbackCss, file)
+		};
+	}
 }
 function stripStyleExtension(file) {
 	return file.replace(/[?#].*$/, "").replace(/\.(?:css|wxss|acss|ttss|qss|jxss|tyss|scss|sass|less|styl|stylus|pcss|postcss)$/i, "");
@@ -1854,15 +1887,23 @@ function resolveImportedStyleFile(targetFile, request) {
 	const targetDir = posix.posix.dirname(require_source_candidate_scan_signature.normalizeOutputPathKey(targetFile));
 	return require_source_candidate_scan_signature.normalizeOutputPathKey(posix.posix.join(targetDir === "." ? "" : targetDir, cleanRequest));
 }
-function collectImportedStyleFiles(css, targetFile) {
+function collectImportedStyleFilesFromRequests(requests, targetFile) {
 	const imports = /* @__PURE__ */ new Set();
+	for (const request of requests) {
+		const importedFile = resolveImportedStyleFile(targetFile, request);
+		if (importedFile) imports.add(importedFile);
+	}
+	return imports;
+}
+function collectImportedStyleFilesRoot(root, targetFile) {
+	return collectImportedStyleFilesFromRequests((0, _weapp_tailwindcss_postcss.collectCssImportRequestsRoot)(root), targetFile);
+}
+function collectImportedStyleFiles(css, targetFile) {
+	if (!css.includes("@import")) return /* @__PURE__ */ new Set();
 	try {
-		_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules("import", (atRule) => {
-			const importedFile = resolveImportedStyleFile(targetFile, require_v4_engine.parseImportRequest(atRule.params));
-			if (importedFile) imports.add(importedFile);
-		});
+		return collectImportedStyleFilesRoot(_weapp_tailwindcss_postcss.postcss.parse(css), targetFile);
 	} catch {}
-	return imports;
+	return /* @__PURE__ */ new Set();
 }
 function normalizeMarkerOutputFile(markerFile, resolveViteProcessedCssOutputFile) {
 	return resolveViteProcessedCssOutputFile?.(markerFile) ?? markerFile;
@@ -2483,8 +2524,9 @@ function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
 		}
 		const fileKey = require_source_candidate_scan_signature.normalizeOutputPathKey(file);
 		const mainFileKey = require_source_candidate_scan_signature.normalizeOutputPathKey(file);
-		let nextCss = transformCss(removeTailwindEntryDirectivesFromCss(originalSource), file);
-		const importedStyleFiles = collectImportedStyleFiles(nextCss, file);
+		const normalizedOriginalCss = normalizeInjectableCssForTargetWithImports(transformCss(removeTailwindEntryDirectivesFromCss(originalSource), file), file);
+		let nextCss = normalizedOriginalCss.css;
+		const importedStyleFiles = normalizedOriginalCss.importedStyleFiles;
 		const importedBundleCssSources = collectImportedBundleCssSources(bundle, importedStyleFiles);
 		nextCss = removeCssCoveredByImportedViteResults(nextCss, importedBundleCssSources);
 		const importedViteCssResults = viteCssResults.filter((record) => isViteProcessedCssResultImported(record, importedStyleFiles));
@@ -2500,7 +2542,7 @@ function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
 			if (!shouldInjectViteProcessedCssResult(options.opts, mainFileKey, record.file, record)) continue;
 			if (isViteProcessedCssResultImported(record, importedStyleFiles)) continue;
 			targetViteCssResults.push(record);
-			let css = require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(record.css).trim();
+			let css = normalizeInjectableCssForTarget(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(record.css).trim(), file).trim();
 			css = removeCssCoveredByImportedViteResults(css, importedCssSources).trim();
 			if (css.length === 0) continue;
 			const mergedLayerCss = require_hmr_timing.mergeMarkedUserLayerComponentsCss(nextCss, css);

package/dist/{vite-vf2-cDdk.mjs → vite-ClpyoD9e.mjs}

@@ -1,5 +1,5 @@
 import { resolveImplicitAppTypeFromViteRoot } from "./framework.mjs";
-import { $ as hasTailwindGeneratedCssMarkers, B as hasTailwindNonRootGenerationDirectives, Et as omitUndefined, G as normalizeTailwindSourceForGenerator, H as hasTailwindSourceDirectives, K as parseImportRequest, L as stripMiniProgramCssSpecificityPlaceholders, P as hasMiniProgramCssSpecificityPlaceholders, R as hasLocalCssImport, Tt as filterUnsupportedMiniProgramTailwindV4Candidates, U as normalizeTailwindConfigDirectives, V as hasTailwindRootDirectives, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, d as normalizeCssEntries, f as findNearestPackageRoot, lt as getTailwindV4IncrementalGenerateCacheStats, o as hasConfiguredTailwindV4CssRoots, q as removeTailwindSourceDirectives, s as upsertTailwindV4CssSource, u as isTailwindV4CssEntry, w as normalizeEmptyTailwindCustomVariants, xt as resolveTailwindV4CssSourceBase, z as hasTailwindApplyDirective } from "./v4-engine-CjjWONB0.mjs";
+import { $ as hasTailwindGeneratedCssMarkers, B as hasTailwindNonRootGenerationDirectives, Et as omitUndefined, G as normalizeTailwindSourceForGenerator, H as hasTailwindSourceDirectives, K as parseImportRequest, L as stripMiniProgramCssSpecificityPlaceholders, P as hasMiniProgramCssSpecificityPlaceholders, R as hasLocalCssImport, Tt as filterUnsupportedMiniProgramTailwindV4Candidates, U as normalizeTailwindConfigDirectives, V as hasTailwindRootDirectives, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, d as normalizeCssEntries, f as findNearestPackageRoot, lt as getTailwindV4IncrementalGenerateCacheStats, o as hasConfiguredTailwindV4CssRoots, q as removeTailwindSourceDirectives, rt as stripGeneratorPlaceholderMarkers, s as upsertTailwindV4CssSource, u as isTailwindV4CssEntry, w as normalizeEmptyTailwindCustomVariants, xt as resolveTailwindV4CssSourceBase, z as hasTailwindApplyDirective } from "./v4-engine-CjjWONB0.mjs";
 import { a as resolveGeneratorRuntimeBranch, c as shouldUseNativeAppCssBranch, i as normalizeWeappTailwindcssGeneratorOptions, s as shouldUseMiniProgramCssBranch } from "./generator-DugIHBgl.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-DodxWHGz.mjs";
 import { C as normalizeFrameworkStylePlatform, S as createDebug, _ as toCustomAttributesEntities, a as vitePluginName, l as shouldSkipJsTransform, m as replaceWxml, n as normalizeStyleHandlerMajorVersion, t as getCompilerContext, v as collectRuntimeClassSet, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-CfXr3hWz.mjs";
@@ -11,7 +11,7 @@ import fs, { existsSync, readFileSync, realpathSync } from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
-import { compileCssMacroConditionalComments, containsCssAfterMinify, filterExistingCssRules, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, postcss, removeTailwindPostcssPlugins, resolveFilteredPostcssConfig, transformWebCssCompat, transformWebCssSafeSelectors, unwrapUnsupportedCascadeLayers } from "@weapp-tailwindcss/postcss";
+import { collectCssImportRequestsRoot, compileCssMacroConditionalComments, containsCssAfterMinify, filterExistingCssRules, isMiniProgramLocalCssImportRequest, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, parseTailwindCssDirectiveRequest, postcss, removeTailwindPostcssPlugins, removeTailwindSourceDirectivesRoot, removeUnsupportedMiniProgramCssImportsRoot, resolveFilteredPostcssConfig, transformWebCssCompat, transformWebCssSafeSelectors, unwrapUnsupportedCascadeLayers } from "@weapp-tailwindcss/postcss";
 import { LRUCache } from "lru-cache";
 import { readFile } from "node:fs/promises";
 import micromatch from "micromatch";
@@ -1810,30 +1810,63 @@ function dedupeViteCssResults(records) {
 		return true;
 	});
 }
-function removeTailwindSourceMediaWrappers(css) {
-	if (!css.includes("@media source(")) return css;
+function removeTailwindSourceMediaWrappersRoot(root) {
+	let changed = false;
+	root.walkAtRules("media", (atRule) => {
+		if (!atRule.params.startsWith("source(")) return;
+		if (atRule.nodes && atRule.nodes.length > 0) atRule.replaceWith(...atRule.nodes);
+		else atRule.remove();
+		changed = true;
+	});
+	if (changed) root.walkAtRules((atRule) => {
+		if (atRule.nodes && atRule.nodes.length === 0) atRule.remove();
+	});
+	return changed;
+}
+function removeTailwindSourceMediaWrappersFallback(css) {
+	return css.replace(/@media\s+source\([^)]*\)\s*\{\s*\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/?\s*\}/gi, "").replace(/@media\s+source\([^)]*\)\s*\{\s*\}/gi, "");
+}
+function removeTailwindEntryDirectivesFromCss(css) {
 	try {
-		const root = postcss.parse(css);
-		let changed = false;
-		root.walkAtRules("media", (atRule) => {
-			if (!atRule.params.startsWith("source(")) return;
-			if (atRule.nodes && atRule.nodes.length > 0) atRule.replaceWith(...atRule.nodes);
-			else atRule.remove();
-			changed = true;
-		});
-		root.walkAtRules((atRule) => {
-			if (atRule.nodes && atRule.nodes.length === 0) {
-				atRule.remove();
-				changed = true;
-			}
-		});
-		return changed ? root.toString() : css;
+		const source = stripGeneratorPlaceholderMarkers(css);
+		const root = postcss.parse(source);
+		const removedMediaWrappers = removeTailwindSourceMediaWrappersRoot(root);
+		const removedTailwindDirectives = removeTailwindSourceDirectivesRoot(root);
+		return removedMediaWrappers || removedTailwindDirectives ? root.toString() : source;
 	} catch {
-		return css.replace(/@media\s+source\([^)]*\)\s*\{\s*\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/?\s*\}/gi, "").replace(/@media\s+source\([^)]*\)\s*\{\s*\}/gi, "");
+		return removeTailwindSourceDirectives(removeTailwindSourceMediaWrappersFallback(css));
 	}
 }
-function removeTailwindEntryDirectivesFromCss(css) {
-	return removeTailwindSourceDirectives(removeTailwindSourceMediaWrappers(css));
+function removeUnsupportedMiniProgramCssImportsFallback(css, file) {
+	if (!isMiniProgramStyleOutputFile(file) || !css.includes("@import")) return css;
+	return css.split(/\r?\n/).filter((line) => {
+		const trimmed = line.trim();
+		if (!trimmed.startsWith("@import")) return true;
+		const request = parseTailwindCssDirectiveRequest(trimmed.slice(7).trim().replace(/;$/, "").trim());
+		return request === void 0 || isMiniProgramLocalCssImportRequest(request);
+	}).join("\n");
+}
+function normalizeInjectableCssForTarget(css, file) {
+	return normalizeInjectableCssForTargetWithImports(css, file).css;
+}
+function normalizeInjectableCssForTargetWithImports(css, file) {
+	if (!css.includes("@import")) return {
+		css,
+		importedStyleFiles: /* @__PURE__ */ new Set()
+	};
+	try {
+		const root = postcss.parse(css);
+		return {
+			css: (isMiniProgramStyleOutputFile(file) ? removeUnsupportedMiniProgramCssImportsRoot(root) : false) ? root.toString() : css,
+			importedStyleFiles: collectImportedStyleFilesRoot(root, file)
+		};
+	} catch {
+		const fallbackCss = removeUnsupportedMiniProgramCssImportsFallback(css, file);
+		return {
+			css: fallbackCss,
+			importedStyleFiles: collectImportedStyleFiles(fallbackCss, file)
+		};
+	}
 }
 function stripStyleExtension(file) {
 	return file.replace(/[?#].*$/, "").replace(/\.(?:css|wxss|acss|ttss|qss|jxss|tyss|scss|sass|less|styl|stylus|pcss|postcss)$/i, "");
@@ -1848,15 +1881,23 @@ function resolveImportedStyleFile(targetFile, request) {
 	const targetDir = posix.posix.dirname(normalizeOutputPathKey(targetFile));
 	return normalizeOutputPathKey(posix.posix.join(targetDir === "." ? "" : targetDir, cleanRequest));
 }
-function collectImportedStyleFiles(css, targetFile) {
+function collectImportedStyleFilesFromRequests(requests, targetFile) {
 	const imports = /* @__PURE__ */ new Set();
+	for (const request of requests) {
+		const importedFile = resolveImportedStyleFile(targetFile, request);
+		if (importedFile) imports.add(importedFile);
+	}
+	return imports;
+}
+function collectImportedStyleFilesRoot(root, targetFile) {
+	return collectImportedStyleFilesFromRequests(collectCssImportRequestsRoot(root), targetFile);
+}
+function collectImportedStyleFiles(css, targetFile) {
+	if (!css.includes("@import")) return /* @__PURE__ */ new Set();
 	try {
-		postcss.parse(css).walkAtRules("import", (atRule) => {
-			const importedFile = resolveImportedStyleFile(targetFile, parseImportRequest(atRule.params));
-			if (importedFile) imports.add(importedFile);
-		});
+		return collectImportedStyleFilesRoot(postcss.parse(css), targetFile);
 	} catch {}
-	return imports;
+	return /* @__PURE__ */ new Set();
 }
 function normalizeMarkerOutputFile(markerFile, resolveViteProcessedCssOutputFile) {
 	return resolveViteProcessedCssOutputFile?.(markerFile) ?? markerFile;
@@ -2477,8 +2518,9 @@ function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
 		}
 		const fileKey = normalizeOutputPathKey(file);
 		const mainFileKey = normalizeOutputPathKey(file);
-		let nextCss = transformCss(removeTailwindEntryDirectivesFromCss(originalSource), file);
-		const importedStyleFiles = collectImportedStyleFiles(nextCss, file);
+		const normalizedOriginalCss = normalizeInjectableCssForTargetWithImports(transformCss(removeTailwindEntryDirectivesFromCss(originalSource), file), file);
+		let nextCss = normalizedOriginalCss.css;
+		const importedStyleFiles = normalizedOriginalCss.importedStyleFiles;
 		const importedBundleCssSources = collectImportedBundleCssSources(bundle, importedStyleFiles);
 		nextCss = removeCssCoveredByImportedViteResults(nextCss, importedBundleCssSources);
 		const importedViteCssResults = viteCssResults.filter((record) => isViteProcessedCssResultImported(record, importedStyleFiles));
@@ -2494,7 +2536,7 @@ function injectViteProcessedCssIntoMainCssAssets(bundle, options) {
 			if (!shouldInjectViteProcessedCssResult(options.opts, mainFileKey, record.file, record)) continue;
 			if (isViteProcessedCssResultImported(record, importedStyleFiles)) continue;
 			targetViteCssResults.push(record);
-			let css = stripBundlerGeneratedCssMarkers(record.css).trim();
+			let css = normalizeInjectableCssForTarget(stripBundlerGeneratedCssMarkers(record.css).trim(), file).trim();
 			css = removeCssCoveredByImportedViteResults(css, importedCssSources).trim();
 			if (css.length === 0) continue;
 			const mergedLayerCss = mergeMarkedUserLayerComponentsCss(nextCss, css);

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-GdzlG_lx.js");
+const require_vite = require("./vite-CHk7V9EA.js");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-vf2-cDdk.mjs";
+import { t as WeappTailwindcss } from "./vite-ClpyoD9e.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.1.8",
+  "version": "5.1.9",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -204,9 +204,9 @@
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.1.7",
-    "@weapp-tailwindcss/shared": "2.0.0",
+    "@weapp-tailwindcss/postcss": "3.1.8",
     "@weapp-tailwindcss/reset": "0.1.1",
+    "@weapp-tailwindcss/shared": "2.0.0",
     "tailwindcss-config": "2.0.1",
     "weapp-style-injector": "1.0.1"
   },