tailwindcss-patch 6.0.7 → 6.0.8

package/dist/{chunk-7LD7UWYL.js → chunk-436LRPDX.js}

@@ -163,12 +163,11 @@ var CacheManager = class {
         const data = await _fsextra2.default.readJSON(filename);
         return new Set(_nullishCoalesce(data, () => ( [])));
       }
-    } catch (error) {
-      logger_default.error(error);
+    } catch (e2) {
       try {
         isExisted && await _fsextra2.default.remove(filename);
-      } catch (error2) {
-        logger_default.error(error2);
+      } catch (error) {
+        logger_default.error(error);
       }
     }
     return /* @__PURE__ */ new Set();
@@ -192,6 +191,9 @@ function getPatchOptions(options) {
   return defu(
     options,
     {
+      output: {
+        removeUniversalSelector: true
+      },
       basedir: _process2.default.cwd()
     },
     getDefaultPatchOptions()
@@ -660,7 +662,7 @@ function internalPatch(pkgJsonPath, options) {
           Object.assign(_nullishCoalesce(result, () => ( {})), monkeyPatchForSupportingCustomUnit(twDir, defu(options.applyPatches.extendLengthUnits === true ? void 0 : options.applyPatches.extendLengthUnits, {
             overwrite: options.overwrite
           })));
-        } catch (e2) {
+        } catch (e3) {
         }
       }
       return result;
@@ -782,16 +784,15 @@ var TailwindcssPatcher = (_class = class {
     this.cacheOptions = getCacheOptions(options.cache);
     this.patchOptions = getPatchOptions(options.patch);
     this.cacheManager = new CacheManager(this.cacheOptions);
-    this.filter = this.patchOptions.filter;
+    this.filter = function filter(className) {
+      if (_optionalChain([this, 'access', _23 => _23.patchOptions, 'access', _24 => _24.output, 'optionalAccess', _25 => _25.removeUniversalSelector]) && className === "*") {
+        return false;
+      }
+      return Boolean(_optionalChain([this, 'access', _26 => _26.patchOptions, 'access', _27 => _27.filter, 'optionalCall', _28 => _28(className)]));
+    };
     const packageInfo = _localpkg.getPackageInfoSync.call(void 0, 
       _nullishCoalesce(this.patchOptions.packageName, () => ( "tailwindcss")),
       this.patchOptions.resolve
-      // defuOverrideArray<PackageResolvingOptions, Partial<PackageResolvingOptions>[]>(
-      //   this.patchOptions.resolve!,
-      //   {
-      //     paths: [import.meta.dirname],
-      //   },
-      // ),
     );
     if (!packageInfo) {
       throw new Error("tailwindcss not found");
@@ -799,13 +800,13 @@ var TailwindcssPatcher = (_class = class {
     if (packageInfo.version) {
       this.majorVersion = Number.parseInt(packageInfo.version[0]);
     }
-    if (_optionalChain([this, 'access', _23 => _23.patchOptions, 'access', _24 => _24.tailwindcss, 'optionalAccess', _25 => _25.version])) {
+    if (_optionalChain([this, 'access', _29 => _29.patchOptions, 'access', _30 => _30.tailwindcss, 'optionalAccess', _31 => _31.version])) {
       this.majorVersion = this.patchOptions.tailwindcss.version;
     }
     this.packageInfo = packageInfo;
     this.patch = () => {
       try {
-        return internalPatch(_optionalChain([this, 'access', _26 => _26.packageInfo, 'optionalAccess', _27 => _27.packageJsonPath]), this.patchOptions);
+        return internalPatch(_optionalChain([this, 'access', _32 => _32.packageInfo, 'optionalAccess', _33 => _33.packageJsonPath]), this.patchOptions);
       } catch (error) {
         logger_default.error(`patch tailwindcss failed: ${error.message}`);
       }
@@ -849,7 +850,7 @@ var TailwindcssPatcher = (_class = class {
     const { output, tailwindcss } = this.patchOptions;
     if (this.majorVersion === 4) {
       const { v4 } = _nullishCoalesce(tailwindcss, () => ( {}));
-      if (Array.isArray(_optionalChain([v4, 'optionalAccess', _28 => _28.cssEntries]))) {
+      if (Array.isArray(_optionalChain([v4, 'optionalAccess', _34 => _34.cssEntries]))) {
         const results = (await Promise.all(
           v4.cssEntries.map(async (x) => {
             if (await _fsextra2.default.exists(x)) {
@@ -861,32 +862,32 @@ var TailwindcssPatcher = (_class = class {
         )).filter((x) => x);
         for (const css of results) {
           const candidates = await extractValidCandidates({
-            base: _optionalChain([v4, 'optionalAccess', _29 => _29.base]),
+            base: _optionalChain([v4, 'optionalAccess', _35 => _35.base]),
             css,
-            sources: _optionalChain([v4, 'optionalAccess', _30 => _30.sources, 'optionalAccess', _31 => _31.map, 'call', _32 => _32((x) => {
+            sources: _optionalChain([v4, 'optionalAccess', _36 => _36.sources, 'optionalAccess', _37 => _37.map, 'call', _38 => _38((x) => {
               return {
-                base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _33 => _33.base]))), () => ( _process2.default.cwd())),
+                base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _39 => _39.base]))), () => ( _process2.default.cwd())),
                 pattern: x.pattern
               };
             })])
           });
           for (const candidate of candidates) {
-            _optionalChain([this, 'access', _34 => _34.filter, 'optionalCall', _35 => _35(candidate)]) && classSet.add(candidate);
+            _optionalChain([this, 'access', _40 => _40.filter, 'optionalCall', _41 => _41(candidate)]) && classSet.add(candidate);
           }
         }
       } else {
         const candidates = await extractValidCandidates({
-          base: _optionalChain([v4, 'optionalAccess', _36 => _36.base]),
-          css: _optionalChain([v4, 'optionalAccess', _37 => _37.css]),
-          sources: _optionalChain([v4, 'optionalAccess', _38 => _38.sources, 'optionalAccess', _39 => _39.map, 'call', _40 => _40((x) => {
+          base: _optionalChain([v4, 'optionalAccess', _42 => _42.base]),
+          css: _optionalChain([v4, 'optionalAccess', _43 => _43.css]),
+          sources: _optionalChain([v4, 'optionalAccess', _44 => _44.sources, 'optionalAccess', _45 => _45.map, 'call', _46 => _46((x) => {
             return {
-              base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _41 => _41.base]))), () => ( _process2.default.cwd())),
+              base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _47 => _47.base]))), () => ( _process2.default.cwd())),
               pattern: x.pattern
             };
           })])
         });
         for (const candidate of candidates) {
-          _optionalChain([this, 'access', _42 => _42.filter, 'optionalCall', _43 => _43(candidate)]) && classSet.add(candidate);
+          _optionalChain([this, 'access', _48 => _48.filter, 'optionalCall', _49 => _49(candidate)]) && classSet.add(candidate);
         }
       }
     } else {
@@ -895,10 +896,7 @@ var TailwindcssPatcher = (_class = class {
         const keys = classCacheMap.keys();
         for (const key of keys) {
           const v = key.toString();
-          if (_optionalChain([output, 'optionalAccess', _44 => _44.removeUniversalSelector]) && v === "*") {
-            continue;
-          }
-          _optionalChain([this, 'access', _45 => _45.filter, 'optionalCall', _46 => _46(v)]) && classSet.add(v);
+          _optionalChain([this, 'access', _50 => _50.filter, 'optionalCall', _51 => _51(v)]) && classSet.add(v);
         }
       }
     }

package/dist/{chunk-4NIV24YC.mjs → chunk-I3NEK7LN.mjs}

@@ -159,12 +159,11 @@ var CacheManager = class {
         const data = await fs.readJSON(filename);
         return new Set(data ?? []);
       }
-    } catch (error) {
-      logger_default.error(error);
+    } catch {
       try {
         isExisted && await fs.remove(filename);
-      } catch (error2) {
-        logger_default.error(error2);
+      } catch (error) {
+        logger_default.error(error);
       }
     }
     return /* @__PURE__ */ new Set();
@@ -188,6 +187,9 @@ function getPatchOptions(options) {
   return defu(
     options,
     {
+      output: {
+        removeUniversalSelector: true
+      },
       basedir: process2.cwd()
     },
     getDefaultPatchOptions()
@@ -778,16 +780,15 @@ var TailwindcssPatcher = class {
     this.cacheOptions = getCacheOptions(options.cache);
     this.patchOptions = getPatchOptions(options.patch);
     this.cacheManager = new CacheManager(this.cacheOptions);
-    this.filter = this.patchOptions.filter;
+    this.filter = function filter(className) {
+      if (this.patchOptions.output?.removeUniversalSelector && className === "*") {
+        return false;
+      }
+      return Boolean(this.patchOptions.filter?.(className));
+    };
     const packageInfo = getPackageInfoSync(
       this.patchOptions.packageName ?? "tailwindcss",
       this.patchOptions.resolve
-      // defuOverrideArray<PackageResolvingOptions, Partial<PackageResolvingOptions>[]>(
-      //   this.patchOptions.resolve!,
-      //   {
-      //     paths: [import.meta.dirname],
-      //   },
-      // ),
     );
     if (!packageInfo) {
       throw new Error("tailwindcss not found");
@@ -891,9 +892,6 @@ var TailwindcssPatcher = class {
         const keys = classCacheMap.keys();
         for (const key of keys) {
           const v = key.toString();
-          if (output?.removeUniversalSelector && v === "*") {
-            continue;
-          }
           this.filter?.(v) && classSet.add(v);
         }
       }

package/dist/cli.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunk7LD7UWYLjs = require('./chunk-7LD7UWYL.js');
+var _chunk436LRPDXjs = require('./chunk-436LRPDX.js');
 
 // src/cli.ts
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
@@ -16,29 +16,29 @@ function init() {
 }
 var cli = _cac2.default.call(void 0, );
 cli.command("install", "patch install").action(() => {
-  const twPatcher = new (0, _chunk7LD7UWYLjs.TailwindcssPatcher)({
-    patch: _chunk7LD7UWYLjs.getPatchOptions.call(void 0, )
+  const twPatcher = new (0, _chunk436LRPDXjs.TailwindcssPatcher)({
+    patch: _chunk436LRPDXjs.getPatchOptions.call(void 0, )
   });
   twPatcher.patch();
 });
 cli.command("init").action(async () => {
   await init();
-  _chunk7LD7UWYLjs.logger_default.success(`\u2728 ${_config.CONFIG_NAME}.config.ts initialized!`);
+  _chunk436LRPDXjs.logger_default.success(`\u2728 ${_config.CONFIG_NAME}.config.ts initialized!`);
 });
 cli.command("extract").action(async () => {
   const { config } = await _config.getConfig.call(void 0, );
   if (config) {
-    const twPatcher = new (0, _chunk7LD7UWYLjs.TailwindcssPatcher)(
+    const twPatcher = new (0, _chunk436LRPDXjs.TailwindcssPatcher)(
       {
-        patch: _chunk7LD7UWYLjs.defuOverrideArray.call(void 0, config.patch, {
+        patch: _chunk436LRPDXjs.defuOverrideArray.call(void 0, config.patch, {
           resolve: {
-            paths: [_chunk7LD7UWYLjs.importMetaUrl]
+            paths: [_chunk436LRPDXjs.importMetaUrl]
           }
         })
       }
     );
     const p = await twPatcher.extract();
-    p && _chunk7LD7UWYLjs.logger_default.success(`\u2728 tailwindcss-patch extract success! file path: ${p.filename}, classList length: ${p.classList.length}`);
+    p && _chunk436LRPDXjs.logger_default.success(`\u2728 tailwindcss-patch extract success! file path: ${p.filename}, classList length: ${p.classList.length}`);
   }
 });
 cli.help();

package/dist/cli.mjs

@@ -3,7 +3,7 @@ import {
   defuOverrideArray,
   getPatchOptions,
   logger_default
-} from "./chunk-4NIV24YC.mjs";
+} from "./chunk-I3NEK7LN.mjs";
 
 // src/cli.ts
 import process from "node:process";

package/dist/index.js

@@ -7,7 +7,7 @@
 
 
 
-var _chunk7LD7UWYLjs = require('./chunk-7LD7UWYL.js');
+var _chunk436LRPDXjs = require('./chunk-436LRPDX.js');
 
 // src/index.ts
 var _config = require('@tailwindcss-mangle/config');
@@ -21,4 +21,4 @@ var _config = require('@tailwindcss-mangle/config');
 
 
 
-exports.CacheManager = _chunk7LD7UWYLjs.CacheManager; exports.TailwindcssPatcher = _chunk7LD7UWYLjs.TailwindcssPatcher; exports.defineConfig = _config.defineConfig; exports.getCacheOptions = _chunk7LD7UWYLjs.getCacheOptions; exports.internalPatch = _chunk7LD7UWYLjs.internalPatch; exports.logger = _chunk7LD7UWYLjs.logger_default; exports.monkeyPatchForExposingContextV2 = _chunk7LD7UWYLjs.monkeyPatchForExposingContextV2; exports.monkeyPatchForExposingContextV3 = _chunk7LD7UWYLjs.monkeyPatchForExposingContextV3; exports.monkeyPatchForSupportingCustomUnit = _chunk7LD7UWYLjs.monkeyPatchForSupportingCustomUnit;
+exports.CacheManager = _chunk436LRPDXjs.CacheManager; exports.TailwindcssPatcher = _chunk436LRPDXjs.TailwindcssPatcher; exports.defineConfig = _config.defineConfig; exports.getCacheOptions = _chunk436LRPDXjs.getCacheOptions; exports.internalPatch = _chunk436LRPDXjs.internalPatch; exports.logger = _chunk436LRPDXjs.logger_default; exports.monkeyPatchForExposingContextV2 = _chunk436LRPDXjs.monkeyPatchForExposingContextV2; exports.monkeyPatchForExposingContextV3 = _chunk436LRPDXjs.monkeyPatchForExposingContextV3; exports.monkeyPatchForSupportingCustomUnit = _chunk436LRPDXjs.monkeyPatchForSupportingCustomUnit;

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
   monkeyPatchForExposingContextV2,
   monkeyPatchForExposingContextV3,
   monkeyPatchForSupportingCustomUnit
-} from "./chunk-4NIV24YC.mjs";
+} from "./chunk-I3NEK7LN.mjs";
 
 // src/index.ts
 import { defineConfig } from "@tailwindcss-mangle/config";

package/package.json

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