weapp-tailwindcss 5.1.5 → 5.1.6

package/dist/index.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.js");
-const require_generator = require("./generator-CilgHtxb.js");
-const require_gulp = require("./gulp-CuVsZdO9.js");
+const require_generator = require("./generator-CqWzj2Z1.js");
+const require_gulp = require("./gulp-hXE1U4Cu.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-Yp14HNyS.js");
-const require_webpack = require("./webpack-DN3tgLbF.js");
+const require_vite = require("./vite-Baw9qNrc.js");
+const require_webpack = require("./webpack-C9u7mfGE.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
-import { t as createWeappTailwindcssGenerator } from "./generator-24-HgU9F.mjs";
-import { t as createPlugins } from "./gulp-ygWfmOqh.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-CoT5vu9w.mjs";
+import { t as createPlugins } from "./gulp-Bss4wJ8t.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-cH0tTMHc.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-DBhmJ-_P.mjs";
+import { t as WeappTailwindcss } from "./vite-PdxjaqhO.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-BffTDmod.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/postcss.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
-const require_generator = require("./generator-CilgHtxb.js");
+const require_v4_engine = require("./v4-engine-C9cmNlP8.js");
+const require_generator = require("./generator-CqWzj2Z1.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-import { t as resolveTailwindV4Source } from "./v4-engine-BuuYDXt1.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-24-HgU9F.mjs";
+import { t as resolveTailwindV4Source } from "./v4-engine-DRQaCFMm.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-CoT5vu9w.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
-const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_v4_engine = require("./v4-engine-C9cmNlP8.js");
 require("./utils-D3h8j7Mk.js");
-const require_tailwindcss = require("./tailwindcss-BwoNQ3t8.js");
+const require_tailwindcss = require("./tailwindcss-DYJ3HZD2.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
@@ -57,7 +57,10 @@ function createBasePreset(options = {}) {
 //#endregion
 //#region src/presets/hbuilderx.ts
 function hbuilderx(options = {}) {
-	return createBasePreset(withWebCompatGeneratorDefaults({ ...options }));
+	return createBasePreset(withWebCompatGeneratorDefaults({
+		appType: "uni-app-vite",
+		...options
+	}));
 }
 //#endregion
 //#region src/presets/uni-app.ts

package/dist/presets.mjs

@@ -1,7 +1,7 @@
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
-import { ct as omitUndefined } from "./v4-engine-BuuYDXt1.mjs";
+import { Et as omitUndefined } from "./v4-engine-DRQaCFMm.mjs";
 import { n as defuOverrideArray } from "./utils-DodxWHGz.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C-uM4rB8.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-Bjr3aphG.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";
 import process from "node:process";
@@ -51,7 +51,10 @@ function createBasePreset(options = {}) {
 //#endregion
 //#region src/presets/hbuilderx.ts
 function hbuilderx(options = {}) {
-	return createBasePreset(withWebCompatGeneratorDefaults({ ...options }));
+	return createBasePreset(withWebCompatGeneratorDefaults({
+		appType: "uni-app-vite",
+		...options
+	}));
 }
 //#endregion
 //#region src/presets/uni-app.ts

package/dist/rspack.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_webpack = require("./webpack-DN3tgLbF.js");
+const require_webpack = require("./webpack-C9u7mfGE.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 //#region src/bundlers/rspack/index.ts

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-DBhmJ-_P.mjs";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-BffTDmod.mjs";
 import path from "node:path";
 //#region src/bundlers/rspack/index.ts
 const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";

package/dist/runtime-branch/generator-target-env.d.ts

@@ -1,4 +1,5 @@
 import type { WeappTailwindcssGeneratorTarget } from './types';
 export declare const generatorTargetEnvKeys: readonly ["UNI_PLATFORM", "UNI_UTS_PLATFORM", "MPX_CLI_MODE", "MPX_CURRENT_TARGET_MODE", "TARO_ENV", "WEAPP_TW_TARGET", "WEAPP_TAILWINDCSS_TARGET"];
 export declare function shouldUseWebGeneratorTargetFromEnv(): boolean;
+export declare function shouldUseUniAppViteWebViewGeneratorTarget(appType: string | undefined, platform?: string | undefined): boolean;
 export declare function inferGeneratorTargetFromEnv(): WeappTailwindcssGeneratorTarget;

package/dist/{source-candidate-scan-signature-DIj9m4wB.js → source-candidate-scan-signature-5Uk6U72B.js}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 require("./auto-DtU6f3X6.js");
-const require_context = require("./context-BziwyWy1.js");
-const require_tailwindcss = require("./tailwindcss-BwoNQ3t8.js");
-const require_hmr_timing = require("./hmr-timing-BKdCeIrn.js");
+const require_context = require("./context-BCSk_YnL.js");
+const require_tailwindcss = require("./tailwindcss-DYJ3HZD2.js");
+const require_hmr_timing = require("./hmr-timing-Df4203aI.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");

package/dist/{source-candidate-scan-signature-DATRnS1X.mjs → source-candidate-scan-signature-BbCmW975.mjs}

@@ -1,7 +1,7 @@
 import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
-import { g as traverse, h as babelParse, o as Parser } from "./context-rrYZuUBU.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-C-uM4rB8.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-Dh_nn3w5.mjs";
+import { g as traverse, h as babelParse, o as Parser } from "./context-3GGqW9vw.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-Bjr3aphG.mjs";
+import { u as generateCssByGenerator } from "./hmr-timing-Cfu-4Bnf.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";

package/dist/{tailwindcss-C-uM4rB8.mjs → tailwindcss-Bjr3aphG.mjs}

@@ -1,4 +1,4 @@
-import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, ct as omitUndefined, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, ot as resolveCssMacroTailwindV4Source, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, ut as loadTailwindV4DesignSystem, v as normalizeStringListOption } from "./v4-engine-BuuYDXt1.mjs";
+import { Ct as collectCssInlineSourceCandidates, Et as omitUndefined, _ as resolveTailwindcssOptions, _t as normalizeLegacyContentEntries, a as filterTailwindV4CssSourceRoots, c as groupCssEntriesByBase, d as normalizeCssEntries, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, ht as expandTailwindSourceEntries, i as resolveTailwindV4SourceOptionsFromRuntime, kt as loadTailwindV4DesignSystem, l as guessBasedirFromEntries, m as findWorkspaceRoot, mt as createTailwindSourceEntryMatcher, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, p as findWorkspacePackageDir, pt as FULL_SOURCE_SCAN_PATTERN, u as isTailwindV4CssEntry, v as normalizeStringListOption, vt as parseConfigParam, wt as resolveCssMacroTailwindV4Source, xt as resolveTailwindV4CssSourceBase, yt as resolveCssSourceEntries } from "./v4-engine-DRQaCFMm.mjs";
 import { n as defuOverrideArray$1 } from "./utils-DodxWHGz.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -974,6 +974,19 @@ function createEngineTailwindcssRuntime(options) {
 		if (typeof options.filter !== "function") return classSet;
 		return new Set([...classSet].filter((className) => options.filter?.(className) !== false));
 	}
+	function hasTailwindV4ApplyContext(css) {
+		if (!css.includes("@apply")) return false;
+		try {
+			const root = postcss.parse(css);
+			let hasContext = false;
+			root.walkAtRules((rule) => {
+				if (rule.name === "reference" || rule.name === "import" || rule.name === "tailwind" && rule.params.trim() === "utilities") hasContext = true;
+			});
+			return hasContext;
+		} catch {
+			return false;
+		}
+	}
 	async function collectClassSet() {
 		const report = await collectContentTokens();
 		const rawCandidates = new Set(report.entries.map((entry) => {
@@ -989,7 +1002,7 @@ function createEngineTailwindcssRuntime(options) {
 		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
-			if (!css.includes("@apply")) continue;
+			if (!hasTailwindV4ApplyContext(css)) continue;
 			try {
 				postcss.parse(css).walkAtRules("apply", (rule) => {
 					for (const candidate of rule.params.split(/\s+/)) {

package/dist/{tailwindcss-BwoNQ3t8.js → tailwindcss-DYJ3HZD2.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_v4_engine = require("./v4-engine-C9cmNlP8.js");
 require("./utils-D3h8j7Mk.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -978,6 +978,19 @@ function createEngineTailwindcssRuntime(options) {
 		if (typeof options.filter !== "function") return classSet;
 		return new Set([...classSet].filter((className) => options.filter?.(className) !== false));
 	}
+	function hasTailwindV4ApplyContext(css) {
+		if (!css.includes("@apply")) return false;
+		try {
+			const root = _weapp_tailwindcss_postcss.postcss.parse(css);
+			let hasContext = false;
+			root.walkAtRules((rule) => {
+				if (rule.name === "reference" || rule.name === "import" || rule.name === "tailwind" && rule.params.trim() === "utilities") hasContext = true;
+			});
+			return hasContext;
+		} catch {
+			return false;
+		}
+	}
 	async function collectClassSet() {
 		const report = await collectContentTokens();
 		const rawCandidates = new Set(report.entries.map((entry) => {
@@ -993,7 +1006,7 @@ function createEngineTailwindcssRuntime(options) {
 		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
-			if (!css.includes("@apply")) continue;
+			if (!hasTailwindV4ApplyContext(css)) continue;
 			try {
 				_weapp_tailwindcss_postcss.postcss.parse(css).walkAtRules("apply", (rule) => {
 					for (const candidate of rule.params.split(/\s+/)) {

package/dist/{transform-DHLemtaX.mjs → transform--155BmeJ.mjs}

@@ -1,4 +1,4 @@
-import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-rrYZuUBU.mjs";
+import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-3GGqW9vw.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";

package/dist/{transform-KLD1tJdb.js → transform-B6_y_yCB.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_context = require("./context-BziwyWy1.js");
+const require_context = require("./context-BCSk_YnL.js");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let magic_string = require("magic-string");
 magic_string = require_rolldown_runtime.__toESM(magic_string);