Merge pull request #123 from Lodestone-Team/0.4.1

Lodestone-Team · Jan 29, 2023 · 4168e6a · 4168e6a
2 parents 7f58e1e + 7e93e41
commit 4168e6a
Show file tree

Hide file tree

Showing 60 changed files with 25,153 additions and 17,109 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,8 @@
 {
   "extends": [
-    "plugin:@typescript-eslint/recommended",
     "next/core-web-vitals",
+    "plugin:tailwindcss/recommended",
+    "plugin:@typescript-eslint/recommended",
     "plugin:storybook/recommended",
     "prettier"
   ],
@@ -21,6 +22,10 @@
       {
         "name": "next/router",
         "message": "Please use react-router-dom instead"
+      },
+      {
+        "name": "tailwind-merge",
+        "message": "Please use \"myTwMerge\" from \"utils.ts\" instead"
       }
     ],
     "@next/next/no-img-element": "off",
@@ -32,6 +37,13 @@
         "varsIgnorePattern": "^_",
         "caughtErrorsIgnorePattern": "^_"
       }
-    ]
+    ],
+    "tailwindcss/migration-from-tailwind-2": ["off"]
+  },
+  "plugins": ["tailwindcss"],
+  "settings": {
+    "tailwindcss": {
+      "callees": ["cn", "clsx", "variants"]
+    }
   }
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,9 +1,5 @@
 {
-  "cSpell.words": [
-    "clsx",
-    "Formik",
-    "reduxjs"
-  ],
+  "cSpell.words": ["clsx", "Formik", "reduxjs"],
 
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
@@ -16,5 +12,9 @@
     "typescript",
     "typescriptreact"
   ],
-  "liveServer.settings.port": 5521
+  "liveServer.settings.port": 5521,
+  "tailwindCSS.experimental.classRegex": [
+    ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
+    "ClassName\\s*=\\s*[`\"']([^`\"']*)"
+  ]
 }