diff --git a/.eslintrc.json b/.eslintrc.json
index 0564858cc4..f43af11a15 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,6 +10,12 @@
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "tailwindcss"],
"root": true,
+ "settings": {
+ "tailwindcss": {
+ "config": "./tailwind.config.js",
+ "callees": ["classnames", "classNames"]
+ }
+ },
"rules": {
"no-empty": "warn",
"@typescript-eslint/no-explicit-any": "warn",
diff --git a/package-lock.json b/package-lock.json
index 6b953160cc..4c549b952d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -76,8 +76,8 @@
"gpt-3-encoder": "^1.1.4",
"jsdom": "^21.1.1",
"postcss": "^8.4.21",
- "prettier": "^2.8.7",
- "prettier-plugin-tailwindcss": "^0.2.5",
+ "prettier": "^3.0.3",
+ "prettier-plugin-tailwindcss": "^0.5.7",
"tailwindcss": "^3.3.5",
"typescript": "^5.2.2",
"vitest": "^0.29.7"
@@ -10590,27 +10590,27 @@
}
},
"node_modules/prettier": {
- "version": "2.8.8",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
- "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
+ "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
"dev": true,
"bin": {
- "prettier": "bin-prettier.js"
+ "prettier": "bin/prettier.cjs"
},
"engines": {
- "node": ">=10.13.0"
+ "node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/prettier-plugin-tailwindcss": {
- "version": "0.2.8",
- "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.8.tgz",
- "integrity": "sha512-KgPcEnJeIijlMjsA6WwYgRs5rh3/q76oInqtMXBA/EMcamrcYJpyhtRhyX1ayT9hnHlHTuO8sIifHF10WuSDKg==",
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.7.tgz",
+ "integrity": "sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ==",
"dev": true,
"engines": {
- "node": ">=12.17.0"
+ "node": ">=14.21.3"
},
"peerDependencies": {
"@ianvs/prettier-plugin-sort-imports": "*",
@@ -10618,7 +10618,7 @@
"@shopify/prettier-plugin-liquid": "*",
"@shufo/prettier-plugin-blade": "*",
"@trivago/prettier-plugin-sort-imports": "*",
- "prettier": ">=2.2.0",
+ "prettier": "^3.0",
"prettier-plugin-astro": "*",
"prettier-plugin-css-order": "*",
"prettier-plugin-import-sort": "*",
@@ -10626,8 +10626,7 @@
"prettier-plugin-organize-attributes": "*",
"prettier-plugin-organize-imports": "*",
"prettier-plugin-style-order": "*",
- "prettier-plugin-svelte": "*",
- "prettier-plugin-twig-melody": "*"
+ "prettier-plugin-svelte": "*"
},
"peerDependenciesMeta": {
"@ianvs/prettier-plugin-sort-imports": {
@@ -10657,6 +10656,9 @@
"prettier-plugin-jsdoc": {
"optional": true
},
+ "prettier-plugin-marko": {
+ "optional": true
+ },
"prettier-plugin-organize-attributes": {
"optional": true
},
diff --git a/package.json b/package.json
index 57b6fa57fb..7ec0d2d70d 100644
--- a/package.json
+++ b/package.json
@@ -87,8 +87,8 @@
"gpt-3-encoder": "^1.1.4",
"jsdom": "^21.1.1",
"postcss": "^8.4.21",
- "prettier": "^2.8.7",
- "prettier-plugin-tailwindcss": "^0.2.5",
+ "prettier": "^3.0.3",
+ "prettier-plugin-tailwindcss": "^0.5.7",
"tailwindcss": "^3.3.5",
"typescript": "^5.2.2",
"vitest": "^0.29.7"
diff --git a/prettier.config.js b/prettier.config.js
index 5cb7fa7711..0e1b1f8aca 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -5,6 +5,7 @@ module.exports = {
'@trivago/prettier-plugin-sort-imports',
'prettier-plugin-tailwindcss',
],
+ tailwindFunctions: ['classnames', 'classNames'],
importOrder: [
'react', // React
'^react-.*$', // React-related imports
@@ -29,5 +30,4 @@ module.exports = {
],
importOrderSeparation: true,
importOrderSortSpecifiers: true,
- pluginSearchDirs: false,
};
diff --git a/src/components/Chat/ChatInput.tsx b/src/components/Chat/ChatInput.tsx
index 051713d06b..0011553850 100644
--- a/src/components/Chat/ChatInput.tsx
+++ b/src/components/Chat/ChatInput.tsx
@@ -367,7 +367,7 @@ export const ChatInput = ({
{showScrollDownButton && (