tailwindcss-patch 9.3.4 → 9.3.5

package/dist/cli.js

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-DmELQoI2.js");
-const require_index_bundle = require("./index.bundle-BIcthh-J.js");
+const require_validate = require("./validate-5TFH6ktk.js");
+const require_index_bundle = require("./index.bundle-Cz6ZOOFG.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#region src/cli.bundle.ts

package/dist/cli.mjs

@@ -1,5 +1,5 @@
-import { N as logger, r as ValidateCommandError } from "./validate-BoTQvn7s.mjs";
-import { t as createTailwindcssPatchCli } from "./index.bundle-BU7uUzRH.mjs";
+import { N as logger, r as ValidateCommandError } from "./validate-SJIkeBUb.mjs";
+import { t as createTailwindcssPatchCli } from "./index.bundle-BXhvZOy8.mjs";
 import process from "node:process";
 //#region src/cli.bundle.ts
 async function main() {

package/dist/commands/cli-runtime.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("../chunk-8l464Juk.js");
-const require_validate = require("../validate-DmELQoI2.js");
+const require_validate = require("../validate-5TFH6ktk.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let fs_extra = require("fs-extra");

package/dist/commands/cli-runtime.mjs

@@ -1,4 +1,4 @@
-import { A as loadWorkspaceConfigModule, N as logger, S as groupTokensByFile, a as tailwindcssPatchCommands, i as classifyValidateError, k as loadPatchOptionsForWorkspace, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher } from "../validate-BoTQvn7s.mjs";
+import { A as loadWorkspaceConfigModule, N as logger, S as groupTokensByFile, a as tailwindcssPatchCommands, i as classifyValidateError, k as loadPatchOptionsForWorkspace, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher } from "../validate-SJIkeBUb.mjs";
 import process from "node:process";
 import fs from "fs-extra";
 import path from "pathe";

package/dist/{index.bundle-BU7uUzRH.mjs → index.bundle-BXhvZOy8.mjs}

@@ -1,4 +1,4 @@
-import { C as compileTailwindV4Source, D as replaceBareArbitraryValueSelectors, E as extractTailwindV4InlineSourceCandidates, O as resolveValidTailwindV4Candidates, T as canonicalizeBareArbitraryValueCandidates, _ as extractRawCandidates, j as normalizeOptions, v as extractRawCandidatesWithPositions, w as loadTailwindV4DesignSystem } from "./validate-BoTQvn7s.mjs";
+import { C as compileTailwindV4Source, D as replaceBareArbitraryValueSelectors, E as extractTailwindV4InlineSourceCandidates, O as resolveValidTailwindV4Candidates, T as canonicalizeBareArbitraryValueCandidates, _ as extractRawCandidates, j as normalizeOptions, v as extractRawCandidatesWithPositions, w as loadTailwindV4DesignSystem } from "./validate-SJIkeBUb.mjs";
 import { createRequire } from "node:module";
 import process from "node:process";
 import path from "pathe";

package/dist/{index.bundle-BIcthh-J.js → index.bundle-Cz6ZOOFG.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-DmELQoI2.js");
+const require_validate = require("./validate-5TFH6ktk.js");
 let node_module = require("node:module");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/index.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_validate = require("./validate-DmELQoI2.js");
-const require_index_bundle = require("./index.bundle-BIcthh-J.js");
+const require_validate = require("./validate-5TFH6ktk.js");
+const require_index_bundle = require("./index.bundle-Cz6ZOOFG.js");
 exports.CacheStore = require_validate.CacheStore;
 exports.MIGRATION_REPORT_KIND = require_validate.MIGRATION_REPORT_KIND;
 exports.MIGRATION_REPORT_SCHEMA_VERSION = require_validate.MIGRATION_REPORT_SCHEMA_VERSION;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { M as CacheStore, N as logger, O as resolveValidTailwindV4Candidates, S as groupTokensByFile, _ as extractRawCandidates, a as tailwindcssPatchCommands, b as extractSourceCandidatesWithPositions, c as MIGRATION_REPORT_KIND, d as getPatchStatusReport, f as runTailwindBuild, g as extractProjectCandidatesWithPositions, h as collectClassesFromTailwindV4, j as normalizeOptions, l as MIGRATION_REPORT_SCHEMA_VERSION, m as collectClassesFromContexts, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, p as loadRuntimeContexts, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher, v as extractRawCandidatesWithPositions, w as loadTailwindV4DesignSystem, x as extractValidCandidates, y as extractSourceCandidates } from "./validate-BoTQvn7s.mjs";
-import { a as resolveTailwindV4SourceFromPatchOptions, i as resolveTailwindV4Source, n as defineConfig, o as createTailwindV4Engine, r as mountTailwindcssPatchCommands, t as createTailwindcssPatchCli } from "./index.bundle-BU7uUzRH.mjs";
+import { M as CacheStore, N as logger, O as resolveValidTailwindV4Candidates, S as groupTokensByFile, _ as extractRawCandidates, a as tailwindcssPatchCommands, b as extractSourceCandidatesWithPositions, c as MIGRATION_REPORT_KIND, d as getPatchStatusReport, f as runTailwindBuild, g as extractProjectCandidatesWithPositions, h as collectClassesFromTailwindV4, j as normalizeOptions, l as MIGRATION_REPORT_SCHEMA_VERSION, m as collectClassesFromContexts, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, p as loadRuntimeContexts, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher, v as extractRawCandidatesWithPositions, w as loadTailwindV4DesignSystem, x as extractValidCandidates, y as extractSourceCandidates } from "./validate-SJIkeBUb.mjs";
+import { a as resolveTailwindV4SourceFromPatchOptions, i as resolveTailwindV4Source, n as defineConfig, o as createTailwindV4Engine, r as mountTailwindcssPatchCommands, t as createTailwindcssPatchCli } from "./index.bundle-BXhvZOy8.mjs";
 export { CacheStore, MIGRATION_REPORT_KIND, MIGRATION_REPORT_SCHEMA_VERSION, TailwindcssPatcher, VALIDATE_EXIT_CODES, VALIDATE_FAILURE_REASONS, ValidateCommandError, collectClassesFromContexts, collectClassesFromTailwindV4, createTailwindV4Engine, createTailwindcssPatchCli, defineConfig, extractProjectCandidatesWithPositions, extractRawCandidates, extractRawCandidatesWithPositions, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };

package/dist/{validate-DmELQoI2.js → validate-5TFH6ktk.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.3.4";
+var version = "9.3.5";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -2069,6 +2069,7 @@ function getOxideModule() {
 const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/;
 const CSS_DIRECTIVE_CANDIDATE_RE = /^@(?:apply|tailwind|source|config|plugin|theme|utility|custom-variant|variant)$/;
 const CSS_APPLY_IMPORTANT = "!important";
+const CSS_APPLY_RE = /@apply\s+([^;{}]+)/g;
 const JS_LIKE_SOURCE_EXTENSION_RE = /^(?:[cm]?[jt]sx?)$/;
 const MIXED_TEMPLATE_SOURCE_EXTENSION_RE = /^(?:vue|uvue|nvue|svelte|mpx)$/;
 const CSS_LIKE_SOURCE_EXTENSION_RE = /^(?:css|wxss|acss|jxss|ttss|qss|tyss|scss|sass|less|styl|stylus)$/;
@@ -2172,6 +2173,26 @@ function createLocalCandidate(candidate) {
 		end: candidate.localStart + candidate.rawCandidate.length
 	};
 }
+async function extractCssApplyCandidates(content, extension) {
+	const candidates = [];
+	CSS_APPLY_RE.lastIndex = 0;
+	let match = CSS_APPLY_RE.exec(content);
+	while (match !== null) {
+		const applyParams = match[1] ?? "";
+		const applyParamsStart = match.index + match[0].indexOf(applyParams);
+		const applyCandidates = await extractRawCandidatesWithPositions(applyParams, extension);
+		candidates.push(...applyCandidates.map((candidate) => ({
+			content: applyParams,
+			extension: "html",
+			localStart: candidate.start,
+			rawCandidate: candidate.rawCandidate,
+			start: candidate.start + applyParamsStart,
+			end: candidate.end + applyParamsStart
+		})));
+		match = CSS_APPLY_RE.exec(content);
+	}
+	return candidates;
+}
 async function extractMixedSourceScriptCandidates(content) {
 	const candidates = [];
 	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
@@ -2209,7 +2230,7 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 }
 async function extractSourceCandidatesWithPositions(content, extension = "html") {
 	const normalizedExtension = extension.replace(/^\./, "");
-	const candidates = (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+	const candidates = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension) ? await extractCssApplyCandidates(content, normalizedExtension) : (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
 		...candidate,
 		content,
 		extension: normalizedExtension,

package/dist/{validate-BoTQvn7s.mjs → validate-SJIkeBUb.mjs}

@@ -16,7 +16,7 @@ import _babelTraverse from "@babel/traverse";
 import { parse, parse as parse$1 } from "@babel/parser";
 import { loadConfig } from "tailwindcss-config";
 //#region package.json
-var version = "9.3.4";
+var version = "9.3.5";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -2067,6 +2067,7 @@ function getOxideModule() {
 const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/;
 const CSS_DIRECTIVE_CANDIDATE_RE = /^@(?:apply|tailwind|source|config|plugin|theme|utility|custom-variant|variant)$/;
 const CSS_APPLY_IMPORTANT = "!important";
+const CSS_APPLY_RE = /@apply\s+([^;{}]+)/g;
 const JS_LIKE_SOURCE_EXTENSION_RE = /^(?:[cm]?[jt]sx?)$/;
 const MIXED_TEMPLATE_SOURCE_EXTENSION_RE = /^(?:vue|uvue|nvue|svelte|mpx)$/;
 const CSS_LIKE_SOURCE_EXTENSION_RE = /^(?:css|wxss|acss|jxss|ttss|qss|tyss|scss|sass|less|styl|stylus)$/;
@@ -2170,6 +2171,26 @@ function createLocalCandidate(candidate) {
 		end: candidate.localStart + candidate.rawCandidate.length
 	};
 }
+async function extractCssApplyCandidates(content, extension) {
+	const candidates = [];
+	CSS_APPLY_RE.lastIndex = 0;
+	let match = CSS_APPLY_RE.exec(content);
+	while (match !== null) {
+		const applyParams = match[1] ?? "";
+		const applyParamsStart = match.index + match[0].indexOf(applyParams);
+		const applyCandidates = await extractRawCandidatesWithPositions(applyParams, extension);
+		candidates.push(...applyCandidates.map((candidate) => ({
+			content: applyParams,
+			extension: "html",
+			localStart: candidate.start,
+			rawCandidate: candidate.rawCandidate,
+			start: candidate.start + applyParamsStart,
+			end: candidate.end + applyParamsStart
+		})));
+		match = CSS_APPLY_RE.exec(content);
+	}
+	return candidates;
+}
 async function extractMixedSourceScriptCandidates(content) {
 	const candidates = [];
 	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
@@ -2207,7 +2228,7 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 }
 async function extractSourceCandidatesWithPositions(content, extension = "html") {
 	const normalizedExtension = extension.replace(/^\./, "");
-	const candidates = (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+	const candidates = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension) ? await extractCssApplyCandidates(content, normalizedExtension) : (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
 		...candidate,
 		content,
 		extension: normalizedExtension,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "9.3.4",
+  "version": "9.3.5",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",

package/src/extraction/candidate-extractor.ts

@@ -70,6 +70,7 @@ interface ExtractSourceCandidateWithContext extends ExtractSourceCandidate {
 const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/
 const CSS_DIRECTIVE_CANDIDATE_RE = /^@(?:apply|tailwind|source|config|plugin|theme|utility|custom-variant|variant)$/
 const CSS_APPLY_IMPORTANT = '!important'
+const CSS_APPLY_RE = /@apply\s+([^;{}]+)/g
 const JS_LIKE_SOURCE_EXTENSION_RE = /^(?:[cm]?[jt]sx?)$/
 const MIXED_TEMPLATE_SOURCE_EXTENSION_RE = /^(?:vue|uvue|nvue|svelte|mpx)$/
 const CSS_LIKE_SOURCE_EXTENSION_RE = /^(?:css|wxss|acss|jxss|ttss|qss|tyss|scss|sass|less|styl|stylus)$/
@@ -218,6 +219,27 @@ function createLocalCandidate(candidate: ExtractSourceCandidateWithContext): Ext
   }
 }
 
+async function extractCssApplyCandidates(content: string, extension: string) {
+  const candidates: ExtractSourceCandidateWithContext[] = []
+  CSS_APPLY_RE.lastIndex = 0
+  let match = CSS_APPLY_RE.exec(content)
+  while (match !== null) {
+    const applyParams = match[1] ?? ''
+    const applyParamsStart = match.index + match[0].indexOf(applyParams)
+    const applyCandidates = await extractRawCandidatesWithPositions(applyParams, extension)
+    candidates.push(...applyCandidates.map(candidate => ({
+      content: applyParams,
+      extension: 'html',
+      localStart: candidate.start,
+      rawCandidate: candidate.rawCandidate,
+      start: candidate.start + applyParamsStart,
+      end: candidate.end + applyParamsStart,
+    })))
+    match = CSS_APPLY_RE.exec(content)
+  }
+  return candidates
+}
+
 async function extractMixedSourceScriptCandidates(content: string) {
   const candidates: ExtractSourceCandidateWithContext[] = []
   SFC_SCRIPT_BLOCK_RE.lastIndex = 0
@@ -269,13 +291,15 @@ export async function extractSourceCandidatesWithPositions(
   extension: string = 'html',
 ): Promise<ExtractSourceCandidate[]> {
   const normalizedExtension = extension.replace(/^\./, '')
-  const candidates: ExtractSourceCandidateWithContext[] = (await extractRawCandidatesWithPositions(content, normalizedExtension))
-    .map(candidate => ({
-      ...candidate,
-      content,
-      extension: normalizedExtension,
-      localStart: candidate.start,
-    }))
+  const candidates: ExtractSourceCandidateWithContext[] = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension)
+    ? await extractCssApplyCandidates(content, normalizedExtension)
+    : (await extractRawCandidatesWithPositions(content, normalizedExtension))
+        .map(candidate => ({
+          ...candidate,
+          content,
+          extension: normalizedExtension,
+          localStart: candidate.start,
+        }))
   if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) {
     candidates.push(...await extractMixedSourceScriptCandidates(content))
   }