build(tw): 💚 revert to local tailwind-merge version

adaptui · Oct 18, 2021 · d6b25ef · d6b25ef
1 parent 1142157
commit d6b25ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   },
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "source": "src/foo.js",
+  "source": "src/index.ts",
   "types": "dist/types/index.d.ts",
   "typings": "dist/types/index.d.ts",
   "files": [
@@ -99,8 +99,7 @@
     "reakit": "^1.3.10",
     "reakit-system": "^0.15.2",
     "reakit-utils": "^0.15.2",
-    "reakit-warning": "^0.6.2",
-    "tailwind-merge": "^0.7.0"
+    "reakit-warning": "^0.6.2"
   },
   "devDependencies": {
     "@babel/cli": "7.15.7",

diff --git a/src/utils/index.tsx b/src/utils/index.tsx
@@ -1,8 +1,8 @@
 import * as React from "react";
-import { createTailwindMerge } from "tailwind-merge";
 
 import { cx } from "../utils";
 
+import { createTailwindMerge } from "./tailwind-merge";
 import {
   As,
   ComponentWithAs,