tailwindcss-patch 6.0.1 → 6.0.3

package/dist/{chunk-U2NQZPXE.mjs → chunk-5K6TRQY5.mjs}

@@ -57,24 +57,22 @@ var CacheManager = class {
       const { filename } = this.options;
       await fs.outputJSON(filename, [...data]);
       return filename;
-    } catch {
-      logger_default.error("write cache file fail!");
+    } catch (error) {
+      logger_default.error(error);
     }
   }
   async read() {
     const { filename } = this.options;
+    const isExisted = await fs.exists(filename);
     try {
-      if (await fs.exists(filename)) {
+      if (isExisted) {
         const data = await fs.readJSON(filename);
         return new Set(data);
       }
-    } catch {
-      logger_default.error(`parse cache content fail! path:${filename}`);
-      try {
-        fs.unlinkSync(filename);
-      } catch {
-        logger_default.error(`delete cache file fail! path:${filename}`);
-      }
+    } catch (error) {
+      logger_default.error(`path:${filename}`);
+      logger_default.error(error);
+      isExisted && await fs.remove(filename);
     }
   }
 };
@@ -782,6 +780,9 @@ var TailwindcssPatcher = class {
     if (packageInfo.version) {
       this.majorVersion = Number.parseInt(packageInfo.version[0]);
     }
+    if (this.patchOptions.tailwindcss?.version) {
+      this.majorVersion = this.patchOptions.tailwindcss.version;
+    }
     this.packageInfo = packageInfo;
     this.patch = () => {
       try {
@@ -907,7 +908,7 @@ var TailwindcssPatcher = class {
     const { output, tailwindcss } = options ?? {};
     if (output && tailwindcss) {
       const { filename, loose } = output;
-      if (this.majorVersion === 3) {
+      if (this.majorVersion === 3 || this.majorVersion === 2) {
         await processTailwindcss({
           ...tailwindcss,
           majorVersion: this.majorVersion

package/dist/{chunk-U3S6WRCP.js → chunk-AT6RYKKS.js}

@@ -61,24 +61,22 @@ var CacheManager = class {
       const { filename } = this.options;
       await _fsextra2.default.outputJSON(filename, [...data]);
       return filename;
-    } catch (e2) {
-      logger_default.error("write cache file fail!");
+    } catch (error) {
+      logger_default.error(error);
     }
   }
   async read() {
     const { filename } = this.options;
+    const isExisted = await _fsextra2.default.exists(filename);
     try {
-      if (await _fsextra2.default.exists(filename)) {
+      if (isExisted) {
         const data = await _fsextra2.default.readJSON(filename);
         return new Set(data);
       }
-    } catch (e3) {
-      logger_default.error(`parse cache content fail! path:${filename}`);
-      try {
-        _fsextra2.default.unlinkSync(filename);
-      } catch (e4) {
-        logger_default.error(`delete cache file fail! path:${filename}`);
-      }
+    } catch (error) {
+      logger_default.error(`path:${filename}`);
+      logger_default.error(error);
+      isExisted && await _fsextra2.default.remove(filename);
     }
   }
 };
@@ -658,7 +656,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 (e5) {
+        } catch (e2) {
         }
       }
       return result;
@@ -786,10 +784,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])) {
+      this.majorVersion = this.patchOptions.tailwindcss.version;
+    }
     this.packageInfo = packageInfo;
     this.patch = () => {
       try {
-        return internalPatch(_optionalChain([this, 'access', _23 => _23.packageInfo, 'optionalAccess', _24 => _24.packageJsonPath]), this.patchOptions);
+        return internalPatch(_optionalChain([this, 'access', _26 => _26.packageInfo, 'optionalAccess', _27 => _27.packageJsonPath]), this.patchOptions);
       } catch (error) {
         logger_default.error(`patch tailwindcss failed: ${error.message}`);
       }
@@ -833,7 +834,7 @@ var TailwindcssPatcher = (_class = class {
     const { output, tailwindcss } = this.patchOptions;
     if (this.majorVersion === 4) {
       const { v4 } = _nullishCoalesce(tailwindcss, () => ( {}));
-      if (Array.isArray(_optionalChain([v4, 'optionalAccess', _25 => _25.cssEntries]))) {
+      if (Array.isArray(_optionalChain([v4, 'optionalAccess', _28 => _28.cssEntries]))) {
         const results = (await Promise.all(
           v4.cssEntries.map(async (x) => {
             if (await _fsextra2.default.exists(x)) {
@@ -845,11 +846,11 @@ var TailwindcssPatcher = (_class = class {
         )).filter((x) => x);
         for (const css of results) {
           const candidates = await extractValidCandidates({
-            base: _optionalChain([v4, 'optionalAccess', _26 => _26.base]),
+            base: _optionalChain([v4, 'optionalAccess', _29 => _29.base]),
             css,
-            sources: _optionalChain([v4, 'optionalAccess', _27 => _27.sources, 'optionalAccess', _28 => _28.map, 'call', _29 => _29((x) => {
+            sources: _optionalChain([v4, 'optionalAccess', _30 => _30.sources, 'optionalAccess', _31 => _31.map, 'call', _32 => _32((x) => {
               return {
-                base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _30 => _30.base]))), () => ( _process2.default.cwd())),
+                base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _33 => _33.base]))), () => ( _process2.default.cwd())),
                 pattern: x.pattern
               };
             })])
@@ -860,11 +861,11 @@ var TailwindcssPatcher = (_class = class {
         }
       } else {
         const candidates = await extractValidCandidates({
-          base: _optionalChain([v4, 'optionalAccess', _31 => _31.base]),
-          css: _optionalChain([v4, 'optionalAccess', _32 => _32.css]),
-          sources: _optionalChain([v4, 'optionalAccess', _33 => _33.sources, 'optionalAccess', _34 => _34.map, 'call', _35 => _35((x) => {
+          base: _optionalChain([v4, 'optionalAccess', _34 => _34.base]),
+          css: _optionalChain([v4, 'optionalAccess', _35 => _35.css]),
+          sources: _optionalChain([v4, 'optionalAccess', _36 => _36.sources, 'optionalAccess', _37 => _37.map, 'call', _38 => _38((x) => {
             return {
-              base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _36 => _36.base]))), () => ( _process2.default.cwd())),
+              base: _nullishCoalesce(_nullishCoalesce(x.base, () => ( _optionalChain([v4, 'optionalAccess', _39 => _39.base]))), () => ( _process2.default.cwd())),
               pattern: x.pattern
             };
           })])
@@ -879,7 +880,7 @@ var TailwindcssPatcher = (_class = class {
         const keys = classCacheMap.keys();
         for (const key of keys) {
           const v = key.toString();
-          if (_optionalChain([output, 'optionalAccess', _37 => _37.removeUniversalSelector]) && v === "*") {
+          if (_optionalChain([output, 'optionalAccess', _40 => _40.removeUniversalSelector]) && v === "*") {
             continue;
           }
           classSet.add(v);
@@ -911,7 +912,7 @@ var TailwindcssPatcher = (_class = class {
     const { output, tailwindcss } = _nullishCoalesce(options, () => ( {}));
     if (output && tailwindcss) {
       const { filename, loose } = output;
-      if (this.majorVersion === 3) {
+      if (this.majorVersion === 3 || this.majorVersion === 2) {
         await processTailwindcss({
           ...tailwindcss,
           majorVersion: this.majorVersion

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 
 
-var _chunkU3S6WRCPjs = require('./chunk-U3S6WRCP.js');
+var _chunkAT6RYKKSjs = require('./chunk-AT6RYKKS.js');
 
 // src/cli.ts
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
@@ -14,21 +14,21 @@ function init() {
 }
 var cli = _cac2.default.call(void 0, );
 cli.command("install", "patch install").action(() => {
-  const twPatcher = new (0, _chunkU3S6WRCPjs.TailwindcssPatcher)({
-    patch: _chunkU3S6WRCPjs.getPatchOptions.call(void 0, )
+  const twPatcher = new (0, _chunkAT6RYKKSjs.TailwindcssPatcher)({
+    patch: _chunkAT6RYKKSjs.getPatchOptions.call(void 0, )
   });
   twPatcher.patch();
 });
 cli.command("init").action(async () => {
   await init();
-  _chunkU3S6WRCPjs.logger_default.success(`\u2728 ${_config.CONFIG_NAME}.config.ts initialized!`);
+  _chunkAT6RYKKSjs.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, _chunkU3S6WRCPjs.TailwindcssPatcher)();
+    const twPatcher = new (0, _chunkAT6RYKKSjs.TailwindcssPatcher)();
     const p = await twPatcher.extract(config.patch);
-    _chunkU3S6WRCPjs.logger_default.success(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
+    _chunkAT6RYKKSjs.logger_default.success(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
   }
 });
 cli.help();

package/dist/cli.mjs

@@ -2,7 +2,7 @@ import {
   TailwindcssPatcher,
   getPatchOptions,
   logger_default
-} from "./chunk-U2NQZPXE.mjs";
+} from "./chunk-5K6TRQY5.mjs";
 
 // src/cli.ts
 import process from "node:process";

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { PatchUserConfig } from '@tailwindcss-mangle/config';
-export { defineConfig } from '@tailwindcss-mangle/config';
+export { TailwindcssUserConfig, defineConfig } from '@tailwindcss-mangle/config';
 import { PackageJson } from 'pkg-types';
 import { Node, Rule } from 'postcss';
 import { Config } from 'tailwindcss';
@@ -7,6 +7,7 @@ import { GlobEntry } from '@tailwindcss/oxide';
 import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
+
 interface PackageInfo {
     name: string;
     version: string | undefined;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { PatchUserConfig } from '@tailwindcss-mangle/config';
-export { defineConfig } from '@tailwindcss-mangle/config';
+export { TailwindcssUserConfig, defineConfig } from '@tailwindcss-mangle/config';
 import { PackageJson } from 'pkg-types';
 import { Node, Rule } from 'postcss';
 import { Config } from 'tailwindcss';
@@ -7,6 +7,7 @@ import { GlobEntry } from '@tailwindcss/oxide';
 import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
+
 interface PackageInfo {
     name: string;
     version: string | undefined;

package/dist/index.js

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

package/dist/index.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "postcss": "^8.5.2",
     "semver": "^7.7.1",
     "tailwindcss-config": "^1.0.0",
-    "@tailwindcss-mangle/config": "^5.0.0"
+    "@tailwindcss-mangle/config": "^5.0.1"
   },
   "devDependencies": {
     "@tailwindcss/node": "^4.0.6",