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

package/dist/{v3-engine-BYcGCWUY.mjs → v3-engine-DCxNPBVs.mjs}

@@ -2,11 +2,11 @@ import { a as transformCssMacroCss, n as hasCssMacroTailwindPlugin, o as withCss
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import postcss from "postcss";
+import { TailwindcssPatcher, createTailwindV4Engine, extractRawCandidates, extractSourceCandidates, isBareArbitraryValuesEnabled, loadTailwindV4DesignSystem, resolveBareArbitraryValueCandidate, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions } from "tailwindcss-patch";
 import process from "node:process";
 import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
-import { TailwindcssPatcher, createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions } from "tailwindcss-patch";
 import { fileURLToPath } from "node:url";
 import _createDebug from "debug";
 import { stat } from "node:fs/promises";
@@ -1824,7 +1824,7 @@ function createTailwindV4Engine$1(source) {
 		const resolvedStyleOptions = resolveStyleOptions$1(generateSource, styleOptions);
 		const engine = createTailwindV4Engine(createCompatibleSource(generateSource, target, tailwindcssV3Compatibility));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
-		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await extractRawCandidates(resolvedScanSources)) : void 0;
+		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await extractRawCandidates(resolvedScanSources, { bareArbitraryValues: patchOptions.bareArbitraryValues })) : void 0;
 		const normalizedCandidates = normalizeRpxTextCandidates(resolveTargetCandidates(new Set([...collectCandidates$1(patchOptions.candidates), ...filesystemCandidates ?? []]), target));
 		const result = await engine.generate(omitUndefined({
 			scanSources: false,
@@ -2886,6 +2886,57 @@ function createChangedContentEntries(candidates, sources) {
 function collectCandidates(candidates) {
 	return new Set(candidates ?? []);
 }
+function normalizeBareArbitraryValueCandidate(candidate, bareArbitraryValues) {
+	return resolveBareArbitraryValueCandidate(candidate, bareArbitraryValues)?.canonicalCandidate ?? candidate;
+}
+function normalizeBareArbitraryValueCandidates(candidates, bareArbitraryValues) {
+	const normalized = /* @__PURE__ */ new Set();
+	const restoreCandidates = /* @__PURE__ */ new Map();
+	for (const candidate of candidates) {
+		const normalizedCandidate = normalizeBareArbitraryValueCandidate(candidate, bareArbitraryValues);
+		normalized.add(normalizedCandidate);
+		if (normalizedCandidate !== candidate) restoreCandidates.set(normalizedCandidate, candidate);
+	}
+	return {
+		candidates: normalized,
+		restoreCandidates
+	};
+}
+async function collectSourceBareArbitraryValueCandidates(sources, bareArbitraryValues) {
+	if (!isBareArbitraryValuesEnabled(bareArbitraryValues)) return [];
+	const candidates = /* @__PURE__ */ new Set();
+	for (const source of sources ?? []) for (const candidate of await extractSourceCandidates(source.content, source.extension ?? "html", { bareArbitraryValues })) if (resolveBareArbitraryValueCandidate(candidate, bareArbitraryValues)) candidates.add(candidate);
+	return [...candidates];
+}
+function escapeCssClassSelector(className) {
+	return className.replace(/[^\w-]/g, (char) => `\\${char}`);
+}
+function restoreBareArbitraryValueCssSelectors(css, originalCandidates, bareArbitraryValues, escapeClassName) {
+	if (!isBareArbitraryValuesEnabled(bareArbitraryValues)) return css;
+	let restored = css;
+	for (const originalCandidate of originalCandidates) {
+		const canonical = resolveBareArbitraryValueCandidate(originalCandidate, bareArbitraryValues)?.canonicalCandidate;
+		if (canonical) restored = restored.split(`.${escapeClassName(canonical)}`).join(`.${escapeCssClassSelector(originalCandidate)}`);
+	}
+	return restored;
+}
+function restoreBareArbitraryValueClassSet(classSet, originalCandidates, bareArbitraryValues) {
+	if (!isBareArbitraryValuesEnabled(bareArbitraryValues)) return new Set(classSet);
+	const restored = new Set(classSet);
+	for (const originalCandidate of originalCandidates) {
+		const canonical = resolveBareArbitraryValueCandidate(originalCandidate, bareArbitraryValues)?.canonicalCandidate;
+		if (canonical && restored.has(canonical)) {
+			restored.delete(canonical);
+			restored.add(originalCandidate);
+		}
+	}
+	return restored;
+}
+function collectGeneratedCandidates(context, candidates, restoreCandidates) {
+	const classSet = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) if (context.classCache.has(candidate)) classSet.add(restoreCandidates.get(candidate) ?? candidate);
+	return classSet;
+}
 function hasRemovedCandidates(previousCandidates, nextCandidates) {
 	for (const candidate of previousCandidates) if (!nextCandidates.has(candidate)) return true;
 	return false;
@@ -3001,6 +3052,7 @@ function loadTailwindV3Internals(source) {
 	};
 	const collapseAdjacentRulesModule = requireTailwind(`${source.packageName}/lib/lib/collapseAdjacentRules`);
 	const collapseDuplicateDeclarationsModule = requireTailwind(`${source.packageName}/lib/lib/collapseDuplicateDeclarations`);
+	const escapeClassNameModule = requireTailwind(`${source.packageName}/lib/util/escapeClassName`);
 	const generateRulesModule = requireTailwind(`${source.packageName}/lib/lib/generateRules`);
 	const sharedStateModule = requireTailwind(`${source.packageName}/lib/lib/sharedState`);
 	const setupContextUtils = requireTailwind(`${source.packageName}/lib/lib/setupContextUtils`);
@@ -3012,6 +3064,7 @@ function loadTailwindV3Internals(source) {
 		collapseAdjacentRules: collapseAdjacentRulesModule["default"] ?? collapseAdjacentRulesModule,
 		collapseDuplicateDeclarations: collapseDuplicateDeclarationsModule["default"] ?? collapseDuplicateDeclarationsModule,
 		createContext: setupContextUtils["createContext"],
+		escapeClassName: escapeClassNameModule["default"] ?? escapeClassNameModule,
 		generateRules: generateRulesModule["generateRules"],
 		notOnDemandCandidate: String(sharedStateModule["NOT_ON_DEMAND"] ?? "*"),
 		processTailwindFeatures: processTailwindFeaturesModule["default"] ?? processTailwindFeaturesModule,
@@ -3039,7 +3092,7 @@ function createDependencyFingerprint(files) {
 		}
 	}).join("|");
 }
-function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+function createIncrementalGenerateCacheKey(source, target, styleOptions, bareArbitraryValues) {
 	return [
 		source.packageName,
 		source.postcssPlugin,
@@ -3049,7 +3102,8 @@ function createIncrementalGenerateCacheKey(source, target, styleOptions) {
 		source.css,
 		createStableJson(normalizeConfigObject(source.configObject)?.content),
 		target,
-		createStableJson(styleOptions)
+		createStableJson(styleOptions),
+		createStableJson(bareArbitraryValues)
 	].join("\0");
 }
 function createRuntimeReadyCacheKey(source, rootPath) {
@@ -3124,8 +3178,15 @@ function createTailwindV3Engine(source) {
 		const internals = tailwindInternals;
 		const { styleOptions, target = "weapp" } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const tailwindConfig = internals.validateConfig(internals.resolveConfig(createTailwindConfig(generateSource, options)));
-		const candidates = mergeGenerateCandidates(generateSource, options);
+		const requestedCandidates = mergeGenerateCandidates(generateSource, options);
+		for (const candidate of await collectSourceBareArbitraryValueCandidates(options.sources, options.bareArbitraryValues)) requestedCandidates.add(candidate);
+		const normalizedCandidates = normalizeBareArbitraryValueCandidates(requestedCandidates, options.bareArbitraryValues);
+		const tailwindOptions = {
+			...options,
+			candidates: normalizedCandidates.candidates
+		};
+		const tailwindConfig = internals.validateConfig(internals.resolveConfig(createTailwindConfig(generateSource, tailwindOptions)));
+		const candidates = normalizedCandidates.candidates;
 		const changedContent = createChangedContentEntries(candidates, options.sources ?? []);
 		const root = postcss.parse(generateSource.css, { from: void 0 });
 		const result = {
@@ -3147,17 +3208,17 @@ function createTailwindV3Engine(source) {
 			};
 			context = await internals.processTailwindFeatures(setupContext)(root, result);
 		}
-		const rawCss = root.toString();
+		const rawCss = restoreBareArbitraryValueCssSelectors(root.toString(), requestedCandidates, options.bareArbitraryValues, internals.escapeClassName);
 		const css = await transformTailwindV3CssByTarget(rawCss, target, resolvedStyleOptions);
 		const dependencies = collectDependencyMessages(result);
 		for (const dependency of generateSource.dependencies) dependencies.add(dependency);
-		const classSet = collectClassSet(context);
+		const classSet = restoreBareArbitraryValueClassSet(collectClassSet(context), requestedCandidates, options.bareArbitraryValues);
 		return {
 			css,
 			rawCss,
 			context,
 			classSet,
-			rawCandidates: candidates,
+			rawCandidates: requestedCandidates,
 			dependencies: [...dependencies],
 			sources: [],
 			root: null,
@@ -3165,7 +3226,7 @@ function createTailwindV3Engine(source) {
 			version: 3
 		};
 	}
-	async function generateIncrementalMissingUtilities(context, candidates, target, styleOptions) {
+	async function generateIncrementalMissingUtilities(context, candidates, target, styleOptions, bareArbitraryValues) {
 		tailwindInternals ?? (tailwindInternals = loadTailwindV3Internals(source));
 		const internals = tailwindInternals;
 		const root = postcss.root();
@@ -3173,15 +3234,17 @@ function createTailwindV3Engine(source) {
 			css: "",
 			messages: []
 		};
-		appendUtilityRules(root, context, internals.generateRules(new Set(sortCandidates(candidates)), context));
+		const normalizedCandidates = normalizeBareArbitraryValueCandidates(candidates, bareArbitraryValues);
+		const sortedCandidates = sortCandidates(normalizedCandidates.candidates);
+		appendUtilityRules(root, context, internals.generateRules(new Set(sortedCandidates), context));
 		internals.resolveDefaultsAtRules(context)(root, result);
 		internals.collapseAdjacentRules(context)(root, result);
 		internals.collapseDuplicateDeclarations(context)(root, result);
-		const rawCss = root.toString();
+		const rawCss = restoreBareArbitraryValueCssSelectors(root.toString(), candidates, bareArbitraryValues, internals.escapeClassName);
 		return {
 			css: await transformTailwindV3CssByTarget(rawCss, target, resolveStyleOptions(source, styleOptions)),
 			rawCss,
-			classSet: collectClassSet(context),
+			classSet: collectGeneratedCandidates(context, sortedCandidates, normalizedCandidates.restoreCandidates),
 			dependencies: collectDependencyMessages(result)
 		};
 	}
@@ -3191,7 +3254,7 @@ function createTailwindV3Engine(source) {
 		const requestedCandidates = mergeGenerateCandidates(source, options);
 		if (requestedCandidates.size === 0) return generateOnce(source, options);
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
-		const cacheKey = createIncrementalGenerateCacheKey(source, target, styleOptions);
+		const cacheKey = createIncrementalGenerateCacheKey(source, target, styleOptions, options.bareArbitraryValues);
 		const cached = incrementalGenerateCache.get(cacheKey);
 		if (cached) {
 			if (hasRemovedCandidates(cached.seenCandidates, requestedCandidates)) {
@@ -3221,7 +3284,7 @@ function createTailwindV3Engine(source) {
 				target: cached.target,
 				version: 3
 			};
-			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions);
+			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions, options.bareArbitraryValues);
 			for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
 			for (const className of generated.classSet) cached.classSet.add(className);
 			cached.css = [cached.css, generated.css].filter(Boolean).join("\n");

package/dist/{vite-C8SUICPv.mjs → vite-DOprpdH-.mjs}

@@ -1,18 +1,18 @@
-import { C as __esmMin, S as __commonJSMin, _ as toCustomAttributesEntities, a as vitePluginName, c as createAttributeMatcher, d as _defineProperty, f as init_defineProperty, h as babelParse, l as analyzeSource, m as replaceWxml, n as getCompilerContext, p as isClassContextLiteralPath, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as collectRuntimeClassSet, w as __require, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-nPDKYr8V.mjs";
-import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-BYcGCWUY.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-CmLpVJgw.mjs";
-import { a as validateCandidatesByGenerator, c as hasTailwindRootDirectives, f as hasTailwindGeneratedCssMarkers, i as generateCssByGenerator, l as hasTailwindSourceDirectives, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-W61zZU00.mjs";
+import { C as __esmMin, S as __commonJSMin, _ as toCustomAttributesEntities, a as vitePluginName, c as createAttributeMatcher, d as _defineProperty, f as init_defineProperty, h as babelParse, l as analyzeSource, m as replaceWxml, n as getCompilerContext, p as isClassContextLiteralPath, s as generateCode, t as shouldSkipJsTransform, u as JsTokenUpdater, v as collectRuntimeClassSet, w as __require, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./precheck-BrNwLG2e.mjs";
+import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, J as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, q as omitUndefined, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-DCxNPBVs.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-B76ovqsv.mjs";
+import { a as validateCandidatesByGenerator, c as hasTailwindRootDirectives, f as hasTailwindGeneratedCssMarkers, i as generateCssByGenerator, l as hasTailwindSourceDirectives, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager, u as normalizeTailwindSourceForGenerator } from "./incremental-runtime-class-set-x10M9bn_.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-D6zEhnyE.mjs";
-import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-l12JBkKU.mjs";
-import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-Bsr05EFW.mjs";
+import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DWtPieNE.mjs";
+import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-DN1mihlU.mjs";
+import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CnaJxkFY.mjs";
 import { t as logger$1 } from "./logger-BNzxZbZj.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
+import { splitCandidateTokens } from "tailwindcss-patch";
 import process$1 from "node:process";
 import path from "node:path";
 import { logger } from "@weapp-tailwindcss/logger";
-import { splitCandidateTokens } from "tailwindcss-patch";
 import { readFile } from "node:fs/promises";
 import MagicString from "magic-string";
 import postcssHtmlTransform from "@weapp-tailwindcss/postcss/html-transform";
@@ -23620,8 +23620,8 @@ function createViteRuntimeClassSet(options) {
 		readyPromise: createTailwindRuntimeReadyPromise(initialTwPatcher),
 		refreshTailwindcssPatcher
 	};
-	const bundleRuntimeClassSetManager = createBundleRuntimeClassSetManager();
-	const transformRuntimeClassSetManager = createBundleRuntimeClassSetManager();
+	const bundleRuntimeClassSetManager = createBundleRuntimeClassSetManager({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
+	const transformRuntimeClassSetManager = createBundleRuntimeClassSetManager({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
 	let runtimeSet;
 	let runtimeSetPromise;
 	let runtimeRefreshSignature;
@@ -23958,7 +23958,7 @@ function WeappTailwindcss(options = {}) {
 	const customAttributesEntities = toCustomAttributesEntities(customAttributes);
 	let resolvedConfig;
 	let recordedGeneratorCandidates;
-	const sourceCandidateCollector = createSourceCandidateCollector();
+	const sourceCandidateCollector = createSourceCandidateCollector({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
 	const sourceCandidateScanCache = /* @__PURE__ */ new Map();
 	let sourceScanEntries;
 	let sourceScanMatcher;

package/dist/{vite-CMzi0wR2.js → vite-Ec0uX6kF.js}

@@ -1,23 +1,23 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-KDOfD-6F.js");
-const require_generator = require("./generator-BtpQoQEH.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-vqTU-eph.js");
-const require_precheck = require("./precheck-Bp-V1T_Q.js");
+const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+const require_generator = require("./generator--0-ekuVO.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CN6K_97P.js");
+const require_precheck = require("./precheck-DPtJjZmV.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-bNXguXhC.js");
-const require_source_candidates = require("./source-candidates-BjB4wSga.js");
-const require_bundle_state = require("./bundle-state-8w8DM8Lw.js");
+const require_tailwindcss = require("./tailwindcss-glCm_d3H.js");
+const require_source_candidates = require("./source-candidates-DSxme_O2.js");
+const require_bundle_state = require("./bundle-state-DgGEhk_z.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
+let tailwindcss_patch = require("tailwindcss-patch");
 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 _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
-let tailwindcss_patch = require("tailwindcss-patch");
 let node_fs_promises = require("node:fs/promises");
 let magic_string = require("magic-string");
 magic_string = require_chunk.__toESM(magic_string);
@@ -23629,8 +23629,8 @@ function createViteRuntimeClassSet(options) {
 		readyPromise: require_precheck.createTailwindRuntimeReadyPromise(initialTwPatcher),
 		refreshTailwindcssPatcher
 	};
-	const bundleRuntimeClassSetManager = require_incremental_runtime_class_set.createBundleRuntimeClassSetManager();
-	const transformRuntimeClassSetManager = require_incremental_runtime_class_set.createBundleRuntimeClassSetManager();
+	const bundleRuntimeClassSetManager = require_incremental_runtime_class_set.createBundleRuntimeClassSetManager({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
+	const transformRuntimeClassSetManager = require_incremental_runtime_class_set.createBundleRuntimeClassSetManager({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
 	let runtimeSet;
 	let runtimeSetPromise;
 	let runtimeRefreshSignature;
@@ -23967,7 +23967,7 @@ function WeappTailwindcss(options = {}) {
 	const customAttributesEntities = require_precheck.toCustomAttributesEntities(customAttributes);
 	let resolvedConfig;
 	let recordedGeneratorCandidates;
-	const sourceCandidateCollector = require_source_candidates.createSourceCandidateCollector();
+	const sourceCandidateCollector = require_source_candidates.createSourceCandidateCollector({ bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues });
 	const sourceCandidateScanCache = /* @__PURE__ */ new Map();
 	let sourceScanEntries;
 	let sourceScanMatcher;

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-CMzi0wR2.js");
+const require_vite = require("./vite-Ec0uX6kF.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-C8SUICPv.mjs";
+import { t as WeappTailwindcss } from "./vite-DOprpdH-.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/dist/weapp-tw-css-import-rewrite-loader.js

@@ -2109,7 +2109,7 @@ function createTailwindV4Engine(source) {
 		const resolvedStyleOptions = resolveStyleOptions$1(generateSource, styleOptions);
 		const engine = (0, tailwindcss_patch.createTailwindV4Engine)(createCompatibleSource(generateSource, target, tailwindcssV3Compatibility));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
-		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, tailwindcss_patch.extractRawCandidates)(resolvedScanSources)) : void 0;
+		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, tailwindcss_patch.extractRawCandidates)(resolvedScanSources, { bareArbitraryValues: patchOptions.bareArbitraryValues })) : void 0;
 		const normalizedCandidates = normalizeRpxTextCandidates(resolveTargetCandidates(new Set([...collectCandidates$1(patchOptions.candidates), ...filesystemCandidates ?? []]), target));
 		const result = await engine.generate(omitUndefined({
 			scanSources: false,
@@ -2807,6 +2807,57 @@ function createChangedContentEntries(candidates, sources) {
 function collectCandidates(candidates) {
 	return new Set(candidates ?? []);
 }
+function normalizeBareArbitraryValueCandidate(candidate, bareArbitraryValues) {
+	return (0, tailwindcss_patch.resolveBareArbitraryValueCandidate)(candidate, bareArbitraryValues)?.canonicalCandidate ?? candidate;
+}
+function normalizeBareArbitraryValueCandidates(candidates, bareArbitraryValues) {
+	const normalized = /* @__PURE__ */ new Set();
+	const restoreCandidates = /* @__PURE__ */ new Map();
+	for (const candidate of candidates) {
+		const normalizedCandidate = normalizeBareArbitraryValueCandidate(candidate, bareArbitraryValues);
+		normalized.add(normalizedCandidate);
+		if (normalizedCandidate !== candidate) restoreCandidates.set(normalizedCandidate, candidate);
+	}
+	return {
+		candidates: normalized,
+		restoreCandidates
+	};
+}
+async function collectSourceBareArbitraryValueCandidates(sources, bareArbitraryValues) {
+	if (!(0, tailwindcss_patch.isBareArbitraryValuesEnabled)(bareArbitraryValues)) return [];
+	const candidates = /* @__PURE__ */ new Set();
+	for (const source of sources ?? []) for (const candidate of await (0, tailwindcss_patch.extractSourceCandidates)(source.content, source.extension ?? "html", { bareArbitraryValues })) if ((0, tailwindcss_patch.resolveBareArbitraryValueCandidate)(candidate, bareArbitraryValues)) candidates.add(candidate);
+	return [...candidates];
+}
+function escapeCssClassSelector(className) {
+	return className.replace(/[^\w-]/g, (char) => `\\${char}`);
+}
+function restoreBareArbitraryValueCssSelectors(css, originalCandidates, bareArbitraryValues, escapeClassName) {
+	if (!(0, tailwindcss_patch.isBareArbitraryValuesEnabled)(bareArbitraryValues)) return css;
+	let restored = css;
+	for (const originalCandidate of originalCandidates) {
+		const canonical = (0, tailwindcss_patch.resolveBareArbitraryValueCandidate)(originalCandidate, bareArbitraryValues)?.canonicalCandidate;
+		if (canonical) restored = restored.split(`.${escapeClassName(canonical)}`).join(`.${escapeCssClassSelector(originalCandidate)}`);
+	}
+	return restored;
+}
+function restoreBareArbitraryValueClassSet(classSet, originalCandidates, bareArbitraryValues) {
+	if (!(0, tailwindcss_patch.isBareArbitraryValuesEnabled)(bareArbitraryValues)) return new Set(classSet);
+	const restored = new Set(classSet);
+	for (const originalCandidate of originalCandidates) {
+		const canonical = (0, tailwindcss_patch.resolveBareArbitraryValueCandidate)(originalCandidate, bareArbitraryValues)?.canonicalCandidate;
+		if (canonical && restored.has(canonical)) {
+			restored.delete(canonical);
+			restored.add(originalCandidate);
+		}
+	}
+	return restored;
+}
+function collectGeneratedCandidates(context, candidates, restoreCandidates) {
+	const classSet = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) if (context.classCache.has(candidate)) classSet.add(restoreCandidates.get(candidate) ?? candidate);
+	return classSet;
+}
 function hasRemovedCandidates(previousCandidates, nextCandidates) {
 	for (const candidate of previousCandidates) if (!nextCandidates.has(candidate)) return true;
 	return false;
@@ -2922,6 +2973,7 @@ function loadTailwindV3Internals(source) {
 	};
 	const collapseAdjacentRulesModule = requireTailwind(`${source.packageName}/lib/lib/collapseAdjacentRules`);
 	const collapseDuplicateDeclarationsModule = requireTailwind(`${source.packageName}/lib/lib/collapseDuplicateDeclarations`);
+	const escapeClassNameModule = requireTailwind(`${source.packageName}/lib/util/escapeClassName`);
 	const generateRulesModule = requireTailwind(`${source.packageName}/lib/lib/generateRules`);
 	const sharedStateModule = requireTailwind(`${source.packageName}/lib/lib/sharedState`);
 	const setupContextUtils = requireTailwind(`${source.packageName}/lib/lib/setupContextUtils`);
@@ -2933,6 +2985,7 @@ function loadTailwindV3Internals(source) {
 		collapseAdjacentRules: collapseAdjacentRulesModule["default"] ?? collapseAdjacentRulesModule,
 		collapseDuplicateDeclarations: collapseDuplicateDeclarationsModule["default"] ?? collapseDuplicateDeclarationsModule,
 		createContext: setupContextUtils["createContext"],
+		escapeClassName: escapeClassNameModule["default"] ?? escapeClassNameModule,
 		generateRules: generateRulesModule["generateRules"],
 		notOnDemandCandidate: String(sharedStateModule["NOT_ON_DEMAND"] ?? "*"),
 		processTailwindFeatures: processTailwindFeaturesModule["default"] ?? processTailwindFeaturesModule,
@@ -2960,7 +3013,7 @@ function createDependencyFingerprint(files) {
 		}
 	}).join("|");
 }
-function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+function createIncrementalGenerateCacheKey(source, target, styleOptions, bareArbitraryValues) {
 	return [
 		source.packageName,
 		source.postcssPlugin,
@@ -2970,7 +3023,8 @@ function createIncrementalGenerateCacheKey(source, target, styleOptions) {
 		source.css,
 		createStableJson$1(normalizeConfigObject(source.configObject)?.content),
 		target,
-		createStableJson$1(styleOptions)
+		createStableJson$1(styleOptions),
+		createStableJson$1(bareArbitraryValues)
 	].join("\0");
 }
 function createRuntimeReadyCacheKey(source, rootPath) {
@@ -3045,8 +3099,15 @@ function createTailwindV3Engine(source) {
 		const internals = tailwindInternals;
 		const { styleOptions, target = "weapp" } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const tailwindConfig = internals.validateConfig(internals.resolveConfig(createTailwindConfig(generateSource, options)));
-		const candidates = mergeGenerateCandidates(generateSource, options);
+		const requestedCandidates = mergeGenerateCandidates(generateSource, options);
+		for (const candidate of await collectSourceBareArbitraryValueCandidates(options.sources, options.bareArbitraryValues)) requestedCandidates.add(candidate);
+		const normalizedCandidates = normalizeBareArbitraryValueCandidates(requestedCandidates, options.bareArbitraryValues);
+		const tailwindOptions = {
+			...options,
+			candidates: normalizedCandidates.candidates
+		};
+		const tailwindConfig = internals.validateConfig(internals.resolveConfig(createTailwindConfig(generateSource, tailwindOptions)));
+		const candidates = normalizedCandidates.candidates;
 		const changedContent = createChangedContentEntries(candidates, options.sources ?? []);
 		const root = require_runtime_registry.postcss_default.parse(generateSource.css, { from: void 0 });
 		const result = {
@@ -3068,17 +3129,17 @@ function createTailwindV3Engine(source) {
 			};
 			context = await internals.processTailwindFeatures(setupContext)(root, result);
 		}
-		const rawCss = root.toString();
+		const rawCss = restoreBareArbitraryValueCssSelectors(root.toString(), requestedCandidates, options.bareArbitraryValues, internals.escapeClassName);
 		const css = await transformTailwindV3CssByTarget(rawCss, target, resolvedStyleOptions);
 		const dependencies = collectDependencyMessages(result);
 		for (const dependency of generateSource.dependencies) dependencies.add(dependency);
-		const classSet = collectClassSet(context);
+		const classSet = restoreBareArbitraryValueClassSet(collectClassSet(context), requestedCandidates, options.bareArbitraryValues);
 		return {
 			css,
 			rawCss,
 			context,
 			classSet,
-			rawCandidates: candidates,
+			rawCandidates: requestedCandidates,
 			dependencies: [...dependencies],
 			sources: [],
 			root: null,
@@ -3086,7 +3147,7 @@ function createTailwindV3Engine(source) {
 			version: 3
 		};
 	}
-	async function generateIncrementalMissingUtilities(context, candidates, target, styleOptions) {
+	async function generateIncrementalMissingUtilities(context, candidates, target, styleOptions, bareArbitraryValues) {
 		tailwindInternals ??= loadTailwindV3Internals(source);
 		const internals = tailwindInternals;
 		const root = require_runtime_registry.postcss_default.root();
@@ -3094,15 +3155,17 @@ function createTailwindV3Engine(source) {
 			css: "",
 			messages: []
 		};
-		appendUtilityRules(root, context, internals.generateRules(new Set(sortCandidates(candidates)), context));
+		const normalizedCandidates = normalizeBareArbitraryValueCandidates(candidates, bareArbitraryValues);
+		const sortedCandidates = sortCandidates(normalizedCandidates.candidates);
+		appendUtilityRules(root, context, internals.generateRules(new Set(sortedCandidates), context));
 		internals.resolveDefaultsAtRules(context)(root, result);
 		internals.collapseAdjacentRules(context)(root, result);
 		internals.collapseDuplicateDeclarations(context)(root, result);
-		const rawCss = root.toString();
+		const rawCss = restoreBareArbitraryValueCssSelectors(root.toString(), candidates, bareArbitraryValues, internals.escapeClassName);
 		return {
 			css: await transformTailwindV3CssByTarget(rawCss, target, resolveStyleOptions(source, styleOptions)),
 			rawCss,
-			classSet: collectClassSet(context),
+			classSet: collectGeneratedCandidates(context, sortedCandidates, normalizedCandidates.restoreCandidates),
 			dependencies: collectDependencyMessages(result)
 		};
 	}
@@ -3112,7 +3175,7 @@ function createTailwindV3Engine(source) {
 		const requestedCandidates = mergeGenerateCandidates(source, options);
 		if (requestedCandidates.size === 0) return generateOnce(source, options);
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
-		const cacheKey = createIncrementalGenerateCacheKey(source, target, styleOptions);
+		const cacheKey = createIncrementalGenerateCacheKey(source, target, styleOptions, options.bareArbitraryValues);
 		const cached = incrementalGenerateCache.get(cacheKey);
 		if (cached) {
 			if (hasRemovedCandidates(cached.seenCandidates, requestedCandidates)) {
@@ -3142,7 +3205,7 @@ function createTailwindV3Engine(source) {
 				target: cached.target,
 				version: 3
 			};
-			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions);
+			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions, options.bareArbitraryValues);
 			for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
 			for (const className of generated.classSet) cached.classSet.add(className);
 			cached.css = [cached.css, generated.css].filter(Boolean).join("\n");
@@ -3309,14 +3372,16 @@ function normalizeWeappTailwindcssGeneratorOptions(options) {
 	if (options == null) return {
 		target,
 		importFallback: true,
-		tailwindcssV3Compatibility: target === "weapp"
+		tailwindcssV3Compatibility: target === "weapp",
+		bareArbitraryValues: void 0
 	};
 	return {
 		target,
 		config: options.config,
 		styleOptions: options.styleOptions,
 		importFallback: options.importFallback ?? true,
-		tailwindcssV3Compatibility: options.tailwindcssV3Compatibility ?? target === "weapp"
+		tailwindcssV3Compatibility: options.tailwindcssV3Compatibility ?? target === "weapp",
+		bareArbitraryValues: options.bareArbitraryValues
 	};
 }
 //#endregion
@@ -5156,7 +5221,10 @@ function prefixLocalCssImportsWithWebpackIgnore(css) {
 }
 async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, debug } = options;
-	const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
+	const generatorOptions = {
+		...normalizeWeappTailwindcssGeneratorOptions(opts.generator),
+		bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues
+	};
 	const majorVersion = runtimeState.twPatcher.majorVersion;
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
@@ -5174,7 +5242,7 @@ async function generateCssByGenerator(options) {
 	if (!SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || !shouldGenerateCurrentCss || majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers) return;
 	try {
 		await runtimeState.readyPromise;
-		const currentCssCandidates = majorVersion === 4 ? await (0, tailwindcss_patch.extractSourceCandidates)(effectiveRawSource, "css") : [];
+		const currentCssCandidates = majorVersion === 4 ? await (0, tailwindcss_patch.extractSourceCandidates)(effectiveRawSource, "css", { bareArbitraryValues: generatorOptions.bareArbitraryValues }) : [];
 		const runtimeWithCurrentCss = currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
 		const sources = await resolveGeneratorSources(majorVersion, runtimeState, effectiveRawSource, file, cssHandlerOptions, generatorOptions, {
 			getSourceCandidatesForEntries,
@@ -5193,6 +5261,7 @@ async function generateCssByGenerator(options) {
 			}) : runtimeWithCurrentCss;
 			const generatorRuntime = majorVersion === 4 && generatorOptions.target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(sourceRuntime) : sourceRuntime;
 			return generator.generate({
+				bareArbitraryValues: generatorOptions.bareArbitraryValues,
 				candidates: generatorRuntime,
 				incrementalCache: majorVersion === 3 || majorVersion === 4,
 				scanSources: shouldScanTailwindV4Sources(majorVersion, generatorOptions.target, generatorRuntime, isolateCssSource),

package/dist/{webpack-2v1sQKyZ.js → webpack-Ccohlg3A.js}

@@ -1,11 +1,11 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-KDOfD-6F.js");
-const require_generator = require("./generator-BtpQoQEH.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-vqTU-eph.js");
-const require_precheck = require("./precheck-Bp-V1T_Q.js");
+const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+const require_generator = require("./generator--0-ekuVO.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CN6K_97P.js");
+const require_precheck = require("./precheck-DPtJjZmV.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-bNXguXhC.js");
-const require_bundle_state = require("./bundle-state-8w8DM8Lw.js");
+const require_tailwindcss = require("./tailwindcss-glCm_d3H.js");
+const require_bundle_state = require("./bundle-state-DgGEhk_z.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
@@ -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