chore(deps): ⬆️ update dev dependencies (minor) (#306)

* chore(deps): ⬆️ update dev dependencies (minor) * chore(deps): ⬆️ update tailwind & its fixes Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Navin Moorthy <[email protected]>
adaptui · Jun 13, 2022 · 6f04aa4 · 6f04aa4 · vercel · Jun 13, 2022
1 parent 5c2c094
commit 6f04aa4
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 145 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,20 @@
 MIT License
 
-Copyright (c) 2021 Timeless
+Copyright (c) 2022 Timeless
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/package.json b/package.json
@@ -123,7 +123,7 @@
     "@storybook/manager-webpack5": "6.5.8",
     "@storybook/react": "6.5.8",
     "@swc/cli": "0.1.57",
-    "@swc/core": "1.2.197",
+    "@swc/core": "1.2.198",
     "@tailwindcss/forms": "0.5.2",
     "@testing-library/dom": "8.13.0",
     "@testing-library/jest-dom": "5.16.4",
@@ -135,7 +135,6 @@
     "@types/node": "17.0.41",
     "@types/react": "18.0.12",
     "@types/react-dom": "18.0.5",
-    "@types/tailwindcss": "3.0.10",
     "@types/testing-library__jest-dom": "5.14.3",
     "all-contributors-cli": "6.20.0",
     "autoprefixer": "10.4.7",
@@ -173,14 +172,14 @@
     "prettier-plugin-tailwindcss": "0.1.11",
     "react": "18.1.0",
     "react-dom": "18.1.0",
-    "react-hook-form": "7.31.3",
+    "react-hook-form": "7.32.0",
     "react-icons": "4.4.0",
     "release-it": "15.0.0",
     "rimraf": "3.0.2",
     "size-limit": "5.0.5",
     "sort-package-json": "1.57.0",
     "storybook-addon-preview": "2.2.0",
-    "tailwindcss": "3.0.24",
+    "tailwindcss": "3.1.2",
     "ts-node": "10.8.1",
     "tslib": "2.4.0",
     "typescript": "4.7.3",

diff --git a/preset.d.ts b/preset.d.ts
@@ -1,6 +1,6 @@
-import { TailwindConfig } from "@types/tailwindcss/tailwind-config";
+import { Config } from "@tailwindcss/config";
 
 // Cannot use generic constraints in T because it would then infer the Config and `preset`,
 // would not be able to infer `component` keys which would break the typesafe component extends.
 // So by doing this we can get both typesafe intellisense in the tailwind config and also the component extends
-export function preset<T>(arg: TailwindConfig & T): T;
+export function preset<T>(arg: Config & T): T;
diff --git a/preset.js b/preset.js
@@ -1,8 +1,9 @@
 const colors = require("./tailwind-utils/colors");
 const defaultTheme = require("tailwindcss/defaultTheme");
 
-/** @type {import("@types/tailwindcss/tailwind-config").TailwindConfig } */
+/** @type {import('tailwindcss').Config} */
 module.exports = {
+  experimental: { matchVariant: true },
   theme: {
     animationDelay: {
       75: "75ms",
@@ -108,7 +109,7 @@ module.exports = {
   },
   plugins: [
     require("./tailwind-utils/utilities"),
-    require("./tailwind-utils/variantPlugin"),
+    require("./tailwind-utils/variants"),
     require("./tailwind-utils/animationDelay"),
     require("./tailwind-utils/animationDuration"),
   ],

diff --git a/tailwind-utils/variantPlugin.js → tailwind-utils/variants.js b/tailwind-utils/variantPlugin.js → tailwind-utils/variants.js
@@ -1,8 +1,8 @@
 const plugin = require("tailwindcss/plugin");
 
 const variantPlugin = plugin(function ({ addVariant, config }) {
-  addVariant("data-enter", `[data-enter]`);
-  addVariant("data-leave", `[data-leave]`);
+  addVariant("data-enter", `&[data-enter]`);
+  addVariant("data-leave", `&[data-leave]`);
 
   let pseudoVariants = [
     // Positional

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,4 +1,4 @@
-/** @type {import("@types/tailwindcss/tailwind-config").TailwindConfig } */
+/** @type {import('tailwindcss').Config} */
 module.exports = {
   presets: [require("./preset")],
   content: ["./src/**/*", "./adaptui.config.ts", "./.storybook/**/*"],