tailwindcss-patch 9.2.0 → 9.3.0

package/dist/{validate-CIMnzW8O.d.mts → validate-C8-qsOWo.d.mts}

@@ -249,6 +249,10 @@ interface TailwindV4Options {
   cssEntries?: string[];
   /** Overrides the content sources scanned by the oxide scanner. */
   sources?: SourceEntry[];
+  /** Enables UnoCSS-style bare arbitrary values such as `p-10%` and `p-2.5px`. */
+  bareArbitraryValues?: boolean | {
+    /** Unit allow-list used when detecting bare arbitrary values. */units?: string[];
+  } | undefined;
 }
 /**
  * High-level Tailwind patch configuration shared across versions.
@@ -326,6 +330,9 @@ interface NormalizedTailwindV4Options {
   cssEntries: string[];
   sources: SourceEntry[];
   hasUserDefinedSources: boolean;
+  bareArbitraryValues: false | {
+    units?: string[];
+  } | undefined;
 }
 /**
  * Tailwind configuration ready for consumption by the runtime after normalization.
@@ -413,6 +420,14 @@ type TailwindcssConfigResult = Awaited<ReturnType<TailwindcssConfigModule['getCo
 //#region src/runtime/collector.d.ts
 type TailwindMajorVersion = 2 | 3 | 4;
 //#endregion
+//#region src/v4/bare-arbitrary-values.d.ts
+interface BareArbitraryValueOptions {
+  /**
+   * 允许作为无方括号任意值的单位列表。
+   */
+  units?: string[];
+}
+//#endregion
 //#region src/extraction/candidate-extractor.d.ts
 interface ExtractValidCandidatesOption {
   sources?: SourceEntry[];
@@ -420,6 +435,7 @@ interface ExtractValidCandidatesOption {
   baseFallbacks?: string[];
   css?: string;
   cwd?: string;
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions;
 }
 declare function extractRawCandidatesWithPositions(content: string, extension?: string): Promise<{
   rawCandidate: string;
@@ -682,4 +698,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindTokenFileKey as $, groupTokensByFile as A, TailwindCssOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, ExposeContextOptions as F, ExtractResult as G, TailwindV2Options as H, ExtendLengthUnitsOptions as I, PatchName as J, ILengthUnitsPatchOptions as K, ExtractOptions as L, ApplyOptions as M, CacheOptions as N, extractRawCandidatesWithPositions as O, CacheStrategy as P, TailwindTokenByFileMap as Q, NormalizedCacheOptions as R, MIGRATION_REPORT_KIND as S, TailwindcssPatcher as T, TailwindV3Options as U, TailwindCssPatchOptions as V, TailwindV4Options as W, PatchStatusReport as X, PatchStatusEntry as Y, TailwindPatchRuntime as Z, ConfigFileMigrationEntry as _, ValidateFailureSummary as a, CacheClearResult as at, RestoreConfigFilesOptions as b, TailwindcssPatchCliMountOptions as c, CacheContextMetadata as ct, TailwindcssPatchCommandContext as d, CacheReadResult as dt, TailwindTokenLocation as et, TailwindcssPatchCommandHandler as f, tailwindcssPatchCommands as g, TailwindcssPatchCommandOptions as h, ValidateFailureReason as i, CacheClearOptions as it, normalizeOptions as j, extractValidCandidates as k, TailwindcssPatchCliOptions as l, CacheIndexFileV2 as lt, TailwindcssPatchCommandOptionDefinition as m, VALIDATE_FAILURE_REASONS as n, TailwindcssClassCache as nt, ValidateJsonFailurePayload as o, CacheClearScope as ot, TailwindcssPatchCommandHandlerMap as p, PatchCheckStatus as q, ValidateCommandError as r, TailwindcssRuntimeContext as rt, ValidateJsonSuccessPayload as s, CacheContextDescriptor as st, VALIDATE_EXIT_CODES as t, TailwindTokenReport as tt, TailwindcssPatchCommand as u, CacheReadMeta as ut, ConfigFileMigrationReport as v, logger as w, RestoreConfigFilesResult as x, MigrateConfigFilesOptions as y, NormalizedTailwindCssPatchOptions as z };
+export { TailwindTokenByFileMap as $, groupTokensByFile as A, NormalizedTailwindCssPatchOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, CacheStrategy as F, TailwindV4Options as G, TailwindCssPatchOptions as H, ExposeContextOptions as I, PatchCheckStatus as J, ExtractResult as K, ExtendLengthUnitsOptions as L, normalizeOptions as M, ApplyOptions as N, extractRawCandidatesWithPositions as O, CacheOptions as P, TailwindPatchRuntime as Q, ExtractOptions as R, MIGRATION_REPORT_KIND as S, TailwindcssPatcher as T, TailwindV2Options as U, TailwindCssOptions as V, TailwindV3Options as W, PatchStatusEntry as X, PatchName as Y, PatchStatusReport as Z, ConfigFileMigrationEntry as _, ValidateFailureSummary as a, CacheClearOptions as at, RestoreConfigFilesOptions as b, TailwindcssPatchCliMountOptions as c, CacheContextDescriptor as ct, TailwindcssPatchCommandContext as d, CacheReadMeta as dt, TailwindTokenFileKey as et, TailwindcssPatchCommandHandler as f, CacheReadResult as ft, tailwindcssPatchCommands as g, TailwindcssPatchCommandOptions as h, ValidateFailureReason as i, TailwindcssRuntimeContext as it, BareArbitraryValueOptions as j, extractValidCandidates as k, TailwindcssPatchCliOptions as l, CacheContextMetadata as lt, TailwindcssPatchCommandOptionDefinition as m, VALIDATE_FAILURE_REASONS as n, TailwindTokenReport as nt, ValidateJsonFailurePayload as o, CacheClearResult as ot, TailwindcssPatchCommandHandlerMap as p, ILengthUnitsPatchOptions as q, ValidateCommandError as r, TailwindcssClassCache as rt, ValidateJsonSuccessPayload as s, CacheClearScope as st, VALIDATE_EXIT_CODES as t, TailwindTokenLocation as tt, TailwindcssPatchCommand as u, CacheIndexFileV2 as ut, ConfigFileMigrationReport as v, logger as w, RestoreConfigFilesResult as x, MigrateConfigFilesOptions as y, NormalizedCacheOptions as z };

package/dist/{validate-749MHvAC.js → validate-DzKStQUM.js}

@@ -23,7 +23,7 @@ _babel_traverse = require_chunk.__toESM(_babel_traverse);
 let _babel_parser = require("@babel/parser");
 let tailwindcss_config = require("tailwindcss-config");
 //#region package.json
-var version = "9.2.0";
+var version = "9.3.0";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1342,7 +1342,8 @@ function normalizeTailwindV4Options(v4, fallbackBase) {
 		...v4?.css === void 0 ? {} : { css: v4.css },
 		cssEntries,
 		sources,
-		hasUserDefinedSources
+		hasUserDefinedSources,
+		bareArbitraryValues: v4?.bareArbitraryValues === true ? {} : typeof v4?.bareArbitraryValues === "object" && v4.bareArbitraryValues !== null ? { ...v4.bareArbitraryValues } : false
 	};
 }
 function normalizeTailwindOptions(tailwind, projectRoot, shouldDefaultResolveFromCwd) {
@@ -1447,23 +1448,257 @@ async function loadPatchOptionsForWorkspace(cwd, overrides) {
 	return merge(overrides ?? {}, base, { projectRoot: cwd });
 }
 //#endregion
+//#region src/v4/bare-arbitrary-values.ts
+const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
+	"%",
+	"px",
+	"rpx",
+	"rem",
+	"em",
+	"vw",
+	"vh",
+	"vmin",
+	"vmax",
+	"dvw",
+	"dvh",
+	"svw",
+	"svh",
+	"lvw",
+	"lvh",
+	"ch",
+	"ex",
+	"lh",
+	"rlh",
+	"fr",
+	"deg",
+	"rad",
+	"turn",
+	"s",
+	"ms"
+];
+const NUMBER_RE = /^-?(?:\d+|\d*\.\d+)$/;
+const FUNCTION_VALUE_RE = /^[a-zA-Z_-][a-zA-Z0-9_-]*\(/;
+function splitVariantPrefix(candidate) {
+	let depth = 0;
+	let quote;
+	let lastSeparator = -1;
+	for (let index = 0; index < candidate.length; index++) {
+		const character = candidate[index];
+		if (character === "\\") {
+			index++;
+			continue;
+		}
+		if (quote) {
+			if (character === quote) quote = void 0;
+			continue;
+		}
+		if (character === "\"" || character === "'") {
+			quote = character;
+			continue;
+		}
+		if (character === "[" || character === "(" || character === "{") {
+			depth++;
+			continue;
+		}
+		if (character === "]" || character === ")" || character === "}") {
+			depth = Math.max(0, depth - 1);
+			continue;
+		}
+		if (depth === 0 && character === ":") lastSeparator = index;
+	}
+	if (lastSeparator === -1) return {
+		prefix: "",
+		body: candidate
+	};
+	return {
+		prefix: candidate.slice(0, lastSeparator + 1),
+		body: candidate.slice(lastSeparator + 1)
+	};
+}
+function isBalancedFunctionValue(value) {
+	let depth = 0;
+	let quote;
+	for (let index = 0; index < value.length; index++) {
+		const character = value[index];
+		if (character === "\\") {
+			index++;
+			continue;
+		}
+		if (quote) {
+			if (character === quote) quote = void 0;
+			continue;
+		}
+		if (character === "\"" || character === "'") {
+			quote = character;
+			continue;
+		}
+		if (character === "(") {
+			depth++;
+			continue;
+		}
+		if (character === ")") {
+			depth--;
+			if (depth < 0) return false;
+		}
+	}
+	return depth === 0 && quote === void 0;
+}
+function isHexColorValue(value) {
+	return /^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6,8})$/.test(value);
+}
+function isQuotedValue(value) {
+	const quote = value[0];
+	if (quote !== "\"" && quote !== "'" || value[value.length - 1] !== quote) return false;
+	let escaped = false;
+	for (let index = 1; index < value.length - 1; index++) {
+		const character = value[index];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (character === "\\") escaped = true;
+	}
+	return !escaped;
+}
+function normalizeBareArbitraryValueOptions(options) {
+	if (options === false || options === void 0 || options === null) return;
+	const units = options === true ? DEFAULT_BARE_ARBITRARY_VALUE_UNITS : options.units ?? DEFAULT_BARE_ARBITRARY_VALUE_UNITS;
+	const normalizedUnits = [...new Set(units.filter((unit) => typeof unit === "string" && unit.length > 0))];
+	if (normalizedUnits.length === 0) return;
+	return { units: normalizedUnits.sort((a, b) => b.length - a.length) };
+}
+function resolveValueWithUnit(body, units) {
+	for (const unit of units) {
+		if (!body.endsWith(unit)) continue;
+		const numberPart = body.slice(0, -unit.length);
+		if (NUMBER_RE.test(numberPart)) return `${numberPart}${unit}`;
+	}
+}
+function resolveArbitraryValue(body, units) {
+	const withUnit = resolveValueWithUnit(body, units);
+	if (withUnit) return withUnit;
+	if (isHexColorValue(body)) return body;
+	if (isQuotedValue(body)) return body;
+	if (FUNCTION_VALUE_RE.test(body) && body.endsWith(")") && isBalancedFunctionValue(body)) return body;
+}
+function resolveUtilityAndValue(body, units) {
+	let depth = 0;
+	let quote;
+	for (let index = 1; index < body.length; index++) {
+		const character = body[index];
+		if (character === "\\") {
+			index++;
+			continue;
+		}
+		if (quote) {
+			if (character === quote) quote = void 0;
+			continue;
+		}
+		if (character === "\"" || character === "'") {
+			quote = character;
+			continue;
+		}
+		if (character === "(" || character === "{") {
+			depth++;
+			continue;
+		}
+		if (character === ")" || character === "}") {
+			depth = Math.max(0, depth - 1);
+			continue;
+		}
+		if (depth > 0 || character !== "-") continue;
+		const utility = body.slice(0, index);
+		const rawValue = body.slice(index + 1);
+		if (!utility || !rawValue) continue;
+		const value = resolveArbitraryValue(rawValue, units);
+		if (value) return {
+			utility,
+			value
+		};
+	}
+}
+function resolveBareArbitraryValueCandidate(candidate, options) {
+	const normalizedOptions = normalizeBareArbitraryValueOptions(options);
+	if (!normalizedOptions || !candidate || candidate.includes("[") || candidate.includes("]")) return;
+	const { prefix, body } = splitVariantPrefix(candidate);
+	const important = body.startsWith("!") ? "!" : "";
+	let normalizedBody = important ? body.slice(1) : body;
+	const negative = normalizedBody.startsWith("-") ? "-" : "";
+	if (negative) normalizedBody = normalizedBody.slice(1);
+	const resolved = resolveUtilityAndValue(normalizedBody, normalizedOptions.units);
+	if (!resolved) return;
+	return {
+		candidate,
+		canonicalCandidate: `${prefix}${important}${negative}${resolved.utility}-[${resolved.value}]`
+	};
+}
+function escapeCssClassName(value) {
+	let result = "";
+	for (let index = 0; index < value.length; index++) {
+		const codeUnit = value.charCodeAt(index);
+		const character = value.charAt(index);
+		if (codeUnit === 0) {
+			result += "�";
+			continue;
+		}
+		if (codeUnit >= 1 && codeUnit <= 31 || codeUnit === 127 || index === 0 && codeUnit >= 48 && codeUnit <= 57 || index === 1 && codeUnit >= 48 && codeUnit <= 57 && value.charCodeAt(0) === 45) {
+			result += `\\${codeUnit.toString(16)} `;
+			continue;
+		}
+		if (codeUnit >= 128 || codeUnit === 45 || codeUnit === 95 || codeUnit >= 48 && codeUnit <= 57 || codeUnit >= 65 && codeUnit <= 90 || codeUnit >= 97 && codeUnit <= 122) {
+			result += character;
+			continue;
+		}
+		result += `\\${character}`;
+	}
+	return result;
+}
+//#endregion
 //#region src/v4/candidates.ts
-function resolveValidTailwindV4Candidates(designSystem, candidates) {
+function resolveValidTailwindV4Candidates(designSystem, candidates, options) {
 	const validCandidates = /* @__PURE__ */ new Set();
 	const parsedCandidates = [];
+	const originalCandidateByCanonical = /* @__PURE__ */ new Map();
 	for (const candidate of candidates) {
-		if (!candidate || parsedCandidates.includes(candidate)) continue;
-		if (designSystem.parseCandidate(candidate).length > 0) parsedCandidates.push(candidate);
+		if (!candidate) continue;
+		const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options?.bareArbitraryValues);
+		const candidateToCheck = bareArbitrary?.canonicalCandidate ?? candidate;
+		if (parsedCandidates.includes(candidateToCheck)) continue;
+		if (designSystem.parseCandidate(candidateToCheck).length > 0) {
+			parsedCandidates.push(candidateToCheck);
+			if (bareArbitrary) originalCandidateByCanonical.set(candidateToCheck, candidate);
+		}
 	}
 	if (parsedCandidates.length === 0) return validCandidates;
 	const cssByCandidate = designSystem.candidatesToCss(parsedCandidates);
 	for (let index = 0; index < parsedCandidates.length; index++) {
 		const candidate = parsedCandidates[index];
 		const candidateCss = cssByCandidate[index];
-		if (candidate && typeof candidateCss === "string" && candidateCss.trim().length > 0) validCandidates.add(candidate);
+		if (candidate && typeof candidateCss === "string" && candidateCss.trim().length > 0) validCandidates.add(originalCandidateByCanonical.get(candidate) ?? candidate);
 	}
 	return validCandidates;
 }
+function createSelectorAliasMap(candidates, options) {
+	const aliases = /* @__PURE__ */ new Map();
+	for (const candidate of candidates) {
+		const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options);
+		if (!bareArbitrary) continue;
+		aliases.set(escapeCssClassName(bareArbitrary.canonicalCandidate), escapeCssClassName(bareArbitrary.candidate));
+	}
+	return aliases;
+}
+function replaceBareArbitraryValueSelectors(css, candidates, options) {
+	const aliases = createSelectorAliasMap(candidates, options);
+	if (aliases.size === 0) return css;
+	let result = css;
+	for (const [canonicalSelector, bareSelector] of aliases) result = result.replaceAll(canonicalSelector, bareSelector);
+	return result;
+}
+function canonicalizeBareArbitraryValueCandidates(candidates, options) {
+	return Array.from(candidates, (candidate) => {
+		return resolveBareArbitraryValueCandidate(candidate, options)?.canonicalCandidate ?? candidate;
+	});
+}
 function splitTopLevel(value, separator) {
 	const result = [];
 	let start = 0;
@@ -1709,13 +1944,31 @@ async function compileTailwindV4Source(source) {
 //#region src/extraction/candidate-extractor.ts
 let oxideImportPromise;
 const designSystemCandidateCache = /* @__PURE__ */ new Map();
+function createOxideRuntimeDependencyError(cause) {
+	return new Error([
+		"tailwindcss-patch could not load @tailwindcss/oxide, which is required for source candidate scanning.",
+		"This dependency should be installed automatically by tailwindcss-patch.",
+		"Reinstall dependencies without disabling optional dependencies, or install @tailwindcss/oxide@^4.2.4 manually if your package manager omitted it."
+	].join(" "), { cause });
+}
 async function importOxide() {
-	return import("@tailwindcss/oxide");
+	try {
+		return await import("@tailwindcss/oxide");
+	} catch (error) {
+		throw createOxideRuntimeDependencyError(error);
+	}
 }
 function getOxideModule() {
 	oxideImportPromise ??= importOxide();
+	oxideImportPromise.catch(() => {
+		oxideImportPromise = void 0;
+	});
 	return oxideImportPromise;
 }
+function createCandidateCacheKey(designSystemKey, options) {
+	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return designSystemKey;
+	return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
+}
 async function extractRawCandidatesWithPositions(content, extension = "html") {
 	const { Scanner } = await getOxideModule();
 	return new Scanner({}).getCandidatesWithPositions({
@@ -1755,8 +2008,9 @@ async function extractValidCandidates(options) {
 	};
 	const designSystemKey = getTailwindV4DesignSystemCacheKey(source);
 	const designSystem = await loadTailwindV4DesignSystem(source);
-	const candidateCache = designSystemCandidateCache.get(designSystemKey) ?? /* @__PURE__ */ new Map();
-	designSystemCandidateCache.set(designSystemKey, candidateCache);
+	const candidateCacheKey = createCandidateCacheKey(designSystemKey, providedOptions);
+	const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
+	designSystemCandidateCache.set(candidateCacheKey, candidateCache);
 	const candidates = await extractRawCandidates(sources);
 	const validCandidates = [];
 	const uncachedCandidates = [];
@@ -1767,14 +2021,15 @@ async function extractValidCandidates(options) {
 			continue;
 		}
 		if (cached === false) continue;
-		if (designSystem.parseCandidate(rawCandidate).length > 0) {
+		const bareArbitrary = resolveBareArbitraryValueCandidate(rawCandidate, providedOptions.bareArbitraryValues);
+		if (designSystem.parseCandidate(rawCandidate).length > 0 || bareArbitrary && designSystem.parseCandidate(bareArbitrary.canonicalCandidate).length > 0) {
 			uncachedCandidates.push(rawCandidate);
 			continue;
 		}
 		candidateCache.set(rawCandidate, false);
 	}
 	if (uncachedCandidates.length === 0) return validCandidates;
-	const validUncachedCandidates = resolveValidTailwindV4Candidates(designSystem, uncachedCandidates);
+	const validUncachedCandidates = resolveValidTailwindV4Candidates(designSystem, uncachedCandidates, providedOptions.bareArbitraryValues === void 0 ? void 0 : { bareArbitraryValues: providedOptions.bareArbitraryValues });
 	for (const candidate of uncachedCandidates) {
 		const isValid = validUncachedCandidates.has(candidate);
 		candidateCache.set(candidate, isValid);
@@ -1982,6 +2237,7 @@ async function collectClassesFromTailwindV4(options) {
 			base: firstBase,
 			baseFallbacks: designSystemBases.slice(1),
 			css,
+			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
 			...sources === void 0 ? {} : { sources }
 		});
 		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
@@ -1992,6 +2248,7 @@ async function collectClassesFromTailwindV4(options) {
 		const candidates = await extractValidCandidates({
 			cwd: options.projectRoot,
 			base: baseForCss,
+			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
 			...v4Options.css === void 0 ? {} : { css: v4Options.css },
 			...sources === void 0 ? {} : { sources }
 		});
@@ -3599,6 +3856,12 @@ Object.defineProperty(exports, "ValidateCommandError", {
 		return ValidateCommandError;
 	}
 });
+Object.defineProperty(exports, "canonicalizeBareArbitraryValueCandidates", {
+	enumerable: true,
+	get: function() {
+		return canonicalizeBareArbitraryValueCandidates;
+	}
+});
 Object.defineProperty(exports, "classifyValidateError", {
 	enumerable: true,
 	get: function() {
@@ -3707,6 +3970,12 @@ Object.defineProperty(exports, "normalizeOptions", {
 		return normalizeOptions;
 	}
 });
+Object.defineProperty(exports, "replaceBareArbitraryValueSelectors", {
+	enumerable: true,
+	get: function() {
+		return replaceBareArbitraryValueSelectors;
+	}
+});
 Object.defineProperty(exports, "resolveValidTailwindV4Candidates", {
 	enumerable: true,
 	get: function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -66,6 +66,7 @@
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
     "@tailwindcss/node": "^4.2.4",
+    "@tailwindcss/oxide": "^4.2.4",
     "cac": "6.7.14",
     "consola": "^3.4.2",
     "fs-extra": "^11.3.4",
@@ -77,7 +78,6 @@
     "@tailwindcss-mangle/config": "7.0.1"
   },
   "devDependencies": {
-    "@tailwindcss/oxide": "^4.2.4",
     "@tailwindcss/postcss": "^4.2.4",
     "@tailwindcss/vite": "^4.2.4",
     "tailwindcss": "^4.1.18",

package/src/extraction/candidate-extractor.ts

@@ -8,18 +8,41 @@ import type {
 import { promises as fs } from 'node:fs'
 import process from 'node:process'
 import path from 'pathe'
+import {
+  type BareArbitraryValueOptions,
+  resolveBareArbitraryValueCandidate,
+} from '../v4/bare-arbitrary-values'
 import { resolveValidTailwindV4Candidates } from '../v4/candidates'
 import { getTailwindV4DesignSystemCacheKey, loadTailwindV4DesignSystem } from '../v4/node-adapter'
 
 let oxideImportPromise: ReturnType<typeof importOxide> | undefined
 const designSystemCandidateCache = new Map<string, Map<string, boolean>>()
 
+function createOxideRuntimeDependencyError(cause: unknown) {
+  return new Error(
+    [
+      'tailwindcss-patch could not load @tailwindcss/oxide, which is required for source candidate scanning.',
+      'This dependency should be installed automatically by tailwindcss-patch.',
+      'Reinstall dependencies without disabling optional dependencies, or install @tailwindcss/oxide@^4.2.4 manually if your package manager omitted it.',
+    ].join(' '),
+    { cause },
+  )
+}
+
 async function importOxide() {
-  return import('@tailwindcss/oxide')
+  try {
+    return await import('@tailwindcss/oxide')
+  }
+  catch (error) {
+    throw createOxideRuntimeDependencyError(error)
+  }
 }
 
 function getOxideModule() {
   oxideImportPromise ??= importOxide()
+  oxideImportPromise.catch(() => {
+    oxideImportPromise = undefined
+  })
   return oxideImportPromise
 }
 
@@ -29,6 +52,17 @@ export interface ExtractValidCandidatesOption {
   baseFallbacks?: string[]
   css?: string
   cwd?: string
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions
+}
+
+function createCandidateCacheKey(
+  designSystemKey: string,
+  options: Pick<ExtractValidCandidatesOption, 'bareArbitraryValues'>,
+) {
+  if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) {
+    return designSystemKey
+  }
+  return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`
 }
 
 export async function extractRawCandidatesWithPositions(
@@ -83,8 +117,9 @@ export async function extractValidCandidates(options?: ExtractValidCandidatesOpt
   }
   const designSystemKey = getTailwindV4DesignSystemCacheKey(source)
   const designSystem = await loadTailwindV4DesignSystem(source)
-  const candidateCache = designSystemCandidateCache.get(designSystemKey) ?? new Map<string, boolean>()
-  designSystemCandidateCache.set(designSystemKey, candidateCache)
+  const candidateCacheKey = createCandidateCacheKey(designSystemKey, providedOptions)
+  const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? new Map<string, boolean>()
+  designSystemCandidateCache.set(candidateCacheKey, candidateCache)
 
   const candidates = await extractRawCandidates(sources)
   const validCandidates: string[] = []
@@ -101,7 +136,11 @@ export async function extractValidCandidates(options?: ExtractValidCandidatesOpt
       continue
     }
 
-    if (designSystem.parseCandidate(rawCandidate).length > 0) {
+    const bareArbitrary = resolveBareArbitraryValueCandidate(rawCandidate, providedOptions.bareArbitraryValues)
+    if (
+      designSystem.parseCandidate(rawCandidate).length > 0
+      || (bareArbitrary && designSystem.parseCandidate(bareArbitrary.canonicalCandidate).length > 0)
+    ) {
       uncachedCandidates.push(rawCandidate)
       continue
     }
@@ -113,7 +152,13 @@ export async function extractValidCandidates(options?: ExtractValidCandidatesOpt
     return validCandidates
   }
 
-  const validUncachedCandidates = resolveValidTailwindV4Candidates(designSystem, uncachedCandidates)
+  const validUncachedCandidates = resolveValidTailwindV4Candidates(
+    designSystem,
+    uncachedCandidates,
+    providedOptions.bareArbitraryValues === undefined
+      ? undefined
+      : { bareArbitraryValues: providedOptions.bareArbitraryValues },
+  )
 
   for (const candidate of uncachedCandidates) {
     const isValid = validUncachedCandidates.has(candidate)

package/src/options/normalize.ts

@@ -170,6 +170,11 @@ function normalizeTailwindV4Options(
     cssEntries,
     sources,
     hasUserDefinedSources,
+    bareArbitraryValues: v4?.bareArbitraryValues === true
+      ? {}
+      : typeof v4?.bareArbitraryValues === 'object' && v4.bareArbitraryValues !== null
+        ? { ...v4.bareArbitraryValues }
+        : false,
   }
 }
 

package/src/options/types.ts

@@ -101,6 +101,11 @@ export interface TailwindV4Options {
   cssEntries?: string[]
   /** Overrides the content sources scanned by the oxide scanner. */
   sources?: SourceEntry[]
+  /** Enables UnoCSS-style bare arbitrary values such as `p-10%` and `p-2.5px`. */
+  bareArbitraryValues?: boolean | {
+    /** Unit allow-list used when detecting bare arbitrary values. */
+    units?: string[]
+  } | undefined
 }
 
 /**
@@ -185,6 +190,9 @@ export interface NormalizedTailwindV4Options {
   cssEntries: string[]
   sources: SourceEntry[]
   hasUserDefinedSources: boolean
+  bareArbitraryValues: false | {
+    units?: string[]
+  } | undefined
 }
 
 /**

package/src/runtime/class-collector.ts

@@ -83,6 +83,7 @@ export async function collectClassesFromTailwindV4(
         base: firstBase,
         baseFallbacks: designSystemBases.slice(1),
         css,
+        ...(v4Options.bareArbitraryValues === undefined ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues }),
         ...(sources === undefined ? {} : { sources }),
       }
       const candidates = await extractValidCandidates(extractOptions)
@@ -99,6 +100,7 @@ export async function collectClassesFromTailwindV4(
     const extractOptions = {
       cwd: options.projectRoot,
       base: baseForCss,
+      ...(v4Options.bareArbitraryValues === undefined ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues }),
       ...(v4Options.css === undefined ? {} : { css: v4Options.css }),
       ...(sources === undefined ? {} : { sources }),
     }