tailwindcss-patch 8.6.0 → 8.6.1

package/dist/{chunk-J27TPXH5.js → chunk-DRPYVUDA.js}

@@ -221,6 +221,25 @@ async function importNode() {
 async function importOxide() {
   return Promise.resolve().then(() => _interopRequireWildcard(require("@tailwindcss/oxide")));
 }
+async function loadDesignSystem(css, bases) {
+  const uniqueBases = Array.from(new Set(bases.filter(Boolean)));
+  if (uniqueBases.length === 0) {
+    throw new Error("No base directories provided for Tailwind CSS design system.");
+  }
+  const { __unstable__loadDesignSystem } = await importNode();
+  let lastError;
+  for (const base of uniqueBases) {
+    try {
+      return await __unstable__loadDesignSystem(css, { base });
+    } catch (error) {
+      lastError = error;
+    }
+  }
+  if (lastError instanceof Error) {
+    throw lastError;
+  }
+  throw new Error("Failed to load Tailwind CSS design system.");
+}
 async function extractRawCandidatesWithPositions(content, extension = "html") {
   const { Scanner } = await importOxide();
   const scanner = new Scanner({});
@@ -242,6 +261,7 @@ async function extractValidCandidates(options) {
   const providedOptions = _nullishCoalesce(options, () => ( {}));
   const defaultCwd = _nullishCoalesce(providedOptions.cwd, () => ( _process2.default.cwd()));
   const base = _nullishCoalesce(providedOptions.base, () => ( defaultCwd));
+  const baseFallbacks = _nullishCoalesce(providedOptions.baseFallbacks, () => ( []));
   const css = _nullishCoalesce(providedOptions.css, () => ( '@import "tailwindcss";'));
   const sources = (_nullishCoalesce(providedOptions.sources, () => ( [
     {
@@ -254,8 +274,7 @@ async function extractValidCandidates(options) {
     pattern: source.pattern,
     negated: source.negated
   }));
-  const { __unstable__loadDesignSystem } = await importNode();
-  const designSystem = await __unstable__loadDesignSystem(css, { base });
+  const designSystem = await loadDesignSystem(css, [base, ...baseFallbacks]);
   const candidates = await extractRawCandidates(sources);
   const parsedCandidates = candidates.filter(
     (rawCandidate) => designSystem.parseCandidate(rawCandidate).length > 0
@@ -1347,11 +1366,13 @@ async function collectClassesFromTailwindV4(options) {
       }
       const css = await _fsextra2.default.readFile(filePath, "utf8");
       const entryDir = _pathe2.default.dirname(filePath);
-      const baseForEntry = _nullishCoalesce(resolvedConfiguredBase, () => ( entryDir));
-      const sources = resolveSources(baseForEntry);
+      const designSystemBases = resolvedConfiguredBase && resolvedConfiguredBase !== entryDir ? [entryDir, resolvedConfiguredBase] : [entryDir];
+      const sourcesBase = _nullishCoalesce(resolvedConfiguredBase, () => ( entryDir));
+      const sources = resolveSources(sourcesBase);
       const candidates = await extractValidCandidates({
         cwd: options.projectRoot,
-        base: baseForEntry,
+        base: designSystemBases[0],
+        baseFallbacks: designSystemBases.slice(1),
         css,
         sources
       });

package/dist/{chunk-RVSD53YX.mjs → chunk-LOJHMBK5.mjs}

@@ -217,6 +217,25 @@ async function importNode() {
 async function importOxide() {
   return import("@tailwindcss/oxide");
 }
+async function loadDesignSystem(css, bases) {
+  const uniqueBases = Array.from(new Set(bases.filter(Boolean)));
+  if (uniqueBases.length === 0) {
+    throw new Error("No base directories provided for Tailwind CSS design system.");
+  }
+  const { __unstable__loadDesignSystem } = await importNode();
+  let lastError;
+  for (const base of uniqueBases) {
+    try {
+      return await __unstable__loadDesignSystem(css, { base });
+    } catch (error) {
+      lastError = error;
+    }
+  }
+  if (lastError instanceof Error) {
+    throw lastError;
+  }
+  throw new Error("Failed to load Tailwind CSS design system.");
+}
 async function extractRawCandidatesWithPositions(content, extension = "html") {
   const { Scanner } = await importOxide();
   const scanner = new Scanner({});
@@ -238,6 +257,7 @@ async function extractValidCandidates(options) {
   const providedOptions = options ?? {};
   const defaultCwd = providedOptions.cwd ?? process2.cwd();
   const base = providedOptions.base ?? defaultCwd;
+  const baseFallbacks = providedOptions.baseFallbacks ?? [];
   const css = providedOptions.css ?? '@import "tailwindcss";';
   const sources = (providedOptions.sources ?? [
     {
@@ -250,8 +270,7 @@ async function extractValidCandidates(options) {
     pattern: source.pattern,
     negated: source.negated
   }));
-  const { __unstable__loadDesignSystem } = await importNode();
-  const designSystem = await __unstable__loadDesignSystem(css, { base });
+  const designSystem = await loadDesignSystem(css, [base, ...baseFallbacks]);
   const candidates = await extractRawCandidates(sources);
   const parsedCandidates = candidates.filter(
     (rawCandidate) => designSystem.parseCandidate(rawCandidate).length > 0
@@ -1343,11 +1362,13 @@ async function collectClassesFromTailwindV4(options) {
       }
       const css = await fs5.readFile(filePath, "utf8");
       const entryDir = path5.dirname(filePath);
-      const baseForEntry = resolvedConfiguredBase ?? entryDir;
-      const sources = resolveSources(baseForEntry);
+      const designSystemBases = resolvedConfiguredBase && resolvedConfiguredBase !== entryDir ? [entryDir, resolvedConfiguredBase] : [entryDir];
+      const sourcesBase = resolvedConfiguredBase ?? entryDir;
+      const sources = resolveSources(sourcesBase);
       const candidates = await extractValidCandidates({
         cwd: options.projectRoot,
-        base: baseForEntry,
+        base: designSystemBases[0],
+        baseFallbacks: designSystemBases.slice(1),
         css,
         sources
       });

package/dist/cli.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var _chunkJ27TPXH5js = require('./chunk-J27TPXH5.js');
+var _chunkDRPYVUDAjs = require('./chunk-DRPYVUDA.js');
 
 // src/cli.ts
-var cli = _chunkJ27TPXH5js.createTailwindcssPatchCli.call(void 0, );
+var cli = _chunkDRPYVUDAjs.createTailwindcssPatchCli.call(void 0, );
 cli.help();
 cli.parse();

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import {
   createTailwindcssPatchCli
-} from "./chunk-RVSD53YX.mjs";
+} from "./chunk-LOJHMBK5.mjs";
 
 // src/cli.ts
 var cli = createTailwindcssPatchCli();

package/dist/index.d.mts

@@ -380,6 +380,7 @@ interface LegacyTailwindcssPatcherOptions {
 interface ExtractValidCandidatesOption {
     sources?: SourceEntry[];
     base?: string;
+    baseFallbacks?: string[];
     css?: string;
     cwd?: string;
 }

package/dist/index.d.ts

@@ -380,6 +380,7 @@ interface LegacyTailwindcssPatcherOptions {
 interface ExtractValidCandidatesOption {
     sources?: SourceEntry[];
     base?: string;
+    baseFallbacks?: string[];
     css?: string;
     cwd?: string;
 }

package/dist/index.js

@@ -16,7 +16,7 @@
 
 
 
-var _chunkJ27TPXH5js = require('./chunk-J27TPXH5.js');
+var _chunkDRPYVUDAjs = require('./chunk-DRPYVUDA.js');
 
 // src/index.ts
 var _config = require('@tailwindcss-mangle/config');
@@ -39,4 +39,4 @@ var _config = require('@tailwindcss-mangle/config');
 
 
 
-exports.CacheStore = _chunkJ27TPXH5js.CacheStore; exports.TailwindcssPatcher = _chunkJ27TPXH5js.TailwindcssPatcher; exports.collectClassesFromContexts = _chunkJ27TPXH5js.collectClassesFromContexts; exports.collectClassesFromTailwindV4 = _chunkJ27TPXH5js.collectClassesFromTailwindV4; exports.createTailwindcssPatchCli = _chunkJ27TPXH5js.createTailwindcssPatchCli; exports.defineConfig = _config.defineConfig; exports.extractProjectCandidatesWithPositions = _chunkJ27TPXH5js.extractProjectCandidatesWithPositions; exports.extractRawCandidates = _chunkJ27TPXH5js.extractRawCandidates; exports.extractRawCandidatesWithPositions = _chunkJ27TPXH5js.extractRawCandidatesWithPositions; exports.extractValidCandidates = _chunkJ27TPXH5js.extractValidCandidates; exports.getPatchStatusReport = _chunkJ27TPXH5js.getPatchStatusReport; exports.groupTokensByFile = _chunkJ27TPXH5js.groupTokensByFile; exports.loadRuntimeContexts = _chunkJ27TPXH5js.loadRuntimeContexts; exports.logger = _chunkJ27TPXH5js.logger_default; exports.mountTailwindcssPatchCommands = _chunkJ27TPXH5js.mountTailwindcssPatchCommands; exports.normalizeOptions = _chunkJ27TPXH5js.normalizeOptions; exports.runTailwindBuild = _chunkJ27TPXH5js.runTailwindBuild; exports.tailwindcssPatchCommands = _chunkJ27TPXH5js.tailwindcssPatchCommands;
+exports.CacheStore = _chunkDRPYVUDAjs.CacheStore; exports.TailwindcssPatcher = _chunkDRPYVUDAjs.TailwindcssPatcher; exports.collectClassesFromContexts = _chunkDRPYVUDAjs.collectClassesFromContexts; exports.collectClassesFromTailwindV4 = _chunkDRPYVUDAjs.collectClassesFromTailwindV4; exports.createTailwindcssPatchCli = _chunkDRPYVUDAjs.createTailwindcssPatchCli; exports.defineConfig = _config.defineConfig; exports.extractProjectCandidatesWithPositions = _chunkDRPYVUDAjs.extractProjectCandidatesWithPositions; exports.extractRawCandidates = _chunkDRPYVUDAjs.extractRawCandidates; exports.extractRawCandidatesWithPositions = _chunkDRPYVUDAjs.extractRawCandidatesWithPositions; exports.extractValidCandidates = _chunkDRPYVUDAjs.extractValidCandidates; exports.getPatchStatusReport = _chunkDRPYVUDAjs.getPatchStatusReport; exports.groupTokensByFile = _chunkDRPYVUDAjs.groupTokensByFile; exports.loadRuntimeContexts = _chunkDRPYVUDAjs.loadRuntimeContexts; exports.logger = _chunkDRPYVUDAjs.logger_default; exports.mountTailwindcssPatchCommands = _chunkDRPYVUDAjs.mountTailwindcssPatchCommands; exports.normalizeOptions = _chunkDRPYVUDAjs.normalizeOptions; exports.runTailwindBuild = _chunkDRPYVUDAjs.runTailwindBuild; exports.tailwindcssPatchCommands = _chunkDRPYVUDAjs.tailwindcssPatchCommands;

package/dist/index.mjs

@@ -16,7 +16,7 @@ import {
   normalizeOptions,
   runTailwindBuild,
   tailwindcssPatchCommands
-} from "./chunk-RVSD53YX.mjs";
+} from "./chunk-LOJHMBK5.mjs";
 
 // src/index.ts
 import { defineConfig } from "@tailwindcss-mangle/config";

package/package.json

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