tailwindcss-patch 2.2.1 → 2.2.3

package/dist/cli.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 const cac = require('cac');
+const config = require('@tailwindcss-mangle/config');
 const index = require('./index.cjs');
 require('node:path');
 require('node:fs');
@@ -10,7 +11,6 @@ require('@babel/types');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-const config = require('@tailwindcss-mangle/config');
 require('semver');
 require('postcss');
 require('lilconfig');

package/dist/cli.mjs

@@ -1,4 +1,5 @@
 import cac from 'cac';
+import { configName, getConfig, initConfig } from '@tailwindcss-mangle/config';
 import { getPatchOptions, TailwindcssPatcher, createPatch } from './index.mjs';
 import 'node:path';
 import 'node:fs';
@@ -8,7 +9,6 @@ import '@babel/types';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import { configName, getConfig, initConfig } from '@tailwindcss-mangle/config';
 import 'semver';
 import 'postcss';
 import 'lilconfig';

package/dist/index.cjs

@@ -67,8 +67,10 @@ async function ensureDir(p) {
   }
 }
 
-function getTailwindcssEntry(basedir = process.cwd()) {
-  return requireResolve("tailwindcss");
+function getTailwindcssEntry(basedir) {
+  return requireResolve("tailwindcss", {
+    basedir
+  });
 }
 function getContexts(basedir) {
   const twPath = getTailwindcssEntry(basedir);
@@ -192,11 +194,25 @@ class CacheManager {
   }
 }
 
-function isObject(value) {
-  return value !== null && typeof value === "object";
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
+    return false;
+  }
+  if (Symbol.iterator in value) {
+    return false;
+  }
+  if (Symbol.toStringTag in value) {
+    return Object.prototype.toString.call(value) === "[object Module]";
+  }
+  return true;
 }
+
 function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isObject(defaults)) {
+  if (!isPlainObject(defaults)) {
     return _defu(baseObject, {}, namespace, merger);
   }
   const object = Object.assign({}, defaults);
@@ -213,7 +229,7 @@ function _defu(baseObject, defaults, namespace = ".", merger) {
     }
     if (Array.isArray(value) && Array.isArray(object[key])) {
       object[key] = [...value, ...object[key]];
-    } else if (isObject(value) && isObject(object[key])) {
+    } else if (isPlainObject(value) && isPlainObject(object[key])) {
       object[key] = _defu(
         value,
         object[key],
@@ -244,7 +260,7 @@ function inspectProcessTailwindFeaturesReturnContext(content) {
         const rts = n.body.body[0];
         if (t__namespace.isFunctionExpression(rts.argument)) {
           const body = rts.argument.body.body;
-          const lastStatement = body.at(-1);
+          const lastStatement = body[body.length - 1];
           hasPatched = t__namespace.isReturnStatement(lastStatement) && t__namespace.isIdentifier(lastStatement.argument) && lastStatement.argument.name === "context";
           if (!hasPatched) {
             const rts2 = t__namespace.returnStatement(t__namespace.identifier("context"));
@@ -273,7 +289,7 @@ function inspectPostcssPlugin(content) {
       });
       if (idx > -1) {
         const prevStatement = n.body[idx - 1];
-        const lastStatement = n.body.at(-1);
+        const lastStatement = n.body[n.body.length - 1];
         const hasPatchedCondition0 = prevStatement && t__namespace.isVariableDeclaration(prevStatement) && prevStatement.declarations.length === 1 && t__namespace.isIdentifier(prevStatement.declarations[0].id) && prevStatement.declarations[0].id.name === variableName;
         const hasPatchedCondition1 = t__namespace.isExpressionStatement(lastStatement) && t__namespace.isAssignmentExpression(lastStatement.expression) && t__namespace.isIdentifier(lastStatement.expression.right) && lastStatement.expression.right.name === variableName;
         hasPatched = hasPatchedCondition0 || hasPatchedCondition1;
@@ -310,7 +326,7 @@ function inspectPostcssPlugin(content) {
               const pluginsCode = properties[1].value.callee.object.elements;
               if (pluginsCode[1] && t__namespace.isFunctionExpression(pluginsCode[1])) {
                 const targetBlockStatement = pluginsCode[1].body;
-                const lastStatement = targetBlockStatement.body.at(-1);
+                const lastStatement = targetBlockStatement.body[targetBlockStatement.body.length - 1];
                 if (t__namespace.isExpressionStatement(lastStatement)) {
                   const newExpressionStatement = t__namespace.expressionStatement(
                     t__namespace.callExpression(
@@ -555,6 +571,7 @@ class TailwindcssPatcher {
   }
 }
 
+exports.defineConfig = config.defineConfig;
 exports.CacheManager = CacheManager;
 exports.TailwindcssPatcher = TailwindcssPatcher;
 exports.createPatch = createPatch;
@@ -572,6 +589,3 @@ 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.cts

@@ -1,7 +1,7 @@
 import { Rule, Node } from 'postcss';
 import { Config } from 'tailwindcss';
 import { UserConfig } from '@tailwindcss-mangle/config';
-export * from '@tailwindcss-mangle/config';
+export { defineConfig } from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 
 type CacheStrategy = 'merge' | 'overwrite';
@@ -114,7 +114,7 @@ declare class TailwindcssPatcher {
         removeUniversalSelector?: boolean;
     }): Set<string>;
     getContexts(basedir?: string): TailwindcssRuntimeContext[];
-    extract(options: UserConfig['patch']): Promise<string | undefined>;
+    extract(options?: UserConfig['patch']): Promise<string | undefined>;
 }
 
 declare function getTailwindcssEntry(basedir?: string): string;

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { Rule, Node } from 'postcss';
 import { Config } from 'tailwindcss';
 import { UserConfig } from '@tailwindcss-mangle/config';
-export * from '@tailwindcss-mangle/config';
+export { defineConfig } from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 
 type CacheStrategy = 'merge' | 'overwrite';
@@ -114,7 +114,7 @@ declare class TailwindcssPatcher {
         removeUniversalSelector?: boolean;
     }): Set<string>;
     getContexts(basedir?: string): TailwindcssRuntimeContext[];
-    extract(options: UserConfig['patch']): Promise<string | undefined>;
+    extract(options?: UserConfig['patch']): Promise<string | undefined>;
 }
 
 declare function getTailwindcssEntry(basedir?: string): string;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Rule, Node } from 'postcss';
 import { Config } from 'tailwindcss';
 import { UserConfig } from '@tailwindcss-mangle/config';
-export * from '@tailwindcss-mangle/config';
+export { defineConfig } from '@tailwindcss-mangle/config';
 import { SyncOpts } from 'resolve';
 
 type CacheStrategy = 'merge' | 'overwrite';
@@ -114,7 +114,7 @@ declare class TailwindcssPatcher {
         removeUniversalSelector?: boolean;
     }): Set<string>;
     getContexts(basedir?: string): TailwindcssRuntimeContext[];
-    extract(options: UserConfig['patch']): Promise<string | undefined>;
+    extract(options?: UserConfig['patch']): Promise<string | undefined>;
 }
 
 declare function getTailwindcssEntry(basedir?: string): string;

package/dist/index.mjs

@@ -19,7 +19,7 @@ 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';
+export { defineConfig } from '@tailwindcss-mangle/config';
 
 const { sync } = pkg;
 function ensureFileContent(filepaths) {
@@ -50,8 +50,10 @@ async function ensureDir(p) {
   }
 }
 
-function getTailwindcssEntry(basedir = process.cwd()) {
-  return requireResolve("tailwindcss");
+function getTailwindcssEntry(basedir) {
+  return requireResolve("tailwindcss", {
+    basedir
+  });
 }
 function getContexts(basedir) {
   const twPath = getTailwindcssEntry(basedir);
@@ -175,11 +177,25 @@ class CacheManager {
   }
 }
 
-function isObject(value) {
-  return value !== null && typeof value === "object";
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
+    return false;
+  }
+  if (Symbol.iterator in value) {
+    return false;
+  }
+  if (Symbol.toStringTag in value) {
+    return Object.prototype.toString.call(value) === "[object Module]";
+  }
+  return true;
 }
+
 function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isObject(defaults)) {
+  if (!isPlainObject(defaults)) {
     return _defu(baseObject, {}, namespace, merger);
   }
   const object = Object.assign({}, defaults);
@@ -196,7 +212,7 @@ function _defu(baseObject, defaults, namespace = ".", merger) {
     }
     if (Array.isArray(value) && Array.isArray(object[key])) {
       object[key] = [...value, ...object[key]];
-    } else if (isObject(value) && isObject(object[key])) {
+    } else if (isPlainObject(value) && isPlainObject(object[key])) {
       object[key] = _defu(
         value,
         object[key],
@@ -227,7 +243,7 @@ function inspectProcessTailwindFeaturesReturnContext(content) {
         const rts = n.body.body[0];
         if (t.isFunctionExpression(rts.argument)) {
           const body = rts.argument.body.body;
-          const lastStatement = body.at(-1);
+          const lastStatement = body[body.length - 1];
           hasPatched = t.isReturnStatement(lastStatement) && t.isIdentifier(lastStatement.argument) && lastStatement.argument.name === "context";
           if (!hasPatched) {
             const rts2 = t.returnStatement(t.identifier("context"));
@@ -256,7 +272,7 @@ function inspectPostcssPlugin(content) {
       });
       if (idx > -1) {
         const prevStatement = n.body[idx - 1];
-        const lastStatement = n.body.at(-1);
+        const lastStatement = n.body[n.body.length - 1];
         const hasPatchedCondition0 = prevStatement && t.isVariableDeclaration(prevStatement) && prevStatement.declarations.length === 1 && t.isIdentifier(prevStatement.declarations[0].id) && prevStatement.declarations[0].id.name === variableName;
         const hasPatchedCondition1 = t.isExpressionStatement(lastStatement) && t.isAssignmentExpression(lastStatement.expression) && t.isIdentifier(lastStatement.expression.right) && lastStatement.expression.right.name === variableName;
         hasPatched = hasPatchedCondition0 || hasPatchedCondition1;
@@ -293,7 +309,7 @@ function inspectPostcssPlugin(content) {
               const pluginsCode = properties[1].value.callee.object.elements;
               if (pluginsCode[1] && t.isFunctionExpression(pluginsCode[1])) {
                 const targetBlockStatement = pluginsCode[1].body;
-                const lastStatement = targetBlockStatement.body.at(-1);
+                const lastStatement = targetBlockStatement.body[targetBlockStatement.body.length - 1];
                 if (t.isExpressionStatement(lastStatement)) {
                   const newExpressionStatement = t.expressionStatement(
                     t.callExpression(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "patch tailwindcss for exposing context and extract classes",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -33,25 +33,25 @@
     }
   },
   "devDependencies": {
-    "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.20.1",
-    "@types/resolve": "^1.20.2",
-    "@types/semver": "^7.5.2",
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__traverse": "^7.20.5",
+    "@types/resolve": "^1.20.6",
+    "@types/semver": "^7.5.6",
     "pkg-types": "^1.0.3",
-    "tailwindcss": "^3.3.3"
+    "tailwindcss": "^3.4.1"
   },
   "dependencies": {
-    "@babel/generator": "^7.22.15",
-    "@babel/parser": "^7.22.16",
-    "@babel/traverse": "^7.22.19",
-    "@babel/types": "^7.22.19",
+    "@babel/generator": "^7.23.6",
+    "@babel/parser": "^7.23.9",
+    "@babel/traverse": "^7.23.9",
+    "@babel/types": "^7.23.9",
     "cac": "^6.7.14",
-    "jiti": "^1.20.0",
-    "lilconfig": "^2.1.0",
-    "postcss": "^8.4.29",
-    "resolve": "^1.22.5",
-    "semver": "^7.5.4",
-    "@tailwindcss-mangle/config": "^2.2.1"
+    "jiti": "^1.21.0",
+    "lilconfig": "^3.0.0",
+    "postcss": "^8.4.34",
+    "resolve": "^1.22.8",
+    "semver": "^7.6.0",
+    "@tailwindcss-mangle/config": "^2.2.2"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {