tailwindcss-patch 2.2.2 → 2.2.4

package/dist/cli.cjs

@@ -8,10 +8,10 @@ require('node:fs');
 require('node:fs/promises');
 require('resolve');
 require('@babel/types');
+require('semver');
 require('@babel/generator');
 require('@babel/traverse');
 require('@babel/parser');
-require('semver');
 require('postcss');
 require('lilconfig');
 require('jiti');

package/dist/cli.mjs

@@ -6,10 +6,10 @@ import 'node:fs';
 import 'node:fs/promises';
 import 'resolve';
 import '@babel/types';
+import 'semver';
 import '@babel/generator';
 import '@babel/traverse';
 import '@babel/parser';
-import 'semver';
 import 'postcss';
 import 'lilconfig';
 import 'jiti';

package/dist/index.cjs

@@ -6,8 +6,8 @@ const fs = require('node:fs');
 const pkg = require('resolve');
 const semver = require('semver');
 const t = require('@babel/types');
-const generate = require('@babel/generator');
-const traverse = require('@babel/traverse');
+const _babelGenerate = require('@babel/generator');
+const _babelTraverse = require('@babel/traverse');
 const parser = require('@babel/parser');
 const postcss = require('postcss');
 const lilconfig = require('lilconfig');
@@ -33,8 +33,8 @@ const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 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 _babelGenerate__default = /*#__PURE__*/_interopDefaultCompat(_babelGenerate);
+const _babelTraverse__default = /*#__PURE__*/_interopDefaultCompat(_babelTraverse);
 const postcss__default = /*#__PURE__*/_interopDefaultCompat(postcss);
 const createJiti__default = /*#__PURE__*/_interopDefaultCompat(createJiti);
 
@@ -194,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);
@@ -215,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],
@@ -236,17 +250,23 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+function _interopDefaultCompat$1(e) {
+  return e && typeof e === "object" && "default" in e ? e.default : e;
+}
+const generate = _interopDefaultCompat$1(_babelGenerate__default);
+const traverse = _interopDefaultCompat$1(_babelTraverse__default);
+
 function inspectProcessTailwindFeaturesReturnContext(content) {
   const ast = parser.parse(content);
   let hasPatched = false;
-  traverse__default(ast, {
+  traverse(ast, {
     FunctionDeclaration(p) {
       const n = p.node;
       if (n.id?.name === "processTailwindFeatures" && n.body.body.length === 1 && t__namespace.isReturnStatement(n.body.body[0])) {
         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"));
@@ -257,7 +277,7 @@ function inspectProcessTailwindFeaturesReturnContext(content) {
     }
   });
   return {
-    code: hasPatched ? content : generate__default(ast).code,
+    code: hasPatched ? content : generate(ast).code,
     hasPatched
   };
 }
@@ -267,7 +287,7 @@ function inspectPostcssPlugin(content) {
   const variableName = "contextRef";
   const valueKey = "value";
   let hasPatched = false;
-  traverse__default(ast, {
+  traverse(ast, {
     Program(p) {
       const n = p.node;
       const idx = n.body.findIndex((x) => {
@@ -275,7 +295,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;
@@ -312,7 +332,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(
@@ -368,7 +388,7 @@ function inspectPostcssPlugin(content) {
     // }
   });
   return {
-    code: hasPatched ? content : generate__default(ast).code,
+    code: hasPatched ? content : generate(ast).code,
     hasPatched
   };
 }
@@ -459,13 +479,22 @@ async function processTailwindcss(options) {
   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`],
+      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,
-        ".mjs": jiti
+        ".cts": jiti,
+        ".mts": jiti
       }
     }).search(options.cwd);
     if (!result) {

package/dist/index.mjs

@@ -4,8 +4,8 @@ import fs from 'node:fs';
 import pkg from 'resolve';
 import { gte } from 'semver';
 import * as t from '@babel/types';
-import generate from '@babel/generator';
-import traverse from '@babel/traverse';
+import _babelGenerate from '@babel/generator';
+import _babelTraverse from '@babel/traverse';
 import { parse } from '@babel/parser';
 import postcss from 'postcss';
 import { lilconfig } from 'lilconfig';
@@ -177,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);
@@ -198,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],
@@ -219,6 +233,12 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+function _interopDefaultCompat(e) {
+  return e && typeof e === "object" && "default" in e ? e.default : e;
+}
+const generate = _interopDefaultCompat(_babelGenerate);
+const traverse = _interopDefaultCompat(_babelTraverse);
+
 function inspectProcessTailwindFeaturesReturnContext(content) {
   const ast = parse(content);
   let hasPatched = false;
@@ -229,7 +249,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"));
@@ -258,7 +278,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;
@@ -295,7 +315,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(
@@ -442,13 +462,22 @@ async function processTailwindcss(options) {
   if (!(typeof options.config === "string" && path.isAbsolute(options.config))) {
     const moduleName = "tailwind";
     const result = await lilconfig("tailwindcss", {
-      searchPlaces: [`${moduleName}.config.js`, `${moduleName}.config.cjs`],
+      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,
-        ".mjs": jiti
+        ".cts": jiti,
+        ".mts": jiti
       }
     }).search(options.cwd);
     if (!result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "patch tailwindcss for exposing context and extract classes",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -33,24 +33,24 @@
     }
   },
   "devDependencies": {
-    "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.20.1",
-    "@types/resolve": "^1.20.2",
-    "@types/semver": "^7.5.2",
-    "pkg-types": "^1.0.3",
-    "tailwindcss": "^3.3.3"
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__traverse": "^7.20.5",
+    "@types/resolve": "^1.20.6",
+    "@types/semver": "^7.5.8",
+    "pkg-types": "^1.1.1",
+    "tailwindcss": "^3.4.3"
   },
   "dependencies": {
-    "@babel/generator": "^7.22.15",
-    "@babel/parser": "^7.22.16",
-    "@babel/traverse": "^7.22.19",
-    "@babel/types": "^7.22.19",
+    "@babel/generator": "^7.24.5",
+    "@babel/parser": "^7.24.5",
+    "@babel/traverse": "^7.24.5",
+    "@babel/types": "^7.24.5",
     "cac": "^6.7.14",
-    "jiti": "^1.20.0",
-    "lilconfig": "^2.1.0",
-    "postcss": "^8.4.29",
-    "resolve": "^1.22.5",
-    "semver": "^7.5.4",
+    "jiti": "^1.21.0",
+    "lilconfig": "^3.1.1",
+    "postcss": "^8.4.38",
+    "resolve": "^1.22.8",
+    "semver": "^7.6.2",
     "@tailwindcss-mangle/config": "^2.2.2"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",