tailwindcss-patch 3.0.2 → 3.1.0-alpha.0

package/dist/cli.cjs

@@ -3,13 +3,13 @@
 const process = require('node:process');
 const cac = require('cac');
 const config = require('@tailwindcss-mangle/config');
-const index = require('./shared/tailwindcss-patch.1e524aba.cjs');
-require('@babel/types');
+const index = require('./shared/tailwindcss-patch.27719efb.cjs');
 require('node:path');
-require('node:fs');
-require('semver');
-require('node:fs/promises');
+require('fs-extra');
+require('@babel/types');
 require('resolve');
+require('semver');
+require('consola');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
@@ -35,14 +35,14 @@ cli.command("install", "patch install").action(() => {
 });
 cli.command("init").action(async () => {
   await init();
-  console.log(`\u2728 ${config.configName}.config.ts initialized!`);
+  index.logger.success(`\u2728 ${config.configName}.config.ts initialized!`);
 });
 cli.command("extract").action(async () => {
   const { config: config$1 } = await config.getConfig();
   if (config$1) {
     const twPatcher = new index.TailwindcssPatcher();
     const p = await twPatcher.extract(config$1.patch);
-    console.log(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
+    index.logger.success(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
   }
 });
 cli.help();

package/dist/cli.mjs

@@ -1,13 +1,13 @@
 import process from 'node:process';
 import cac from 'cac';
 import { configName, getConfig, initConfig } from '@tailwindcss-mangle/config';
-import { T as TailwindcssPatcher, g as getPatchOptions } from './shared/tailwindcss-patch.9adeca36.mjs';
-import '@babel/types';
+import { T as TailwindcssPatcher, g as getPatchOptions, l as logger } from './shared/tailwindcss-patch.ec6deb5e.mjs';
 import 'node:path';
-import 'node:fs';
-import 'semver';
-import 'node:fs/promises';
+import 'fs-extra';
+import '@babel/types';
 import 'resolve';
+import 'semver';
+import 'consola';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
@@ -28,14 +28,14 @@ cli.command("install", "patch install").action(() => {
 });
 cli.command("init").action(async () => {
   await init();
-  console.log(`\u2728 ${configName}.config.ts initialized!`);
+  logger.success(`\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.patch);
-    console.log(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
+    logger.success(`\u2728 tailwindcss-patch extract success! file path: ${p}`);
   }
 });
 cli.help();

package/dist/index.cjs

@@ -1,16 +1,16 @@
 'use strict';
 
-const index = require('./shared/tailwindcss-patch.1e524aba.cjs');
+const index = require('./shared/tailwindcss-patch.27719efb.cjs');
 const config = require('@tailwindcss-mangle/config');
 require('node:path');
-require('node:fs');
+require('fs-extra');
 require('node:process');
+require('consola');
 require('semver');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-require('node:fs/promises');
 require('resolve');
 require('postcss');
 require('lilconfig');
@@ -20,15 +20,14 @@ require('jiti');
 
 exports.CacheManager = index.CacheManager;
 exports.TailwindcssPatcher = index.TailwindcssPatcher;
-exports.ensureDir = index.ensureDir;
 exports.ensureFileContent = index.ensureFileContent;
 exports.getCacheOptions = index.getCacheOptions;
 exports.getPackageInfoSync = index.getPackageInfoSync;
-exports.inspectPostcssPlugin = index.inspectPostcssPlugin;
-exports.inspectProcessTailwindFeaturesReturnContext = index.inspectProcessTailwindFeaturesReturnContext;
 exports.internalPatch = index.internalPatch;
 exports.isObject = index.isObject;
+exports.logger = index.logger;
 exports.monkeyPatchForExposingContextV2 = index.monkeyPatchForExposingContextV2;
 exports.monkeyPatchForExposingContextV3 = index.monkeyPatchForExposingContextV3;
+exports.monkeyPatchForSupportingCustomUnit = index.monkeyPatchForSupportingCustomUnit;
 exports.requireResolve = index.requireResolve;
 exports.defineConfig = config.defineConfig;

package/dist/index.d.cts

@@ -4,6 +4,7 @@ import { UserConfig } from '@tailwindcss-mangle/config';
 export { defineConfig } from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 import { PackageJson } from 'pkg-types';
+import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
 interface PackageInfo {
@@ -26,12 +27,12 @@ interface PatchOptions {
     paths?: string[];
     basedir?: string;
     custom?: (dir: string, ctx: Record<string, any>) => void;
+    applyPatches?: {
+        exportContext?: boolean;
+        extendLengthUnits?: boolean;
+    };
 }
-interface InternalPatchOptions {
-    overwrite: boolean;
-    paths?: string[];
-    basedir?: string;
-    custom?: (dir: string, ctx: Record<string, any>) => void;
+interface InternalPatchOptions extends PatchOptions {
     version?: string;
 }
 interface TailwindcssPatcherOptions {
@@ -125,15 +126,6 @@ declare class TailwindcssPatcher {
     extract(options?: UserConfig['patch']): Promise<string | undefined>;
 }
 
-declare function inspectProcessTailwindFeaturesReturnContext(content: string): {
-    code: string;
-    hasPatched: boolean;
-};
-declare function inspectPostcssPlugin(content: string): {
-    code: string;
-    hasPatched: boolean;
-};
-
 declare function monkeyPatchForExposingContextV3(twDir: string, opt: InternalPatchOptions): {
     processTailwindFeatures?: string;
     plugin?: string;
@@ -142,11 +134,21 @@ declare function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPat
     processTailwindFeatures?: string;
     plugin?: string;
 } & Record<string, any>;
+
+interface ILengthUnitsPatchOptions {
+    units: string[];
+    lengthUnitsFilePath?: string;
+    variableName?: string;
+    overwrite?: boolean;
+    destPath?: string;
+}
+
+declare function monkeyPatchForSupportingCustomUnit(rootDir: string, options?: Partial<ILengthUnitsPatchOptions>): string | undefined;
+
 declare function internalPatch(pkgJsonPath: string | undefined, options: InternalPatchOptions): any | undefined;
 
 declare function ensureFileContent(filepaths: string | string[]): string | undefined;
 declare function requireResolve(id: string, opts?: SyncOpts): string;
-declare function ensureDir(p: string): Promise<void>;
 declare function getPackageInfoSync(name: string, options?: SyncOpts): {
     name: string;
     version: string | undefined;
@@ -156,4 +158,6 @@ declare function getPackageInfoSync(name: string, options?: SyncOpts): {
 } | undefined;
 declare function isObject(val: any): boolean;
 
-export { CacheManager, type CacheOptions, type CacheStrategy, type DeepRequired, type InternalCacheOptions, type InternalPatchOptions, type PackageInfo, type PatchOptions, type TailwindcssClassCache, TailwindcssPatcher, type TailwindcssPatcherOptions, type TailwindcssRuntimeContext, ensureDir, ensureFileContent, getCacheOptions, getPackageInfoSync, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, isObject, monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, requireResolve };
+declare const logger: consola.ConsolaInstance;
+
+export { CacheManager, type CacheOptions, type CacheStrategy, type DeepRequired, type InternalCacheOptions, type InternalPatchOptions, type PackageInfo, type PatchOptions, type TailwindcssClassCache, TailwindcssPatcher, type TailwindcssPatcherOptions, type TailwindcssRuntimeContext, ensureFileContent, getCacheOptions, getPackageInfoSync, internalPatch, isObject, logger, monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, monkeyPatchForSupportingCustomUnit, requireResolve };

package/dist/index.d.mts

@@ -4,6 +4,7 @@ import { UserConfig } from '@tailwindcss-mangle/config';
 export { defineConfig } from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 import { PackageJson } from 'pkg-types';
+import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
 interface PackageInfo {
@@ -26,12 +27,12 @@ interface PatchOptions {
     paths?: string[];
     basedir?: string;
     custom?: (dir: string, ctx: Record<string, any>) => void;
+    applyPatches?: {
+        exportContext?: boolean;
+        extendLengthUnits?: boolean;
+    };
 }
-interface InternalPatchOptions {
-    overwrite: boolean;
-    paths?: string[];
-    basedir?: string;
-    custom?: (dir: string, ctx: Record<string, any>) => void;
+interface InternalPatchOptions extends PatchOptions {
     version?: string;
 }
 interface TailwindcssPatcherOptions {
@@ -125,15 +126,6 @@ declare class TailwindcssPatcher {
     extract(options?: UserConfig['patch']): Promise<string | undefined>;
 }
 
-declare function inspectProcessTailwindFeaturesReturnContext(content: string): {
-    code: string;
-    hasPatched: boolean;
-};
-declare function inspectPostcssPlugin(content: string): {
-    code: string;
-    hasPatched: boolean;
-};
-
 declare function monkeyPatchForExposingContextV3(twDir: string, opt: InternalPatchOptions): {
     processTailwindFeatures?: string;
     plugin?: string;
@@ -142,11 +134,21 @@ declare function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPat
     processTailwindFeatures?: string;
     plugin?: string;
 } & Record<string, any>;
+
+interface ILengthUnitsPatchOptions {
+    units: string[];
+    lengthUnitsFilePath?: string;
+    variableName?: string;
+    overwrite?: boolean;
+    destPath?: string;
+}
+
+declare function monkeyPatchForSupportingCustomUnit(rootDir: string, options?: Partial<ILengthUnitsPatchOptions>): string | undefined;
+
 declare function internalPatch(pkgJsonPath: string | undefined, options: InternalPatchOptions): any | undefined;
 
 declare function ensureFileContent(filepaths: string | string[]): string | undefined;
 declare function requireResolve(id: string, opts?: SyncOpts): string;
-declare function ensureDir(p: string): Promise<void>;
 declare function getPackageInfoSync(name: string, options?: SyncOpts): {
     name: string;
     version: string | undefined;
@@ -156,4 +158,6 @@ declare function getPackageInfoSync(name: string, options?: SyncOpts): {
 } | undefined;
 declare function isObject(val: any): boolean;
 
-export { CacheManager, type CacheOptions, type CacheStrategy, type DeepRequired, type InternalCacheOptions, type InternalPatchOptions, type PackageInfo, type PatchOptions, type TailwindcssClassCache, TailwindcssPatcher, type TailwindcssPatcherOptions, type TailwindcssRuntimeContext, ensureDir, ensureFileContent, getCacheOptions, getPackageInfoSync, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, isObject, monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, requireResolve };
+declare const logger: consola.ConsolaInstance;
+
+export { CacheManager, type CacheOptions, type CacheStrategy, type DeepRequired, type InternalCacheOptions, type InternalPatchOptions, type PackageInfo, type PatchOptions, type TailwindcssClassCache, TailwindcssPatcher, type TailwindcssPatcherOptions, type TailwindcssRuntimeContext, ensureFileContent, getCacheOptions, getPackageInfoSync, internalPatch, isObject, logger, monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, monkeyPatchForSupportingCustomUnit, requireResolve };

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { UserConfig } from '@tailwindcss-mangle/config';
 export { defineConfig } from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 import { PackageJson } from 'pkg-types';
+import * as consola from 'consola';
 
 type CacheStrategy = 'merge' | 'overwrite';
 interface PackageInfo {
@@ -26,12 +27,12 @@ interface PatchOptions {
     paths?: string[];
     basedir?: string;
     custom?: (dir: string, ctx: Record<string, any>) => void;
+    applyPatches?: {
+        exportContext?: boolean;
+        extendLengthUnits?: boolean;
+    };
 }
-interface InternalPatchOptions {
-    overwrite: boolean;
-    paths?: string[];
-    basedir?: string;
-    custom?: (dir: string, ctx: Record<string, any>) => void;
+interface InternalPatchOptions extends PatchOptions {
     version?: string;
 }
 interface TailwindcssPatcherOptions {
@@ -125,15 +126,6 @@ declare class TailwindcssPatcher {
     extract(options?: UserConfig['patch']): Promise<string | undefined>;
 }
 
-declare function inspectProcessTailwindFeaturesReturnContext(content: string): {
-    code: string;
-    hasPatched: boolean;
-};
-declare function inspectPostcssPlugin(content: string): {
-    code: string;
-    hasPatched: boolean;
-};
-
 declare function monkeyPatchForExposingContextV3(twDir: string, opt: InternalPatchOptions): {
     processTailwindFeatures?: string;
     plugin?: string;
@@ -142,11 +134,21 @@ declare function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPat
     processTailwindFeatures?: string;
     plugin?: string;
 } & Record<string, any>;
+
+interface ILengthUnitsPatchOptions {
+    units: string[];
+    lengthUnitsFilePath?: string;
+    variableName?: string;
+    overwrite?: boolean;
+    destPath?: string;
+}
+
+declare function monkeyPatchForSupportingCustomUnit(rootDir: string, options?: Partial<ILengthUnitsPatchOptions>): string | undefined;
+
 declare function internalPatch(pkgJsonPath: string | undefined, options: InternalPatchOptions): any | undefined;
 
 declare function ensureFileContent(filepaths: string | string[]): string | undefined;
 declare function requireResolve(id: string, opts?: SyncOpts): string;
-declare function ensureDir(p: string): Promise<void>;
 declare function getPackageInfoSync(name: string, options?: SyncOpts): {
     name: string;
     version: string | undefined;
@@ -156,4 +158,6 @@ declare function getPackageInfoSync(name: string, options?: SyncOpts): {
 } | undefined;
 declare function isObject(val: any): boolean;
 
-export { CacheManager, type CacheOptions, type CacheStrategy, type DeepRequired, type InternalCacheOptions, type InternalPatchOptions, type PackageInfo, type PatchOptions, type TailwindcssClassCache, TailwindcssPatcher, type TailwindcssPatcherOptions, type TailwindcssRuntimeContext, ensureDir, ensureFileContent, getCacheOptions, getPackageInfoSync, inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext, internalPatch, isObject, monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, requireResolve };
+declare const logger: consola.ConsolaInstance;
+
+export { CacheManager, type CacheOptions, type CacheStrategy, type DeepRequired, type InternalCacheOptions, type InternalPatchOptions, type PackageInfo, type PatchOptions, type TailwindcssClassCache, TailwindcssPatcher, type TailwindcssPatcherOptions, type TailwindcssRuntimeContext, ensureFileContent, getCacheOptions, getPackageInfoSync, internalPatch, isObject, logger, monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, monkeyPatchForSupportingCustomUnit, requireResolve };

package/dist/index.mjs

@@ -1,14 +1,14 @@
-export { C as CacheManager, T as TailwindcssPatcher, f as ensureDir, e as ensureFileContent, d as getCacheOptions, h as getPackageInfoSync, a as inspectPostcssPlugin, i as inspectProcessTailwindFeaturesReturnContext, c as internalPatch, j as isObject, b as monkeyPatchForExposingContextV2, m as monkeyPatchForExposingContextV3, r as requireResolve } from './shared/tailwindcss-patch.9adeca36.mjs';
+export { C as CacheManager, T as TailwindcssPatcher, e as ensureFileContent, c as getCacheOptions, d as getPackageInfoSync, i as internalPatch, f as isObject, l as logger, a as monkeyPatchForExposingContextV2, m as monkeyPatchForExposingContextV3, b as monkeyPatchForSupportingCustomUnit, r as requireResolve } from './shared/tailwindcss-patch.ec6deb5e.mjs';
 export { defineConfig } from '@tailwindcss-mangle/config';
 import 'node:path';
-import 'node:fs';
+import 'fs-extra';
 import 'node:process';
+import 'consola';
 import 'semver';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import 'node:fs/promises';
 import 'resolve';
 import 'postcss';
 import 'lilconfig';

package/dist/shared/{tailwindcss-patch.1e524aba.cjs → tailwindcss-patch.27719efb.cjs}

@@ -1,14 +1,14 @@
 'use strict';
 
 const path = require('node:path');
-const fs = require('node:fs');
+const fs = require('fs-extra');
 const process = require('node:process');
+const consola = require('consola');
 const semver = require('semver');
 const t = require('@babel/types');
 const _babelGenerate = require('@babel/generator');
 const _babelTraverse = require('@babel/traverse');
 const parser = require('@babel/parser');
-const fs$1 = require('node:fs/promises');
 const pkg = require('resolve');
 const postcss = require('postcss');
 const lilconfig = require('lilconfig');
@@ -35,16 +35,13 @@ const process__default = /*#__PURE__*/_interopDefaultCompat(process);
 const t__namespace = /*#__PURE__*/_interopNamespaceCompat(t);
 const _babelGenerate__default = /*#__PURE__*/_interopDefaultCompat(_babelGenerate);
 const _babelTraverse__default = /*#__PURE__*/_interopDefaultCompat(_babelTraverse);
-const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$1);
 const pkg__default = /*#__PURE__*/_interopDefaultCompat(pkg);
 const postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
 const createJiti__default = /*#__PURE__*/_interopDefaultCompat(createJiti);
 
 const pkgName = "tailwindcss-patch";
 
-function log(message, ...optionalParams) {
-  return console.log(`[${pkgName}]:${message}`, ...optionalParams);
-}
+const logger = consola.createConsola();
 
 var __defProp$1 = Object.defineProperty;
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -108,7 +105,7 @@ class CacheManager {
       fs__default.writeFileSync(filename, JSON.stringify([...data], void 0, 2), "utf8");
       return filename;
     } catch {
-      log("write cache file fail!");
+      logger.error("write cache file fail!");
     }
   }
   read() {
@@ -119,11 +116,11 @@ class CacheManager {
         return new Set(JSON.parse(data));
       }
     } catch {
-      log(`parse cache content fail! path:${filename}`);
+      logger.error(`parse cache content fail! path:${filename}`);
       try {
         fs__default.unlinkSync(filename);
       } catch {
-        log(`delete cache file fail! path:${filename}`);
+        logger.error(`delete cache file fail! path:${filename}`);
       }
     }
   }
@@ -424,15 +421,6 @@ function ensureFileContent(filepaths) {
 function requireResolve(id, opts) {
   return sync(id, opts);
 }
-async function ensureDir(p) {
-  try {
-    await fs__default$1.access(p);
-  } catch {
-    await fs__default$1.mkdir(p, {
-      recursive: true
-    });
-  }
-}
 function searchPackageJSON(dir) {
   let packageJsonPath;
   while (true) {
@@ -489,7 +477,7 @@ function monkeyPatchForExposingContextV3(twDir, opt) {
       fs__default.writeFileSync(processTailwindFeaturesFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss processTailwindFeatures for return content successfully!");
+      logger.success("patch tailwindcss processTailwindFeatures for return content successfully!");
     }
     result.processTailwindFeatures = code;
   }
@@ -502,7 +490,7 @@ function monkeyPatchForExposingContextV3(twDir, opt) {
       fs__default.writeFileSync(pluginFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss for expose runtime content successfully!");
+      logger.success("patch tailwindcss for expose runtime context successfully!");
     }
     result.plugin = code;
   }
@@ -519,7 +507,7 @@ function monkeyPatchForExposingContextV2(twDir, opt) {
       fs__default.writeFileSync(processTailwindFeaturesFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss processTailwindFeatures for return content successfully!");
+      logger.success("patch tailwindcss processTailwindFeatures for return content successfully!");
     }
     result.processTailwindFeatures = code;
   }
@@ -531,71 +519,13 @@ function monkeyPatchForExposingContextV2(twDir, opt) {
       fs__default.writeFileSync(indexFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss for expose runtime content successfully!");
+      logger.success("patch tailwindcss for expose runtime content successfully!");
     }
     result.plugin = code;
   }
   opt.custom && typeof opt.custom === "function" && opt.custom(twDir, result);
   return result;
 }
-function internalPatch(pkgJsonPath, options) {
-  if (pkgJsonPath) {
-    const pkgJson = require(pkgJsonPath);
-    const twDir = path__default.dirname(pkgJsonPath);
-    if (semver.gte(pkgJson.version, "3.0.0")) {
-      options.version = pkgJson.version;
-      const result = monkeyPatchForExposingContextV3(twDir, options);
-      return result;
-    } else if (semver.gte(pkgJson.version, "2.0.0")) {
-      options.version = pkgJson.version;
-      const result = monkeyPatchForExposingContextV2(twDir, options);
-      return result;
-    }
-  }
-}
-
-const jiti = createJiti__default(__filename);
-async function processTailwindcss(options) {
-  options.cwd = options.cwd ?? process__default.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`,
-        `${moduleName}.config.mjs`,
-        `${moduleName}.config.ts`,
-        `${moduleName}.config.cts`,
-        `${moduleName}.config.mts`
-      ],
-      loaders: {
-        // 默认支持 js 和 cjs 2种格式
-        ".js": jiti,
-        ".cjs": jiti,
-        ".mjs": jiti,
-        ".ts": jiti,
-        ".cts": jiti,
-        ".mts": jiti
-      }
-    }).search(options.cwd);
-    if (!result) {
-      throw new Error(`No TailwindCSS Config found in: ${options.cwd}`);
-    }
-    config = result.filepath;
-  }
-  const id = requireResolve("tailwindcss", {
-    basedir: options.cwd
-  });
-  return await postcss__default([
-    // eslint-disable-next-line ts/no-var-requires, ts/no-require-imports
-    require(id)({
-      config
-    })
-  ]).process("@tailwind base;@tailwind components;@tailwind utilities;", {
-    from: void 0
-  });
-}
 
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") {
@@ -653,8 +583,152 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+function findAstNode(content, options) {
+  const { variableName, units } = options;
+  const ast = parser.parse(content);
+  let arrayRef;
+  let changed = false;
+  traverse(ast, {
+    Identifier(path2) {
+      if (path2.node.name === variableName && t__namespace.isVariableDeclarator(path2.parent) && t__namespace.isArrayExpression(path2.parent.init)) {
+        arrayRef = path2.parent.init;
+        const set = new Set(path2.parent.init.elements.map((x) => x.value));
+        for (let i = 0; i < units.length; i++) {
+          const unit = units[i];
+          if (!set.has(unit)) {
+            path2.parent.init.elements = path2.parent.init.elements.map((x) => {
+              if (t__namespace.isStringLiteral(x)) {
+                return {
+                  type: x?.type,
+                  value: x?.value
+                };
+              }
+              return x;
+            });
+            path2.parent.init.elements.push({
+              type: "StringLiteral",
+              value: unit
+            });
+            changed = true;
+          }
+        }
+      }
+    }
+  });
+  return {
+    arrayRef,
+    changed
+  };
+}
+function monkeyPatchForSupportingCustomUnit(rootDir, options) {
+  const opts = defu(options, {
+    units: ["rpx"],
+    lengthUnitsFilePath: "lib/util/dataTypes.js",
+    variableName: "lengthUnits",
+    overwrite: true
+  });
+  const { lengthUnitsFilePath, overwrite, destPath } = opts;
+  const dataTypesFilePath = path__default.resolve(rootDir, lengthUnitsFilePath);
+  const dataTypesFileContent = fs__default.readFileSync(dataTypesFilePath, {
+    encoding: "utf8"
+  });
+  const { arrayRef, changed } = findAstNode(dataTypesFileContent, opts);
+  if (arrayRef && changed) {
+    const { code } = generate(arrayRef, {
+      jsescOption: {
+        quotes: "single"
+      }
+    });
+    if (arrayRef.start && arrayRef.end) {
+      const prev = dataTypesFileContent.slice(0, arrayRef.start);
+      const next = dataTypesFileContent.slice(arrayRef.end);
+      const newCode = prev + code + next;
+      if (overwrite) {
+        fs__default.writeFileSync(destPath ?? dataTypesFilePath, newCode, {
+          encoding: "utf8"
+        });
+        logger.success("patch tailwindcss for custom length unit successfully!");
+      }
+    }
+    return code;
+  }
+}
+
+function internalPatch(pkgJsonPath, options) {
+  if (pkgJsonPath) {
+    const pkgJson = require(pkgJsonPath);
+    const twDir = path__default.dirname(pkgJsonPath);
+    if (semver.gte(pkgJson.version, "3.0.0")) {
+      options.version = pkgJson.version;
+      if (options.applyPatches?.extendLengthUnits) {
+        try {
+          monkeyPatchForSupportingCustomUnit(twDir, {
+            overwrite: options.overwrite
+          });
+        } catch {
+        }
+      }
+      if (options.applyPatches?.exportContext) {
+        return monkeyPatchForExposingContextV3(twDir, options);
+      }
+    } else if (semver.gte(pkgJson.version, "2.0.0")) {
+      options.version = pkgJson.version;
+      if (options.applyPatches?.exportContext) {
+        return monkeyPatchForExposingContextV2(twDir, options);
+      }
+    }
+  }
+}
+
+const jiti = createJiti__default(__filename);
+async function processTailwindcss(options) {
+  options.cwd = options.cwd ?? process__default.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`,
+        `${moduleName}.config.mjs`,
+        `${moduleName}.config.ts`,
+        `${moduleName}.config.cts`,
+        `${moduleName}.config.mts`
+      ],
+      loaders: {
+        // 默认支持 js 和 cjs 2种格式
+        ".js": jiti,
+        ".cjs": jiti,
+        ".mjs": jiti,
+        ".ts": jiti,
+        ".cts": jiti,
+        ".mts": jiti
+      }
+    }).search(options.cwd);
+    if (!result) {
+      throw new Error(`No TailwindCSS Config found in: ${options.cwd}`);
+    }
+    config = result.filepath;
+  }
+  const id = requireResolve("tailwindcss", {
+    basedir: options.cwd
+  });
+  return await postcss__default([
+    // eslint-disable-next-line ts/no-var-requires, ts/no-require-imports
+    require(id)({
+      config
+    })
+  ]).process("@tailwind base;@tailwind components;@tailwind utilities;", {
+    from: void 0
+  });
+}
+
 function getDefaultPatchOptions() {
   return {
+    applyPatches: {
+      exportContext: true,
+      extendLengthUnits: false
+    },
     overwrite: true
   };
 }
@@ -695,7 +769,7 @@ class TailwindcssPatcher {
       try {
         return internalPatch(this.packageInfo?.packageJsonPath, this.patchOptions);
       } catch (error) {
-        console.warn(`patch tailwindcss failed: ${error.message}`);
+        console.error(`patch tailwindcss failed: ${error.message}`);
       }
     };
   }
@@ -777,7 +851,7 @@ class TailwindcssPatcher {
         removeUniversalSelector
       });
       if (filename) {
-        await ensureDir(path__default.dirname(filename));
+        await fs__default.ensureDir(path__default.dirname(filename));
         const classList = [...set];
         fs__default.writeFileSync(filename, JSON.stringify(classList, null, loose ? 2 : void 0), "utf8");
         return filename;
@@ -788,15 +862,14 @@ class TailwindcssPatcher {
 
 exports.CacheManager = CacheManager;
 exports.TailwindcssPatcher = TailwindcssPatcher;
-exports.ensureDir = ensureDir;
 exports.ensureFileContent = ensureFileContent;
 exports.getCacheOptions = getCacheOptions;
 exports.getPackageInfoSync = getPackageInfoSync;
 exports.getPatchOptions = getPatchOptions;
-exports.inspectPostcssPlugin = inspectPostcssPlugin$1;
-exports.inspectProcessTailwindFeaturesReturnContext = inspectProcessTailwindFeaturesReturnContext$1;
 exports.internalPatch = internalPatch;
 exports.isObject = isObject;
+exports.logger = logger;
 exports.monkeyPatchForExposingContextV2 = monkeyPatchForExposingContextV2;
 exports.monkeyPatchForExposingContextV3 = monkeyPatchForExposingContextV3;
+exports.monkeyPatchForSupportingCustomUnit = monkeyPatchForSupportingCustomUnit;
 exports.requireResolve = requireResolve;

package/dist/shared/{tailwindcss-patch.9adeca36.mjs → tailwindcss-patch.ec6deb5e.mjs}

@@ -1,12 +1,12 @@
 import path from 'node:path';
-import fs from 'node:fs';
+import fs from 'fs-extra';
 import process from 'node:process';
+import { createConsola } from 'consola';
 import { gte } from 'semver';
 import * as t from '@babel/types';
 import _babelGenerate from '@babel/generator';
 import _babelTraverse from '@babel/traverse';
 import { parse } from '@babel/parser';
-import fs$1 from 'node:fs/promises';
 import pkg from 'resolve';
 import postcss from 'postcss';
 import { lilconfig } from 'lilconfig';
@@ -24,9 +24,7 @@ const __dirname = __cjs_path__.dirname(__filename);
 const require = __cjs_mod__.createRequire(import.meta.url);
 const pkgName = "tailwindcss-patch";
 
-function log(message, ...optionalParams) {
-  return console.log(`[${pkgName}]:${message}`, ...optionalParams);
-}
+const logger = createConsola();
 
 var __defProp$1 = Object.defineProperty;
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -90,7 +88,7 @@ class CacheManager {
       fs.writeFileSync(filename, JSON.stringify([...data], void 0, 2), "utf8");
       return filename;
     } catch {
-      log("write cache file fail!");
+      logger.error("write cache file fail!");
     }
   }
   read() {
@@ -101,11 +99,11 @@ class CacheManager {
         return new Set(JSON.parse(data));
       }
     } catch {
-      log(`parse cache content fail! path:${filename}`);
+      logger.error(`parse cache content fail! path:${filename}`);
       try {
         fs.unlinkSync(filename);
       } catch {
-        log(`delete cache file fail! path:${filename}`);
+        logger.error(`delete cache file fail! path:${filename}`);
       }
     }
   }
@@ -406,15 +404,6 @@ function ensureFileContent(filepaths) {
 function requireResolve(id, opts) {
   return sync(id, opts);
 }
-async function ensureDir(p) {
-  try {
-    await fs$1.access(p);
-  } catch {
-    await fs$1.mkdir(p, {
-      recursive: true
-    });
-  }
-}
 function searchPackageJSON(dir) {
   let packageJsonPath;
   while (true) {
@@ -471,7 +460,7 @@ function monkeyPatchForExposingContextV3(twDir, opt) {
       fs.writeFileSync(processTailwindFeaturesFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss processTailwindFeatures for return content successfully!");
+      logger.success("patch tailwindcss processTailwindFeatures for return content successfully!");
     }
     result.processTailwindFeatures = code;
   }
@@ -484,7 +473,7 @@ function monkeyPatchForExposingContextV3(twDir, opt) {
       fs.writeFileSync(pluginFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss for expose runtime content successfully!");
+      logger.success("patch tailwindcss for expose runtime context successfully!");
     }
     result.plugin = code;
   }
@@ -501,7 +490,7 @@ function monkeyPatchForExposingContextV2(twDir, opt) {
       fs.writeFileSync(processTailwindFeaturesFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss processTailwindFeatures for return content successfully!");
+      logger.success("patch tailwindcss processTailwindFeatures for return content successfully!");
     }
     result.processTailwindFeatures = code;
   }
@@ -513,71 +502,13 @@ function monkeyPatchForExposingContextV2(twDir, opt) {
       fs.writeFileSync(indexFilePath, code, {
         encoding: "utf8"
       });
-      console.log("patch tailwindcss for expose runtime content successfully!");
+      logger.success("patch tailwindcss for expose runtime content successfully!");
     }
     result.plugin = code;
   }
   opt.custom && typeof opt.custom === "function" && opt.custom(twDir, result);
   return result;
 }
-function internalPatch(pkgJsonPath, options) {
-  if (pkgJsonPath) {
-    const pkgJson = require(pkgJsonPath);
-    const twDir = path.dirname(pkgJsonPath);
-    if (gte(pkgJson.version, "3.0.0")) {
-      options.version = pkgJson.version;
-      const result = monkeyPatchForExposingContextV3(twDir, options);
-      return result;
-    } else if (gte(pkgJson.version, "2.0.0")) {
-      options.version = pkgJson.version;
-      const result = monkeyPatchForExposingContextV2(twDir, options);
-      return result;
-    }
-  }
-}
-
-const jiti = createJiti(__filename);
-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`,
-        `${moduleName}.config.mjs`,
-        `${moduleName}.config.ts`,
-        `${moduleName}.config.cts`,
-        `${moduleName}.config.mts`
-      ],
-      loaders: {
-        // 默认支持 js 和 cjs 2种格式
-        ".js": jiti,
-        ".cjs": jiti,
-        ".mjs": jiti,
-        ".ts": jiti,
-        ".cts": jiti,
-        ".mts": jiti
-      }
-    }).search(options.cwd);
-    if (!result) {
-      throw new Error(`No TailwindCSS Config found in: ${options.cwd}`);
-    }
-    config = result.filepath;
-  }
-  const id = requireResolve("tailwindcss", {
-    basedir: options.cwd
-  });
-  return await postcss([
-    // eslint-disable-next-line ts/no-var-requires, ts/no-require-imports
-    require(id)({
-      config
-    })
-  ]).process("@tailwind base;@tailwind components;@tailwind utilities;", {
-    from: void 0
-  });
-}
 
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") {
@@ -635,8 +566,152 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+function findAstNode(content, options) {
+  const { variableName, units } = options;
+  const ast = parse(content);
+  let arrayRef;
+  let changed = false;
+  traverse(ast, {
+    Identifier(path2) {
+      if (path2.node.name === variableName && t.isVariableDeclarator(path2.parent) && t.isArrayExpression(path2.parent.init)) {
+        arrayRef = path2.parent.init;
+        const set = new Set(path2.parent.init.elements.map((x) => x.value));
+        for (let i = 0; i < units.length; i++) {
+          const unit = units[i];
+          if (!set.has(unit)) {
+            path2.parent.init.elements = path2.parent.init.elements.map((x) => {
+              if (t.isStringLiteral(x)) {
+                return {
+                  type: x?.type,
+                  value: x?.value
+                };
+              }
+              return x;
+            });
+            path2.parent.init.elements.push({
+              type: "StringLiteral",
+              value: unit
+            });
+            changed = true;
+          }
+        }
+      }
+    }
+  });
+  return {
+    arrayRef,
+    changed
+  };
+}
+function monkeyPatchForSupportingCustomUnit(rootDir, options) {
+  const opts = defu(options, {
+    units: ["rpx"],
+    lengthUnitsFilePath: "lib/util/dataTypes.js",
+    variableName: "lengthUnits",
+    overwrite: true
+  });
+  const { lengthUnitsFilePath, overwrite, destPath } = opts;
+  const dataTypesFilePath = path.resolve(rootDir, lengthUnitsFilePath);
+  const dataTypesFileContent = fs.readFileSync(dataTypesFilePath, {
+    encoding: "utf8"
+  });
+  const { arrayRef, changed } = findAstNode(dataTypesFileContent, opts);
+  if (arrayRef && changed) {
+    const { code } = generate(arrayRef, {
+      jsescOption: {
+        quotes: "single"
+      }
+    });
+    if (arrayRef.start && arrayRef.end) {
+      const prev = dataTypesFileContent.slice(0, arrayRef.start);
+      const next = dataTypesFileContent.slice(arrayRef.end);
+      const newCode = prev + code + next;
+      if (overwrite) {
+        fs.writeFileSync(destPath ?? dataTypesFilePath, newCode, {
+          encoding: "utf8"
+        });
+        logger.success("patch tailwindcss for custom length unit successfully!");
+      }
+    }
+    return code;
+  }
+}
+
+function internalPatch(pkgJsonPath, options) {
+  if (pkgJsonPath) {
+    const pkgJson = require(pkgJsonPath);
+    const twDir = path.dirname(pkgJsonPath);
+    if (gte(pkgJson.version, "3.0.0")) {
+      options.version = pkgJson.version;
+      if (options.applyPatches?.extendLengthUnits) {
+        try {
+          monkeyPatchForSupportingCustomUnit(twDir, {
+            overwrite: options.overwrite
+          });
+        } catch {
+        }
+      }
+      if (options.applyPatches?.exportContext) {
+        return monkeyPatchForExposingContextV3(twDir, options);
+      }
+    } else if (gte(pkgJson.version, "2.0.0")) {
+      options.version = pkgJson.version;
+      if (options.applyPatches?.exportContext) {
+        return monkeyPatchForExposingContextV2(twDir, options);
+      }
+    }
+  }
+}
+
+const jiti = createJiti(__filename);
+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`,
+        `${moduleName}.config.mjs`,
+        `${moduleName}.config.ts`,
+        `${moduleName}.config.cts`,
+        `${moduleName}.config.mts`
+      ],
+      loaders: {
+        // 默认支持 js 和 cjs 2种格式
+        ".js": jiti,
+        ".cjs": jiti,
+        ".mjs": jiti,
+        ".ts": jiti,
+        ".cts": jiti,
+        ".mts": jiti
+      }
+    }).search(options.cwd);
+    if (!result) {
+      throw new Error(`No TailwindCSS Config found in: ${options.cwd}`);
+    }
+    config = result.filepath;
+  }
+  const id = requireResolve("tailwindcss", {
+    basedir: options.cwd
+  });
+  return await postcss([
+    // eslint-disable-next-line ts/no-var-requires, ts/no-require-imports
+    require(id)({
+      config
+    })
+  ]).process("@tailwind base;@tailwind components;@tailwind utilities;", {
+    from: void 0
+  });
+}
+
 function getDefaultPatchOptions() {
   return {
+    applyPatches: {
+      exportContext: true,
+      extendLengthUnits: false
+    },
     overwrite: true
   };
 }
@@ -677,7 +752,7 @@ class TailwindcssPatcher {
       try {
         return internalPatch(this.packageInfo?.packageJsonPath, this.patchOptions);
       } catch (error) {
-        console.warn(`patch tailwindcss failed: ${error.message}`);
+        console.error(`patch tailwindcss failed: ${error.message}`);
       }
     };
   }
@@ -759,7 +834,7 @@ class TailwindcssPatcher {
         removeUniversalSelector
       });
       if (filename) {
-        await ensureDir(path.dirname(filename));
+        await fs.ensureDir(path.dirname(filename));
         const classList = [...set];
         fs.writeFileSync(filename, JSON.stringify(classList, null, loose ? 2 : void 0), "utf8");
         return filename;
@@ -768,4 +843,4 @@ class TailwindcssPatcher {
   }
 }
 
-export { CacheManager as C, TailwindcssPatcher as T, inspectPostcssPlugin$1 as a, monkeyPatchForExposingContextV2 as b, internalPatch as c, getCacheOptions as d, ensureFileContent as e, ensureDir as f, getPatchOptions as g, getPackageInfoSync as h, inspectProcessTailwindFeaturesReturnContext$1 as i, isObject as j, monkeyPatchForExposingContextV3 as m, requireResolve as r };
+export { CacheManager as C, TailwindcssPatcher as T, monkeyPatchForExposingContextV2 as a, monkeyPatchForSupportingCustomUnit as b, getCacheOptions as c, getPackageInfoSync as d, ensureFileContent as e, isObject as f, getPatchOptions as g, internalPatch as i, logger as l, monkeyPatchForExposingContextV3 as m, requireResolve as r };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "3.0.2",
+  "version": "3.1.0-alpha.0",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
@@ -42,16 +42,18 @@
     }
   },
   "dependencies": {
-    "@babel/generator": "^7.24.7",
-    "@babel/parser": "^7.24.7",
-    "@babel/traverse": "^7.24.7",
-    "@babel/types": "^7.24.7",
+    "@babel/generator": "^7.24.10",
+    "@babel/parser": "^7.24.8",
+    "@babel/traverse": "^7.24.8",
+    "@babel/types": "^7.24.9",
     "cac": "^6.7.14",
+    "consola": "^3.2.3",
+    "fs-extra": "^11.2.0",
     "jiti": "^1.21.6",
     "lilconfig": "^3.1.2",
-    "postcss": "^8.4.38",
+    "postcss": "^8.4.39",
     "resolve": "^1.22.8",
-    "semver": "^7.6.2",
+    "semver": "^7.6.3",
     "@tailwindcss-mangle/config": "^3.0.0"
   },
   "devDependencies": {
@@ -59,9 +61,9 @@
     "@types/babel__traverse": "^7.20.6",
     "@types/resolve": "^1.20.6",
     "@types/semver": "^7.5.8",
-    "pkg-types": "^1.1.1",
+    "pkg-types": "^1.1.3",
     "postcss7": "npm:postcss@7",
-    "tailwindcss": "^3.4.4",
+    "tailwindcss": "^3.4.6",
     "tailwindcss2": "npm:@tailwindcss/postcss7-compat@^2.2.17"
   },
   "directories": {