tailwindcss-patch 2.0.0 → 2.0.2

package/README.md

@@ -1,6 +1,6 @@
 # tailwindcss-patch
 
-get tailwindcss context at runtime ! extract all class to json file!
+get tailwindcss context at runtime ! extract all classes into file!
 
 - [tailwindcss-patch](#tailwindcss-patch)
   - [Setup](#setup)
@@ -10,9 +10,10 @@ get tailwindcss context at runtime ! extract all class to json file!
     - [Extract all class into a json](#extract-all-class-into-a-json)
     - [Nodejs](#nodejs)
   - [Migration form v1 to v2](#migration-form-v1-to-v2)
-    - [2. cli command change](#2-cli-command-change)
+    - [0. cli command change](#0-cli-command-change)
     - [1. default remove `*` in json array result](#1-default-remove--in-json-array-result)
-  - [Notice](#notice)
+
+> Nodejs version should >= `16.6.0`
 
 ## Setup
 
@@ -77,7 +78,7 @@ twPatcher.getClassSet()
 
 ## Migration form v1 to v2
 
-### 2. cli command change
+### 0. cli command change
 
 ```diff
 {
@@ -95,11 +96,3 @@ twPatcher.getClassSet()
   "text-[100px]"
 ]
 ```
-
-## Notice
-
-`getContexts`,`getClassCacheSet` should be invoked after `postcss-loader`'s activation.
-
-which means you may not get tailwindcss contexts at build start time.
-
-you may call them at `generateBundle` lifetime hook in `vite/webpack plugin`.

package/dist/cli.cjs

@@ -1,97 +1,27 @@
 'use strict';
 
+const cac = require('cac');
 const index = require('./index.cjs');
-const path = require('node:path');
+require('node:path');
 require('node:fs');
-const fs = require('node:fs/promises');
+require('node:fs/promises');
 require('resolve');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-const cac = require('cac');
+const config = require('@tailwindcss-mangle/config');
 require('semver');
 require('postcss');
-require('postcss-load-config');
-require('c12');
+require('lilconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const path__default = /*#__PURE__*/_interopDefaultCompat(path);
-const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-const dedent = createDedent({});
-function createDedent(options) {
-  dedent.withOptions = newOptions => createDedent(_objectSpread(_objectSpread({}, options), newOptions));
-  return dedent;
-  function dedent(strings, ...values) {
-    const raw = typeof strings === "string" ? [strings] : strings.raw;
-    const {
-      escapeSpecialCharacters = Array.isArray(strings)
-    } = options;
-
-    // first, perform interpolation
-    let result = "";
-    for (let i = 0; i < raw.length; i++) {
-      let next = raw[i];
-      if (escapeSpecialCharacters) {
-        // handle escaped newlines, backticks, and interpolation characters
-        next = next.replace(/\\\n[ \t]*/g, "").replace(/\\`/g, "`").replace(/\\\$/g, "$").replace(/\\{/g, "{");
-      }
-      result += next;
-      if (i < values.length) {
-        // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-        result += values[i];
-      }
-    }
-
-    // now strip indentation
-    const lines = result.split("\n");
-    let mindent = null;
-    for (const l of lines) {
-      const m = l.match(/^(\s+)\S+/);
-      if (m) {
-        const indent = m[1].length;
-        if (!mindent) {
-          // this is the first indented line
-          mindent = indent;
-        } else {
-          mindent = Math.min(mindent, indent);
-        }
-      }
-    }
-    if (mindent !== null) {
-      const m = mindent; // appease TypeScript
-      result = lines
-      // https://github.com/typescript-eslint/typescript-eslint/issues/7140
-      // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-      .map(l => l[0] === " " || l[0] === "\t" ? l.slice(m) : l).join("\n");
-    }
-    return result
-    // dedent eats leading and trailing whitespace too
-    .trim()
-    // handle escaped newlines at the end to ensure they don't get stripped too
-    .replace(/\\n/g, "\n");
-  }
-}
-
 function init() {
   const cwd = process.cwd();
-  return fs__default.writeFile(
-    path__default.resolve(cwd, "tailwindcss-patch.config.ts"),
-    dedent`
-      import { defineConfig } from 'tailwindcss-patch'
-
-      export default defineConfig({})
-    `,
-    "utf8"
-  );
+  return config.initConfig(cwd);
 }
 const cli = cac__default();
 cli.command("install", "patch install").action(() => {
@@ -101,13 +31,13 @@ cli.command("install", "patch install").action(() => {
 });
 cli.command("init").action(async () => {
   await init();
-  console.log("\u2728 tailwindcss-patch config initialized!");
+  console.log(`\u2728 ${config.configName}.config.ts initialized!`);
 });
 cli.command("extract").action(async () => {
-  const { config } = await index.getConfig();
-  if (config) {
+  const { config: config$1 } = await config.getConfig();
+  if (config$1) {
     const twPatcher = new index.TailwindcssPatcher();
-    const p = await twPatcher.extract(config);
+    const p = await twPatcher.extract(config$1.patch);
     console.log("\u2728 tailwindcss-patch extract success! file path:\n" + p);
   }
 });

package/dist/cli.mjs

@@ -1,89 +1,21 @@
-import { getPatchOptions, getConfig, TailwindcssPatcher, createPatch } from './index.mjs';
-import path from 'node:path';
+import cac from 'cac';
+import { getPatchOptions, TailwindcssPatcher, createPatch } from './index.mjs';
+import 'node:path';
 import 'node:fs';
-import fs from 'node:fs/promises';
+import 'node:fs/promises';
 import 'resolve';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import cac from 'cac';
+import { configName, getConfig, initConfig } from '@tailwindcss-mangle/config';
 import 'semver';
 import 'postcss';
-import 'postcss-load-config';
-import 'c12';
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-const dedent = createDedent({});
-function createDedent(options) {
-  dedent.withOptions = newOptions => createDedent(_objectSpread(_objectSpread({}, options), newOptions));
-  return dedent;
-  function dedent(strings, ...values) {
-    const raw = typeof strings === "string" ? [strings] : strings.raw;
-    const {
-      escapeSpecialCharacters = Array.isArray(strings)
-    } = options;
-
-    // first, perform interpolation
-    let result = "";
-    for (let i = 0; i < raw.length; i++) {
-      let next = raw[i];
-      if (escapeSpecialCharacters) {
-        // handle escaped newlines, backticks, and interpolation characters
-        next = next.replace(/\\\n[ \t]*/g, "").replace(/\\`/g, "`").replace(/\\\$/g, "$").replace(/\\{/g, "{");
-      }
-      result += next;
-      if (i < values.length) {
-        // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
-        result += values[i];
-      }
-    }
-
-    // now strip indentation
-    const lines = result.split("\n");
-    let mindent = null;
-    for (const l of lines) {
-      const m = l.match(/^(\s+)\S+/);
-      if (m) {
-        const indent = m[1].length;
-        if (!mindent) {
-          // this is the first indented line
-          mindent = indent;
-        } else {
-          mindent = Math.min(mindent, indent);
-        }
-      }
-    }
-    if (mindent !== null) {
-      const m = mindent; // appease TypeScript
-      result = lines
-      // https://github.com/typescript-eslint/typescript-eslint/issues/7140
-      // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-      .map(l => l[0] === " " || l[0] === "\t" ? l.slice(m) : l).join("\n");
-    }
-    return result
-    // dedent eats leading and trailing whitespace too
-    .trim()
-    // handle escaped newlines at the end to ensure they don't get stripped too
-    .replace(/\\n/g, "\n");
-  }
-}
+import 'lilconfig';
 
 function init() {
   const cwd = process.cwd();
-  return fs.writeFile(
-    path.resolve(cwd, "tailwindcss-patch.config.ts"),
-    dedent`
-      import { defineConfig } from 'tailwindcss-patch'
-
-      export default defineConfig({})
-    `,
-    "utf8"
-  );
+  return initConfig(cwd);
 }
 const cli = cac();
 cli.command("install", "patch install").action(() => {
@@ -93,13 +25,13 @@ cli.command("install", "patch install").action(() => {
 });
 cli.command("init").action(async () => {
   await init();
-  console.log("\u2728 tailwindcss-patch config initialized!");
+  console.log(`\u2728 ${configName}.config.ts initialized!`);
 });
 cli.command("extract").action(async () => {
   const { config } = await getConfig();
   if (config) {
     const twPatcher = new TailwindcssPatcher();
-    const p = await twPatcher.extract(config);
+    const p = await twPatcher.extract(config.patch);
     console.log("\u2728 tailwindcss-patch extract success! file path:\n" + p);
   }
 });

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
+const fs$1 = require('node:fs/promises');
 const path = require('node:path');
 const fs = require('node:fs');
-const fs$1 = require('node:fs/promises');
 const pkg = require('resolve');
 const semver = require('semver');
 const t = require('@babel/types');
@@ -10,8 +10,8 @@ const generate = require('@babel/generator');
 const traverse = require('@babel/traverse');
 const parser = require('@babel/parser');
 const postcss = require('postcss');
-const postcssrc = require('postcss-load-config');
-const c12 = require('c12');
+const lilconfig = require('lilconfig');
+const config = require('@tailwindcss-mangle/config');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -27,15 +27,14 @@ function _interopNamespaceCompat(e) {
   return n;
 }
 
+const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
-const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const pkg__default = /*#__PURE__*/_interopDefaultCompat(pkg);
 const t__namespace = /*#__PURE__*/_interopNamespaceCompat(t);
 const generate__default = /*#__PURE__*/_interopDefaultCompat(generate);
 const traverse__default = /*#__PURE__*/_interopDefaultCompat(traverse);
 const postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
-const postcssrc__default = /*#__PURE__*/_interopDefaultCompat(postcssrc);
 
 const { sync } = pkg__default;
 function ensureFileContent(filepaths) {
@@ -92,10 +91,11 @@ function getClassCacheSet(basedir, options) {
   for (const classCacheMap of classCaches) {
     const keys = classCacheMap.keys();
     for (const key of keys) {
-      if (options?.removeUniversalSelector && key.toString() === "*") {
+      const v = key.toString();
+      if (options?.removeUniversalSelector && v === "*") {
         continue;
       }
-      classSet.add(key.toString());
+      classSet.add(v);
     }
   }
   return classSet;
@@ -183,6 +183,48 @@ class CacheManager {
   }
 }
 
+function isObject(value) {
+  return value !== null && typeof value === "object";
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    if (value === null || value === void 0) {
+      continue;
+    }
+    if (merger && merger(object, key, value, namespace)) {
+      continue;
+    }
+    if (Array.isArray(value) && Array.isArray(object[key])) {
+      object[key] = [...value, ...object[key]];
+    } else if (isObject(value) && isObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+const defu = createDefu();
+
 function inspectProcessTailwindFeaturesReturnContext(content) {
   const ast = parser.parse(content);
   let hasPatched = false;
@@ -320,61 +362,9 @@ function inspectPostcssPlugin(content) {
   };
 }
 
-function isObject(value) {
-  return value !== null && typeof value === "object";
-}
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isObject(value) && isObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-const defu = createDefu();
-
-const defaultOptions = {
-  overwrite: true
-};
-function getDefaultUserConfig() {
+function getDefaultPatchOptions() {
   return {
-    output: {
-      filename: ".tw-patch/tw-class-list.json",
-      removeUniversalSelector: true,
-      loose: true
-    },
-    postcss: {
-      configDir: process.cwd()
-    }
+    overwrite: true
   };
 }
 
@@ -396,7 +386,7 @@ function getPatchOptions(options = {}) {
     {
       basedir: process.cwd()
     },
-    defaultOptions
+    getDefaultPatchOptions()
   );
 }
 function createPatch(opt) {
@@ -451,13 +441,31 @@ function internalPatch(pkgJsonPath, options) {
   }
 }
 
-async function getCss(p) {
-  const { options, plugins } = await postcssrc__default(void 0, p);
-  const res = await postcss__default(plugins).process("@tailwind base;@tailwind components;@tailwind utilities;", {
-    from: void 0,
-    ...options
+async function processTailwindcss(options) {
+  options.cwd = options.cwd ?? process.cwd();
+  let config = options.config;
+  if (!(typeof options.config === "string" && path__default.isAbsolute(options.config))) {
+    const moduleName = "tailwind";
+    const result = await lilconfig.lilconfig("tailwindcss", {
+      searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.cjs`],
+      loaders: {
+        // 默认支持 js 和 cjs 2种格式
+        ".js": require,
+        ".cjs": require
+      }
+    }).search(options.cwd);
+    if (!result) {
+      throw new Error(`No TailwindCSS Config found in: ${options.cwd}`);
+    }
+    config = result.filepath;
+  }
+  return await postcss__default([
+    require("tailwindcss")({
+      config
+    })
+  ]).process("@tailwind base;@tailwind components;@tailwind utilities;", {
+    from: void 0
   });
-  return res;
 }
 
 class TailwindcssPatcher {
@@ -507,42 +515,31 @@ class TailwindcssPatcher {
     return getContexts(basedir);
   }
   async extract(options) {
-    const { output, postcss } = options;
-    if (output && postcss) {
+    const { output, tailwindcss } = options ?? {};
+    if (output && tailwindcss) {
       const { removeUniversalSelector, filename, loose } = output;
-      const { configDir } = postcss;
-      await getCss(configDir);
+      await processTailwindcss(tailwindcss);
       const set = this.getClassSet({
         removeUniversalSelector
       });
-      await ensureDir(path.dirname(filename));
-      const classList = [...set];
-      await fs__default$1.writeFile(filename, JSON.stringify(classList, null, loose ? 2 : void 0), "utf8");
-      return filename;
+      if (filename) {
+        await ensureDir(path.dirname(filename));
+        const classList = [...set];
+        await fs__default$1.writeFile(filename, JSON.stringify(classList, null, loose ? 2 : void 0), "utf8");
+        return filename;
+      }
     }
   }
 }
 
-function getConfig() {
-  return c12.loadConfig({
-    name: "tailwindcss-patch",
-    defaults: {
-      ...getDefaultUserConfig()
-    }
-  });
-}
-const defineConfig = c12.createDefineConfig();
-
 exports.CacheManager = CacheManager;
 exports.TailwindcssPatcher = TailwindcssPatcher;
 exports.createPatch = createPatch;
-exports.defineConfig = defineConfig;
 exports.ensureDir = ensureDir;
 exports.ensureFileContent = ensureFileContent;
 exports.getCacheOptions = getCacheOptions;
 exports.getClassCacheSet = getClassCacheSet;
 exports.getClassCaches = getClassCaches;
-exports.getConfig = getConfig;
 exports.getContexts = getContexts;
 exports.getInstalledPkgJsonPath = getInstalledPkgJsonPath;
 exports.getPatchOptions = getPatchOptions;
@@ -552,3 +549,6 @@ exports.inspectProcessTailwindFeaturesReturnContext = inspectProcessTailwindFeat
 exports.internalPatch = internalPatch;
 exports.monkeyPatchForExposingContext = monkeyPatchForExposingContext;
 exports.requireResolve = requireResolve;
+Object.keys(config).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = config[k];
+});

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Rule, Node } from 'postcss';
 import { Config } from 'tailwindcss';
-import * as c12 from 'c12';
+import { UserConfig } from '@tailwindcss-mangle/config';
+export * from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 
 type CacheStrategy = 'merge' | 'overwrite';
@@ -37,7 +38,7 @@ type TailwindcssClassCache = Map<string, ({
 } | Rule)[]>;
 type TailwindcssRuntimeContext = {
     applyClassCache: Map<any, any>;
-    candidateRuleCache: Map<string | String, Set<[
+    candidateRuleCache: Map<string | string, Set<[
         {
             arbitrary: any;
             index: any;
@@ -49,7 +50,7 @@ type TailwindcssRuntimeContext = {
         },
         Node
     ]>>;
-    candidateRuleMap: Map<string | String, [object, Node][]>;
+    candidateRuleMap: Map<string | string, [object, Node][]>;
     changedContent: any[];
     classCache: TailwindcssClassCache;
     disposables: any[];
@@ -58,7 +59,7 @@ type TailwindcssRuntimeContext = {
     getVariants: Function;
     markInvalidUtilityCandidate: Function;
     markInvalidUtilityNode: Function;
-    notClassCache: Set<String>;
+    notClassCache: Set<string>;
     offsets: {
         layerPositions: object;
         offsets: object;
@@ -73,20 +74,6 @@ type TailwindcssRuntimeContext = {
     variantMap: Map<string, [[object, Function]]>;
     variantOptions: Map<string, object>;
 };
-interface UserConfig {
-    output?: {
-        filename?: string;
-        loose?: boolean;
-        /**
-         * @description remove * in output json
-         */
-        removeUniversalSelector?: boolean;
-    };
-    postcss?: {
-        configDir?: string;
-    };
-    tailwindcss?: {};
-}
 type DeepRequired<T> = {
     [K in keyof T]: Required<DeepRequired<T[K]>>;
 };
@@ -127,7 +114,7 @@ declare class TailwindcssPatcher {
         removeUniversalSelector?: boolean;
     }): Set<string>;
     getContexts(basedir?: string): TailwindcssRuntimeContext[];
-    extract(options: DeepRequired<UserConfig>): Promise<string | undefined>;
+    extract(options: UserConfig['patch']): Promise<string | undefined>;
 }
 
 declare function getTailwindcssEntry(basedir?: string): string;
@@ -155,11 +142,8 @@ declare function monkeyPatchForExposingContext(twDir: string, opt: InternalPatch
 } & Record<string, any>;
 declare function internalPatch(pkgJsonPath: string | undefined, options: InternalPatchOptions): any | undefined;
 
-declare function getConfig(): Promise<c12.ResolvedConfig<DeepRequired<UserConfig>, c12.ConfigLayerMeta>>;
-declare const defineConfig: c12.DefineConfig<UserConfig, c12.ConfigLayerMeta>;
-
 declare function ensureFileContent(filepaths: string | string[]): string | undefined;
 declare function requireResolve(id: string, opts?: SyncOpts): string;
 declare function ensureDir(p: string): Promise<void>;
 
-export { CacheManager, CacheOptions, CacheStrategy, DeepRequired, InternalCacheOptions, InternalPatchOptions, PatchOptions, TailwindcssClassCache, TailwindcssPatcher, TailwindcssPatcherOptions, TailwindcssRuntimeContext, UserConfig, createPatch, defineConfig, ensureDir, ensureFileContent, getCacheOptions, getClassCacheSet, getClassCaches, getConfig, getContexts, getInstalledPkgJsonPath, getPatchOptions, getTailwindcssEntry, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, monkeyPatchForExposingContext, requireResolve };
+export { CacheManager, CacheOptions, CacheStrategy, DeepRequired, InternalCacheOptions, InternalPatchOptions, PatchOptions, TailwindcssClassCache, TailwindcssPatcher, TailwindcssPatcherOptions, TailwindcssRuntimeContext, createPatch, ensureDir, ensureFileContent, getCacheOptions, getClassCacheSet, getClassCaches, getContexts, getInstalledPkgJsonPath, getPatchOptions, getTailwindcssEntry, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, monkeyPatchForExposingContext, requireResolve };

package/dist/index.mjs

@@ -1,6 +1,6 @@
+import fs$1 from 'node:fs/promises';
 import path, { dirname } from 'node:path';
 import fs from 'node:fs';
-import fs$1 from 'node:fs/promises';
 import pkg from 'resolve';
 import { gte } from 'semver';
 import * as t from '@babel/types';
@@ -8,9 +8,7 @@ import generate from '@babel/generator';
 import traverse from '@babel/traverse';
 import { parse } from '@babel/parser';
 import postcss from 'postcss';
-import postcssrc from 'postcss-load-config';
-import { createDefineConfig, loadConfig } from 'c12';
-
+import { lilconfig } from 'lilconfig';
 
 
 // -- Unbuild CommonJS Shims --
@@ -20,6 +18,8 @@ import __cjs_mod__ from 'module';
 const __filename = __cjs_url__.fileURLToPath(import.meta.url);
 const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
+export * from '@tailwindcss-mangle/config';
+
 const { sync } = pkg;
 function ensureFileContent(filepaths) {
   if (typeof filepaths === "string") {
@@ -75,10 +75,11 @@ function getClassCacheSet(basedir, options) {
   for (const classCacheMap of classCaches) {
     const keys = classCacheMap.keys();
     for (const key of keys) {
-      if (options?.removeUniversalSelector && key.toString() === "*") {
+      const v = key.toString();
+      if (options?.removeUniversalSelector && v === "*") {
         continue;
       }
-      classSet.add(key.toString());
+      classSet.add(v);
     }
   }
   return classSet;
@@ -166,6 +167,48 @@ class CacheManager {
   }
 }
 
+function isObject(value) {
+  return value !== null && typeof value === "object";
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    if (value === null || value === void 0) {
+      continue;
+    }
+    if (merger && merger(object, key, value, namespace)) {
+      continue;
+    }
+    if (Array.isArray(value) && Array.isArray(object[key])) {
+      object[key] = [...value, ...object[key]];
+    } else if (isObject(value) && isObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+const defu = createDefu();
+
 function inspectProcessTailwindFeaturesReturnContext(content) {
   const ast = parse(content);
   let hasPatched = false;
@@ -303,61 +346,9 @@ function inspectPostcssPlugin(content) {
   };
 }
 
-function isObject(value) {
-  return value !== null && typeof value === "object";
-}
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isObject(value) && isObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-const defu = createDefu();
-
-const defaultOptions = {
-  overwrite: true
-};
-function getDefaultUserConfig() {
+function getDefaultPatchOptions() {
   return {
-    output: {
-      filename: ".tw-patch/tw-class-list.json",
-      removeUniversalSelector: true,
-      loose: true
-    },
-    postcss: {
-      configDir: process.cwd()
-    }
+    overwrite: true
   };
 }
 
@@ -379,7 +370,7 @@ function getPatchOptions(options = {}) {
     {
       basedir: process.cwd()
     },
-    defaultOptions
+    getDefaultPatchOptions()
   );
 }
 function createPatch(opt) {
@@ -434,13 +425,31 @@ function internalPatch(pkgJsonPath, options) {
   }
 }
 
-async function getCss(p) {
-  const { options, plugins } = await postcssrc(void 0, p);
-  const res = await postcss(plugins).process("@tailwind base;@tailwind components;@tailwind utilities;", {
-    from: void 0,
-    ...options
+async function processTailwindcss(options) {
+  options.cwd = options.cwd ?? process.cwd();
+  let config = options.config;
+  if (!(typeof options.config === "string" && path.isAbsolute(options.config))) {
+    const moduleName = "tailwind";
+    const result = await lilconfig("tailwindcss", {
+      searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.cjs`],
+      loaders: {
+        // 默认支持 js 和 cjs 2种格式
+        ".js": require,
+        ".cjs": require
+      }
+    }).search(options.cwd);
+    if (!result) {
+      throw new Error(`No TailwindCSS Config found in: ${options.cwd}`);
+    }
+    config = result.filepath;
+  }
+  return await postcss([
+    require("tailwindcss")({
+      config
+    })
+  ]).process("@tailwind base;@tailwind components;@tailwind utilities;", {
+    from: void 0
   });
-  return res;
 }
 
 class TailwindcssPatcher {
@@ -490,30 +499,21 @@ class TailwindcssPatcher {
     return getContexts(basedir);
   }
   async extract(options) {
-    const { output, postcss } = options;
-    if (output && postcss) {
+    const { output, tailwindcss } = options ?? {};
+    if (output && tailwindcss) {
       const { removeUniversalSelector, filename, loose } = output;
-      const { configDir } = postcss;
-      await getCss(configDir);
+      await processTailwindcss(tailwindcss);
       const set = this.getClassSet({
         removeUniversalSelector
       });
-      await ensureDir(dirname(filename));
-      const classList = [...set];
-      await fs$1.writeFile(filename, JSON.stringify(classList, null, loose ? 2 : void 0), "utf8");
-      return filename;
+      if (filename) {
+        await ensureDir(dirname(filename));
+        const classList = [...set];
+        await fs$1.writeFile(filename, JSON.stringify(classList, null, loose ? 2 : void 0), "utf8");
+        return filename;
+      }
     }
   }
 }
 
-function getConfig() {
-  return loadConfig({
-    name: "tailwindcss-patch",
-    defaults: {
-      ...getDefaultUserConfig()
-    }
-  });
-}
-const defineConfig = createDefineConfig();
-
-export { CacheManager, TailwindcssPatcher, createPatch, defineConfig, ensureDir, ensureFileContent, getCacheOptions, getClassCacheSet, getClassCaches, getConfig, getContexts, getInstalledPkgJsonPath, getPatchOptions, getTailwindcssEntry, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, monkeyPatchForExposingContext, requireResolve };
+export { CacheManager, TailwindcssPatcher, createPatch, ensureDir, ensureFileContent, getCacheOptions, getClassCacheSet, getClassCaches, getContexts, getInstalledPkgJsonPath, getPatchOptions, getTailwindcssEntry, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, monkeyPatchForExposingContext, requireResolve };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tailwindcss-patch",
-  "version": "2.0.0",
-  "description": "patch tailwindcss for exposing context",
+  "version": "2.0.2",
+  "description": "patch tailwindcss for exposing context and extract classes",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -30,7 +30,9 @@
   ],
   "keywords": [
     "tailwindcss",
-    "patch"
+    "patch",
+    "extract",
+    "class"
   ],
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
@@ -38,27 +40,33 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "peerDependencies": {
+    "tailwindcss": ">=3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "tailwindcss": {
+      "optional": false
+    }
+  },
   "devDependencies": {
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.20.1",
     "@types/resolve": "^1.20.2",
     "@types/semver": "^7.5.0",
-    "dedent": "^1.5.1",
-    "defu": "^6.1.2",
     "pkg-types": "^1.0.3",
     "tailwindcss": "^3.3.3"
   },
   "dependencies": {
-    "@babel/generator": "^7.22.9",
-    "@babel/parser": "^7.22.7",
-    "@babel/traverse": "^7.22.8",
-    "@babel/types": "^7.22.5",
-    "c12": "^1.4.2",
+    "@babel/generator": "^7.22.10",
+    "@babel/parser": "^7.22.10",
+    "@babel/traverse": "^7.22.10",
+    "@babel/types": "^7.22.10",
     "cac": "^6.7.14",
+    "lilconfig": "^2.1.0",
     "postcss": "^8.4.27",
-    "postcss-load-config": "^4.0.1",
     "resolve": "^1.22.4",
-    "semver": "^7.5.4"
+    "semver": "^7.5.4",
+    "@tailwindcss-mangle/config": "^1.0.0"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {