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

package/dist/{source-candidates-l12JBkKU.mjs → source-candidates-DN1mihlU.mjs}

@@ -1,6 +1,6 @@
-import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-BYcGCWUY.mjs";
-import path from "node:path";
+import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-DCxNPBVs.mjs";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
+import path from "node:path";
 import { readFile } from "node:fs/promises";
 //#region src/bundlers/vite/source-candidates.ts
 const CLEAN_URL_RE = /[?#].*$/;
@@ -105,8 +105,8 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source) {
-	return `${extension}\0${source}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues) {
+	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${source}`;
 }
 function isSourceCandidateRequest(id) {
 	return FULL_SOURCE_SCAN_EXTENSION_RE.test(cleanUrl(id));
@@ -125,7 +125,7 @@ function removeCandidateSet(candidateCount, candidates) {
 function addCandidateSet(candidateCount, candidates) {
 	for (const candidate of candidates) candidateCount.set(candidate, (candidateCount.get(candidate) ?? 0) + 1);
 }
-function createSourceCandidateCollector() {
+function createSourceCandidateCollector(options = {}) {
 	const candidatesById = /* @__PURE__ */ new Map();
 	const scanCandidatesById = /* @__PURE__ */ new Map();
 	const transformCandidatesById = /* @__PURE__ */ new Map();
@@ -136,34 +136,34 @@ function createSourceCandidateCollector() {
 	async function sync(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await extractSourceCandidates(source, extension));
+		const nextCandidates = new Set(await extractSourceCandidates(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceScanLayer(normalizedId, nextCandidates);
 	}
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await extractSourceCandidates(source, "css"));
+		const nextCandidates = new Set(await extractSourceCandidates(source, "css", { bareArbitraryValues: options.bareArbitraryValues }));
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceCssLayer(normalizedId, nextCandidates);
 	}
 	async function merge(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
-		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : new Set(await extractSourceCandidates(source, extension));
+		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : new Set(await extractSourceCandidates(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);
 		replaceTransformLayer(normalizedId, extractedCandidates);
 	}

package/dist/{source-candidates-BjB4wSga.js → source-candidates-DSxme_O2.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-KDOfD-6F.js");
+const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+let tailwindcss_patch = require("tailwindcss-patch");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
-let tailwindcss_patch = require("tailwindcss-patch");
 let node_fs_promises = require("node:fs/promises");
 //#region src/bundlers/vite/source-candidates.ts
 const CLEAN_URL_RE = /[?#].*$/;
@@ -107,8 +107,8 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source) {
-	return `${extension}\0${source}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues) {
+	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${source}`;
 }
 function isSourceCandidateRequest(id) {
 	return require_v3_engine.FULL_SOURCE_SCAN_EXTENSION_RE.test(cleanUrl(id));
@@ -127,7 +127,7 @@ function removeCandidateSet(candidateCount, candidates) {
 function addCandidateSet(candidateCount, candidates) {
 	for (const candidate of candidates) candidateCount.set(candidate, (candidateCount.get(candidate) ?? 0) + 1);
 }
-function createSourceCandidateCollector() {
+function createSourceCandidateCollector(options = {}) {
 	const candidatesById = /* @__PURE__ */ new Map();
 	const scanCandidatesById = /* @__PURE__ */ new Map();
 	const transformCandidatesById = /* @__PURE__ */ new Map();
@@ -138,34 +138,34 @@ function createSourceCandidateCollector() {
 	async function sync(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension));
+		const nextCandidates = new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceScanLayer(normalizedId, nextCandidates);
 	}
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, "css"));
+		const nextCandidates = new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, "css", { bareArbitraryValues: options.bareArbitraryValues }));
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceCssLayer(normalizedId, nextCandidates);
 	}
 	async function merge(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
-		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension));
+		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);
 		replaceTransformLayer(normalizedId, extractedCandidates);
 	}

package/dist/tailwindcss/v3-engine/types.d.ts

@@ -1,5 +1,6 @@
 import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
 import type { Config } from 'tailwindcss';
+import type { IArbitraryValues } from '../../types/shared';
 export type TailwindV3GenerateTarget = 'weapp' | 'web' | 'tailwind';
 export interface TailwindV3CandidateSource {
     content: string;
@@ -34,6 +35,7 @@ export interface TailwindV3ResolvedSource {
 export interface TailwindV3GenerateOptions {
     candidates?: Iterable<string> | undefined;
     sources?: TailwindV3CandidateSource[] | undefined;
+    bareArbitraryValues?: IArbitraryValues['bareArbitraryValues'] | undefined;
     incrementalCache?: boolean | undefined;
     target?: TailwindV3GenerateTarget | undefined;
     styleOptions?: Partial<IStyleHandlerOptions> | undefined;

package/dist/tailwindcss/v4-engine/types.d.ts

@@ -9,6 +9,7 @@ export interface TailwindV4SourcePattern {
 type TailwindV4PatchGenerateOptions = Omit<PatchTailwindV4GenerateOptions, 'target' | 'styleOptions' | 'tailwindcssV3Compatibility' | 'scanSources'>;
 export interface TailwindV4GenerateOptions extends TailwindV4PatchGenerateOptions {
     incrementalCache?: boolean | undefined;
+    bareArbitraryValues?: PatchTailwindV4GenerateOptions['bareArbitraryValues'] | undefined;
     target?: TailwindV4GenerateTarget | undefined;
     styleOptions?: Partial<IStyleHandlerOptions> | undefined;
     tailwindcssV3Compatibility?: boolean | undefined;

package/dist/{tailwindcss-D6zEhnyE.mjs → tailwindcss-DWtPieNE.mjs}

@@ -1,4 +1,4 @@
-import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-BYcGCWUY.mjs";
+import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-DCxNPBVs.mjs";
 import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";

package/dist/{tailwindcss-bNXguXhC.js → tailwindcss-glCm_d3H.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-KDOfD-6F.js");
+const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
 require("./utils-D7Ygohep.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");

package/dist/typedoc.export.d.ts

@@ -1,3 +1,3 @@
 export type { WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, WeappTailwindcssPostcssPluginOptions, } from './index';
+export type { ApplyOptions, CacheOptions, ExtractOptions, TailwindCssOptions, TailwindCssPatchOptions, TailwindV2Options, TailwindV3Options, TailwindV4Options, } from './types/typedoc-tailwindcss-patch';
 export type { UserDefinedOptions } from './types/user-defined-options';
-export type { ApplyOptions, CacheOptions, ExtractOptions, TailwindCssOptions, TailwindCssPatchOptions, TailwindV2Options, TailwindV3Options, TailwindV4Options, } from 'tailwindcss-patch';

package/dist/types/typedoc-tailwindcss-patch.d.ts

@@ -0,0 +1,67 @@
+import type { SourceEntry } from '@tailwindcss/oxide';
+import type { PackageResolvingOptions } from 'local-pkg';
+import type { ILengthUnitsPatchOptions } from 'tailwindcss-patch';
+import type { TailwindV4CssSource } from '../tailwindcss/v4-engine';
+export type CacheStrategy = 'merge' | 'overwrite';
+export type CacheDriver = 'file' | 'memory' | 'noop';
+export interface CacheOptions {
+    enabled?: boolean;
+    cwd?: string;
+    dir?: string;
+    file?: string;
+    strategy?: CacheStrategy;
+    driver?: CacheDriver;
+}
+export interface ExtractOptions {
+    write?: boolean;
+    file?: string;
+    format?: 'json' | 'lines';
+    pretty?: number | boolean;
+    removeUniversalSelector?: boolean;
+}
+export interface ExposeContextOptions {
+    refProperty?: string;
+}
+export interface ExtendLengthUnitsOptions extends Partial<ILengthUnitsPatchOptions> {
+    enabled?: boolean;
+}
+export interface ApplyOptions {
+    overwrite?: boolean;
+    exposeContext?: boolean | ExposeContextOptions;
+    extendLengthUnits?: false | ExtendLengthUnitsOptions;
+}
+export interface TailwindRuntimeOptionsBase {
+    config?: string;
+    cwd?: string;
+    postcssPlugin?: string;
+}
+export interface TailwindV2Options extends TailwindRuntimeOptionsBase {
+}
+export interface TailwindV3Options extends TailwindRuntimeOptionsBase {
+}
+export interface TailwindV4Options {
+    base?: string;
+    css?: string;
+    cssSources?: TailwindV4CssSource[];
+    cssEntries?: string[];
+    sources?: SourceEntry[];
+    bareArbitraryValues?: boolean | {
+        units?: string[];
+    } | undefined;
+}
+export interface TailwindCssOptions extends TailwindRuntimeOptionsBase {
+    version?: 2 | 3 | 4;
+    packageName?: string;
+    resolve?: PackageResolvingOptions;
+    v2?: TailwindV2Options;
+    v3?: TailwindV3Options;
+    v4?: TailwindV4Options;
+}
+export interface TailwindCssPatchOptions {
+    projectRoot?: string;
+    tailwindcss?: TailwindCssOptions;
+    apply?: ApplyOptions;
+    extract?: ExtractOptions;
+    filter?: (className: string) => boolean;
+    cache?: boolean | CacheOptions;
+}

package/dist/{v3-engine-KDOfD-6F.js → v3-engine-D3BMLVAN.js}

@@ -5,13 +5,13 @@ node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");
 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 _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
-let tailwindcss_patch = require("tailwindcss-patch");
 let node_url = require("node:url");
 let debug = require("debug");
 debug = require_chunk.__toESM(debug);
@@ -1832,7 +1832,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,
@@ -2894,6 +2894,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;
@@ -3009,6 +3060,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`);
@@ -3020,6 +3072,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,
@@ -3047,7 +3100,7 @@ function createDependencyFingerprint(files) {
 		}
 	}).join("|");
 }
-function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+function createIncrementalGenerateCacheKey(source, target, styleOptions, bareArbitraryValues) {
 	return [
 		source.packageName,
 		source.postcssPlugin,
@@ -3057,7 +3110,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) {
@@ -3132,8 +3186,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.default.parse(generateSource.css, { from: void 0 });
 		const result = {
@@ -3155,17 +3216,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,
@@ -3173,7 +3234,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.default.root();
@@ -3181,15 +3242,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)
 		};
 	}
@@ -3199,7 +3262,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)) {
@@ -3229,7 +3292,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");