tailwindcss-patch 1.0.2 → 1.0.3

package/dist/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var patcher = require('./patcher-85767405.js');
+var patcher = require('./patcher-90d636ff.js');
 require('path');
 require('fs');
 require('semver');

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
 var fs = require('fs');
-var patcher = require('./patcher-85767405.js');
+var patcher = require('./patcher-90d636ff.js');
 require('semver');
 require('@babel/types');
 require('@babel/generator');

package/dist/{patcher-85767405.js → patcher-90d636ff.js}

@@ -60,15 +60,15 @@ function inspectProcessTailwindFeaturesReturnContext(content) {
     let hasPatched = false;
     traverse__default["default"](ast, {
         FunctionDeclaration(p) {
-            var _a, _b;
+            var _a;
             const n = p.node;
             if (((_a = n.id) === null || _a === void 0 ? void 0 : _a.name) === 'processTailwindFeatures') {
-                if (n.body.body.length === 1 && n.body.body[0].type === 'ReturnStatement') {
+                if (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[body.length - 1];
-                        hasPatched = lastStatement.type === 'ReturnStatement' && ((_b = lastStatement.argument) === null || _b === void 0 ? void 0 : _b.type) === 'Identifier' && lastStatement.argument.name === 'context';
+                        hasPatched = t__namespace.isReturnStatement(lastStatement) && t__namespace.isIdentifier(lastStatement.argument) && lastStatement.argument.name === 'context';
                         if (!hasPatched) {
                             const rts = t__namespace.returnStatement(t__namespace.identifier('context'));
                             body.push(rts);
@@ -94,23 +94,23 @@ function inspectPostcssPlugin(content) {
             const n = p.node;
             const idx = n.body.findIndex((x) => {
                 var _a;
-                return (x.type === 'ExpressionStatement' &&
-                    x.expression.type === 'AssignmentExpression' &&
-                    x.expression.left.type === 'MemberExpression' &&
-                    x.expression.right.type === 'FunctionExpression' &&
+                return (t__namespace.isExpressionStatement(x) &&
+                    t__namespace.isAssignmentExpression(x.expression) &&
+                    t__namespace.isMemberExpression(x.expression.left) &&
+                    t__namespace.isFunctionExpression(x.expression.right) &&
                     ((_a = x.expression.right.id) === null || _a === void 0 ? void 0 : _a.name) === 'tailwindcss');
             });
             if (idx > -1) {
                 const prevStatement = n.body[idx - 1];
                 const lastStatement = n.body[n.body.length - 1];
                 const hasPatchedCondition0 = prevStatement &&
-                    prevStatement.type === 'VariableDeclaration' &&
+                    t__namespace.isVariableDeclaration(prevStatement) &&
                     prevStatement.declarations.length === 1 &&
-                    prevStatement.declarations[0].id.type === 'Identifier' &&
+                    t__namespace.isIdentifier(prevStatement.declarations[0].id) &&
                     prevStatement.declarations[0].id.name === variableName;
-                const hasPatchedCondition1 = lastStatement.type === 'ExpressionStatement' &&
-                    lastStatement.expression.type === 'AssignmentExpression' &&
-                    lastStatement.expression.right.type === 'Identifier' &&
+                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;
                 if (!hasPatched) {
@@ -123,40 +123,40 @@ function inspectPostcssPlugin(content) {
             }
         },
         FunctionExpression(p) {
-            var _a, _b;
+            var _a;
             if (hasPatched) {
                 return;
             }
             const n = p.node;
             if (((_a = n.id) === null || _a === void 0 ? void 0 : _a.name) === 'tailwindcss') {
-                if (n.body.body.length === 1 && n.body.body[0].type === 'ReturnStatement') {
+                if (n.body.body.length === 1 && t__namespace.isReturnStatement(n.body.body[0])) {
                     const returnStatement = n.body.body[0];
-                    if (((_b = returnStatement.argument) === null || _b === void 0 ? void 0 : _b.type) === 'ObjectExpression' && returnStatement.argument.properties.length === 2) {
+                    if (t__namespace.isObjectExpression(returnStatement.argument) && returnStatement.argument.properties.length === 2) {
                         const properties = returnStatement.argument.properties;
-                        if (properties[0].type === 'ObjectProperty' && properties[1].type === 'ObjectProperty') {
-                            const keyMatched = properties[0].key.type === 'Identifier' && properties[0].key.name === 'postcssPlugin';
-                            const pluginsMatched = properties[1].key.type === 'Identifier' && properties[1].key.name === 'plugins';
+                        if (t__namespace.isObjectProperty(properties[0]) && t__namespace.isObjectProperty(properties[1])) {
+                            const keyMatched = t__namespace.isIdentifier(properties[0].key) && properties[0].key.name === 'postcssPlugin';
+                            const pluginsMatched = t__namespace.isIdentifier(properties[1].key) && properties[1].key.name === 'plugins';
                             if (pluginsMatched &&
                                 keyMatched &&
-                                properties[1].value.type === 'CallExpression' &&
-                                properties[1].value.callee.type === 'MemberExpression' &&
-                                properties[1].value.callee.object.type === 'ArrayExpression') {
+                                t__namespace.isCallExpression(properties[1].value) &&
+                                t__namespace.isMemberExpression(properties[1].value.callee) &&
+                                t__namespace.isArrayExpression(properties[1].value.callee.object)) {
                                 const pluginsCode = properties[1].value.callee.object.elements;
-                                if (pluginsCode[1] && pluginsCode[1].type === 'FunctionExpression') {
+                                if (pluginsCode[1] && t__namespace.isFunctionExpression(pluginsCode[1])) {
                                     const targetBlockStatement = pluginsCode[1].body;
                                     const lastStatement = targetBlockStatement.body[targetBlockStatement.body.length - 1];
-                                    if (lastStatement.type === 'ExpressionStatement') {
+                                    if (t__namespace.isExpressionStatement(lastStatement)) {
                                         const newExpressionStatement = t__namespace.expressionStatement(t__namespace.callExpression(t__namespace.memberExpression(t__namespace.memberExpression(t__namespace.identifier(variableName), t__namespace.identifier('value')), t__namespace.identifier('push')), [lastStatement.expression]));
                                         targetBlockStatement.body[targetBlockStatement.body.length - 1] = newExpressionStatement;
                                     }
-                                    const ifIdx = targetBlockStatement.body.findIndex((x) => x.type === 'IfStatement');
+                                    const ifIdx = targetBlockStatement.body.findIndex((x) => t__namespace.isIfStatement(x));
                                     if (ifIdx > -1) {
                                         const ifRoot = targetBlockStatement.body[ifIdx];
-                                        if (ifRoot.consequent.type === 'BlockStatement' && ifRoot.consequent.body[1] && ifRoot.consequent.body[1].type === 'ForOfStatement') {
+                                        if (t__namespace.isBlockStatement(ifRoot.consequent) && ifRoot.consequent.body[1] && t__namespace.isForOfStatement(ifRoot.consequent.body[1])) {
                                             const forOf = ifRoot.consequent.body[1];
-                                            if (forOf.body.type === 'BlockStatement' && forOf.body.body.length === 1 && forOf.body.body[0].type === 'IfStatement') {
+                                            if (t__namespace.isBlockStatement(forOf.body) && forOf.body.body.length === 1 && t__namespace.isIfStatement(forOf.body.body[0])) {
                                                 const if2 = forOf.body.body[0];
-                                                if (if2.consequent.type === 'BlockStatement' && if2.consequent.body.length === 1 && if2.consequent.body[0].type === 'ExpressionStatement') {
+                                                if (t__namespace.isBlockStatement(if2.consequent) && if2.consequent.body.length === 1 && t__namespace.isExpressionStatement(if2.consequent.body[0])) {
                                                     const target = if2.consequent.body[0];
                                                     const newExpressionStatement = t__namespace.expressionStatement(t__namespace.callExpression(t__namespace.memberExpression(t__namespace.memberExpression(t__namespace.identifier(variableName), t__namespace.identifier('value')), t__namespace.identifier('push')), [target.expression]));
                                                     if2.consequent.body[0] = newExpressionStatement;
@@ -225,21 +225,18 @@ const defaultOptions = {
     overwrite: true
 };
 
-function getInstalledPkgJsonPath(options) {
+function getInstalledPkgJsonPath(options = {}) {
     var _a;
     try {
         const tmpJsonPath = requireResolve(`tailwindcss/package.json`, {
             paths: options.paths,
             basedir: (_a = options.basedir) !== null && _a !== void 0 ? _a : process.cwd()
         });
-        const pkgJson = require(tmpJsonPath);
-        if (semver.gte(pkgJson.version, '3.0.0')) {
-            return tmpJsonPath;
-        }
+        return tmpJsonPath;
     }
     catch (error) {
         if (error.code === 'MODULE_NOT_FOUND') {
-            console.warn('Can\'t find npm pkg: `tailwindcss`, Please ensure it has been installed!');
+            console.warn("Can't find npm pkg: `tailwindcss`, Please ensure it has been installed!");
         }
     }
 }
@@ -287,9 +284,12 @@ function monkeyPatchForExposingContext(twDir, opt) {
 }
 function internalPatch(pkgJsonPath, options) {
     if (pkgJsonPath) {
+        const pkgJson = require(pkgJsonPath);
         const twDir = path__default["default"].dirname(pkgJsonPath);
-        const result = monkeyPatchForExposingContext(twDir, options);
-        return result;
+        if (semver.gte(pkgJson.version, '3.0.0')) {
+            const result = monkeyPatchForExposingContext(twDir, options);
+            return result;
+        }
     }
 }
 

package/dist/types/patcher.d.ts

@@ -1,5 +1,5 @@
 import type { PatchOptions, InternalPatchOptions } from './type';
-export declare function getInstalledPkgJsonPath(options: PatchOptions): string | undefined;
+export declare function getInstalledPkgJsonPath(options?: PatchOptions): string | undefined;
 export declare function createPatch(options?: PatchOptions): () => any;
 export declare function monkeyPatchForExposingContext(twDir: string, opt: InternalPatchOptions): {
     processTailwindFeatures?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "patch tailwindcss for exposing context",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",
@@ -24,13 +24,13 @@
   },
   "devDependencies": {
     "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.18.3",
+    "@types/babel__traverse": "^7.18.4",
     "@types/resolve": "^1.20.2",
     "@types/semver": "^7.3.13",
     "defu": "^6.1.2",
     "pkg-types": "^1.0.2",
-    "postcss": "^8.4.21",
-    "tailwindcss": "^3.3.1"
+    "postcss": "^8.4.23",
+    "tailwindcss": "^3.3.2"
   },
   "dependencies": {
     "@babel/generator": "^7.21.4",
@@ -38,7 +38,7 @@
     "@babel/traverse": "^7.21.4",
     "@babel/types": "^7.21.4",
     "resolve": "^1.22.2",
-    "semver": "^7.4.0"
+    "semver": "^7.5.0"
   },
   "homepage": "https://github.com/sonofmagic/tailwindcss-mangle",
   "repository": {