Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

⚡ refactor: Migrate `@librechat/client` build to `tsdown` (#13596)

Danny Avilacb6dbc8f60a5
diff --git a/.github/workflows/frontend-review.yml b/.github/workflows/frontend-review.yml
index bb7526d248..130b659545 100644
--- a/.github/workflows/frontend-review.yml
+++ b/.github/workflows/frontend-review.yml
@@ -57,7 +57,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/client/dist
- key: build-client-package-${{ runner.os }}-${{ hashFiles('packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/rollup.config.js', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
+ key: build-client-package-${{ runner.os }}-${{ hashFiles('packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/tsdown.config.mjs', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
- name: Build client-package
if: steps.cache-client-package.outputs.cache-hit != 'true'
diff --git a/.github/workflows/playwright-mock.yml b/.github/workflows/playwright-mock.yml
index 493d29ff40..fc94dc02d6 100644
--- a/.github/workflows/playwright-mock.yml
+++ b/.github/workflows/playwright-mock.yml
@@ -90,7 +90,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/client/dist
- key: build-client-package-${{ runner.os }}-${{ hashFiles('package-lock.json', 'packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/rollup.config.js', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
+ key: build-client-package-${{ runner.os }}-${{ hashFiles('package-lock.json', 'packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/tsdown.config.mjs', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
- name: Build client-package
if: steps.cache-client-package.outputs.cache-hit != 'true'
@@ -101,7 +101,7 @@ jobs:
uses: actions/cache@v4
with:
path: client/dist
- key: build-client-app-e2e-${{ runner.os }}-${{ hashFiles('package-lock.json', 'client/src/**', 'client/public/**', 'client/scripts/post-build.cjs', 'client/index.html', 'client/package.json', 'client/vite.config.*', 'client/tsconfig*.json', 'client/tailwind.config.*', 'client/postcss.config.*', 'packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/rollup.config.js', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
+ key: build-client-app-e2e-${{ runner.os }}-${{ hashFiles('package-lock.json', 'client/src/**', 'client/public/**', 'client/scripts/post-build.cjs', 'client/index.html', 'client/package.json', 'client/vite.config.*', 'client/tsconfig*.json', 'client/tailwind.config.*', 'client/postcss.config.*', 'packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/tsdown.config.mjs', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/tsdown.config.mjs', 'packages/data-provider/package.json') }}
- name: Build client app
if: steps.cache-client-app.outputs.cache-hit != 'true'
diff --git a/client/src/main.jsx b/client/src/main.jsx
index d7dd8e0f6e..491f13f634 100644
--- a/client/src/main.jsx
+++ b/client/src/main.jsx
@@ -2,6 +2,7 @@ import './polyfills/regeneratorRuntime';
import { createRoot } from 'react-dom/client';
import './locales/i18n';
import App from './App';
+import '@librechat/client/style.css';
import './style.css';
import './mobile.css';
import { ApiErrorBoundaryProvider } from './hooks/ApiErrorBoundaryContext';
diff --git a/package-lock.json b/package-lock.json
index 6679534009..30fa3d2e3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44930,6 +44930,7 @@
"@tanstack/react-virtual": "^3.13.13",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^14.0.0",
+ "@tsdown/css": "^0.22.2",
"@types/jest": "^29.5.14",
"@types/react": "^18.2.11",
"@types/react-dom": "^18.2.4",
@@ -44952,6 +44953,7 @@
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-typescript2": "^0.37.0",
"tailwindcss-radix": "^2.8.0",
+ "tsdown": "^0.22.2",
"typescript": "^5.9.3"
},
"peerDependencies": {
@@ -45010,6 +45012,88 @@
"dev": true,
"license": "MIT"
},
+ "packages/client/node_modules/@babel/generator": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0-rc.6.tgz",
+ "integrity": "sha512-6mIzgVK8DgEzvIapoQwhXTMnnkuE4STQmVv9H03i/tZ2ml8oev3TRvZJgTenK2Bsq0YWNtzOrFdTyNzCMFtjJQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/parser": "^8.0.0-rc.6",
+ "@babel/types": "^8.0.0-rc.6",
+ "@jridgewell/gen-mapping": "^0.3.12",
+ "@jridgewell/trace-mapping": "^0.3.28",
+ "@types/jsesc": "^2.5.0",
+ "jsesc": "^3.0.2"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/client/node_modules/@babel/generator/node_modules/@babel/types": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0-rc.6.tgz",
+ "integrity": "sha512-p7/ABylAYlexb31wtRdIfH9L9A0Z2T/9H6zAqzqndkY2PLkvNNc580wGhp/gGKN4Sp9sQvSkhc6Oga8/O+wTyw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-string-parser": "^8.0.0-rc.6",
+ "@babel/helper-validator-identifier": "^8.0.0-rc.6"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/client/node_modules/@babel/helper-string-parser": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0-rc.6.tgz",
+ "integrity": "sha512-BCkFy+zN6kXQed3YOT7aJl93NfDSzQc3pBfsvTVPs9gU9X3V0aefEF5kwBT0E+mDWH9QgKaZstYUQN9VdQZT4g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/client/node_modules/@babel/helper-validator-identifier": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0-rc.6.tgz",
+ "integrity": "sha512-nVJ+1JcCgntv8d78rRo++o2wuODT0Irknx2BF8Np4Ft2CRgjLqIs4qzSZ8b66yGbBdMWGmZBO9WEZv1hhNiSpg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/client/node_modules/@babel/parser": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0-rc.6.tgz",
+ "integrity": "sha512-rOS8IpdO7mQELkTPlCsTgPejO0bFuZdEDCGQJouYbYf9e1FLTym7Fei2pEjq8q7MWbX0ravcd7QQYKs1TxOuog==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/types": "^8.0.0-rc.6"
+ },
+ "bin": {
+ "parser": "bin/babel-parser.js"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/client/node_modules/@babel/parser/node_modules/@babel/types": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0-rc.6.tgz",
+ "integrity": "sha512-p7/ABylAYlexb31wtRdIfH9L9A0Z2T/9H6zAqzqndkY2PLkvNNc580wGhp/gGKN4Sp9sQvSkhc6Oga8/O+wTyw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-string-parser": "^8.0.0-rc.6",
+ "@babel/helper-validator-identifier": "^8.0.0-rc.6"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
"packages/client/node_modules/@babel/plugin-transform-react-display-name": {
"version": "7.28.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
@@ -45100,6 +45184,310 @@
"@babel/core": "^7.0.0-0"
}
},
+ "packages/client/node_modules/@napi-rs/wasm-runtime": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
+ "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@tybys/wasm-util": "^0.10.1"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Brooooooklyn"
+ },
+ "peerDependencies": {
+ "@emnapi/core": "^1.7.1",
+ "@emnapi/runtime": "^1.7.1"
+ }
+ },
+ "packages/client/node_modules/@oxc-project/types": {
+ "version": "0.134.0",
+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.134.0.tgz",
+ "integrity": "sha512-T0xuRRKrQFmocH8y+jGfpmSkGcheaJExY9lEihmR1Gm2aH+75B8CzgU2rABRQSzzDxLjZ15Sc0bRVLj5lVeNXQ==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/Boshen"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-android-arm64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.0.tgz",
+ "integrity": "sha512-gCYzGOSkYY6Z034suzd20euvds7lPzMEEla62DJGE/ZAlR4OMBnNbvnBSsIGUCAr52gaWMsloGxP4tVGtN5aCA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-darwin-arm64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.0.tgz",
+ "integrity": "sha512-JQBD77MNgu+4Z6RAyg69acugdrhhVoWesr3l47zohYZ2YV2fwkWMArkN/2p4l6Ei+Sno7W5q+UsKdVWq5Ens0w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-darwin-x64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.0.tgz",
+ "integrity": "sha512-p/8cXUTK4Sob604e+xxPhVSbDFf29E6J0l/xESM9rdCfn3aDai3nEs6TnMHUsdD5aNlFz0+gDbiGlozLKGa2YA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-freebsd-x64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.0.tgz",
+ "integrity": "sha512-KbtOSlVv6fElujiZWMcC3aQYhEwLVVf073RcwlSmpGQvIsKZFUqc0ef4sjUuurRwfbiI6JJXji9DQn+86hawmQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.0.tgz",
+ "integrity": "sha512-9fZ9i0o0/MQaw7om6Z6TsT7tfCk0jtbEFtC+aPqZL5RNsGWNcHvn6EHgL3dAprjq+AZzPTAQjg2JtpJaMt+6pg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-arm64-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.0.tgz",
+ "integrity": "sha512-+tog7T66i+yFyIuuAnjL6xmW182W/qTBOUt6BtQ6lBIM1Eikh/fSMz4HGgvuCp5uU0zuIVWng7kDYthjCMOHcg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-arm64-musl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.0.tgz",
+ "integrity": "sha512-4b7yruLIIj/oZ3GpcLOvxcLCLDMraohn3IhQfN2hBP4w9UekG0DTIajWguJosRGfySf/+h/NwRUiMKoCpxCrqQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-ppc64-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.0.tgz",
+ "integrity": "sha512-QRDOVZd0bhQ5jLsUsCC3dUxDWdTSVY9WMznowZgCGOrZfLLgctWpelhUASEiBwsXfat/JwYnVd1EaxMhqyT+UQ==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-s390x-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.0.tgz",
+ "integrity": "sha512-ypxT+Hq76NFG7woFbNbySnGEajFuYuIXeKz/jfCU+lXUoxfi3zLE6OG/ZQNeK3RpZSYJlAe2bokpsQ046CaieQ==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-x64-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.0.tgz",
+ "integrity": "sha512-IdovCmfROFmpTLahdecTDFL74aLERVYN68F/mLZjfVh6LfoplPfI6deyHNMTcVujbokDV5k05XrFO22zfv+qjg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-linux-x64-musl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.0.tgz",
+ "integrity": "sha512-pcA8xlFp2tyk9T2R6Fi/rPe3bQ1MA+sSMDNUU5Ogu80GHOatkE4P8YCreGAvZErm5Ho2YRXnyvNrWiRncfVysQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-openharmony-arm64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.0.tgz",
+ "integrity": "sha512-4+fexHayrLCWpriPh4c6dNvL4an34DEZCG7zOM/FD5QNF6h8DT+bDXzyB/kfC8lDJbaFb7jKShtnjDQFXVQEjg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openharmony"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-wasm32-wasi": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.0.tgz",
+ "integrity": "sha512-SbL++MNmOw6QamrwIGDMSSfM4ceTzFr+RjbOExJSLLBinScU4WI5OdA413h1qwPw2yH7lVF1+H4svQ+6mSXKTQ==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "1.10.0",
+ "@emnapi/runtime": "1.10.0",
+ "@napi-rs/wasm-runtime": "^1.1.4"
+ },
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-win32-arm64-msvc": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.0.tgz",
+ "integrity": "sha512-+xTE6XC7wBgk0VKRXGG+QAnyW5S9b8vfsFpiMjf0waQTmSQSU8onsH/beyZ8X4aXVveJnotiy7VDjLOaW8bTrg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/client/node_modules/@rolldown/binding-win32-x64-msvc": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.0.tgz",
+ "integrity": "sha512-Ogji1TQNqH3ACLnYr+1Ns1nyrJ0CO2P585u9Hsh02pXvtFiFpgtgT2b3P4PnCOU86VVCvqtAeCN4OftMT8KU4w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
"packages/client/node_modules/@tanstack/react-table": {
"version": "8.21.3",
"resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
@@ -45240,6 +45628,49 @@
}
}
},
+ "packages/client/node_modules/@tsdown/css": {
+ "version": "0.22.2",
+ "resolved": "https://registry.npmjs.org/@tsdown/css/-/css-0.22.2.tgz",
+ "integrity": "sha512-Go3Im9TaQnoX68vfU8Jv0OVzlxAkbKcAhTHBSkO0oC3ULClKcKETFqF4GN3P5Tcsu43NlyzOnob5po5zKSFNCA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "lightningcss": "^1.32.0",
+ "postcss-load-config": "^6.0.1",
+ "rolldown": "~1.1.0"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.0",
+ "postcss-import": "^16.0.0",
+ "postcss-modules": "^6.0.0",
+ "sass": "*",
+ "sass-embedded": "*",
+ "tsdown": "0.22.2"
+ },
+ "peerDependenciesMeta": {
+ "postcss": {
+ "optional": true
+ },
+ "postcss-import": {
+ "optional": true
+ },
+ "postcss-modules": {
+ "optional": true
+ },
+ "sass": {
+ "optional": true
+ },
+ "sass-embedded": {
+ "optional": true
+ }
+ }
+ },
"packages/client/node_modules/@types/jest": {
"version": "29.5.14",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
@@ -45296,6 +45727,22 @@
"dequal": "^2.0.3"
}
},
+ "packages/client/node_modules/get-tsconfig": {
+ "version": "5.0.0-beta.5",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-5.0.0-beta.5.tgz",
+ "integrity": "sha512-/6gFNr0N04nob252sTQxyFLi3eKFRqIg1I87YcqAMT1i6SQrSF6KujUEQrtrjMV0H/eejTCltLdDSTEMzHbnsQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "resolve-pkg-maps": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=20.20.0"
+ },
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
"packages/client/node_modules/i18next": {
"version": "24.2.3",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
@@ -45328,6 +45775,75 @@
}
}
},
+ "packages/client/node_modules/lilconfig": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+ "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antonk52"
+ }
+ },
+ "packages/client/node_modules/picomatch": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "packages/client/node_modules/postcss-load-config": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
+ "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "lilconfig": "^3.1.1"
+ },
+ "engines": {
+ "node": ">= 18"
+ },
+ "peerDependencies": {
+ "jiti": ">=1.21.0",
+ "postcss": ">=8.0.9",
+ "tsx": "^4.8.1",
+ "yaml": "^2.4.2"
+ },
+ "peerDependenciesMeta": {
+ "jiti": {
+ "optional": true
+ },
+ "postcss": {
+ "optional": true
+ },
+ "tsx": {
+ "optional": true
+ },
+ "yaml": {
+ "optional": true
+ }
+ }
+ },
"packages/client/node_modules/pretty-format": {
"version": "27.5.1",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -45389,6 +45905,157 @@
"url": "https://github.com/sponsors/isaacs"
}
},
+ "packages/client/node_modules/rolldown": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.0.tgz",
+ "integrity": "sha512-zpMvlJhs5PkXRTtKc0CaLBVI9AR/VDiJFpM+kx//hgToEca7FgMlGjaRIisXBcb19T76LswgmKECSQ96hjWr5A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@oxc-project/types": "=0.134.0",
+ "@rolldown/pluginutils": "^1.0.0"
+ },
+ "bin": {
+ "rolldown": "bin/cli.mjs"
+ },
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ },
+ "optionalDependencies": {
+ "@rolldown/binding-android-arm64": "1.1.0",
+ "@rolldown/binding-darwin-arm64": "1.1.0",
+ "@rolldown/binding-darwin-x64": "1.1.0",
+ "@rolldown/binding-freebsd-x64": "1.1.0",
+ "@rolldown/binding-linux-arm-gnueabihf": "1.1.0",
+ "@rolldown/binding-linux-arm64-gnu": "1.1.0",
+ "@rolldown/binding-linux-arm64-musl": "1.1.0",
+ "@rolldown/binding-linux-ppc64-gnu": "1.1.0",
+ "@rolldown/binding-linux-s390x-gnu": "1.1.0",
+ "@rolldown/binding-linux-x64-gnu": "1.1.0",
+ "@rolldown/binding-linux-x64-musl": "1.1.0",
+ "@rolldown/binding-openharmony-arm64": "1.1.0",
+ "@rolldown/binding-wasm32-wasi": "1.1.0",
+ "@rolldown/binding-win32-arm64-msvc": "1.1.0",
+ "@rolldown/binding-win32-x64-msvc": "1.1.0"
+ }
+ },
+ "packages/client/node_modules/tsdown": {
+ "version": "0.22.2",
+ "resolved": "https://registry.npmjs.org/tsdown/-/tsdown-0.22.2.tgz",
+ "integrity": "sha512-VX9gsyKXsTnBZjnIM4jsHl9aRv+GfgkE/k1hQslilaBfZMlaw3JuGR+6yhiU0QxWBtOCDnTjwOSoXzgB7Rr50g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansis": "^4.3.1",
+ "cac": "^7.0.0",
+ "defu": "^6.1.7",
+ "empathic": "^2.0.1",
+ "hookable": "^6.1.1",
+ "import-without-cache": "^0.4.0",
+ "obug": "^2.1.1",
+ "picomatch": "^4.0.4",
+ "rolldown": "~1.1.0",
+ "rolldown-plugin-dts": "^0.25.2",
+ "semver": "^7.8.1",
+ "tinyexec": "^1.2.4",
+ "tinyglobby": "^0.2.17",
+ "tree-kill": "^1.2.2",
+ "unconfig-core": "^7.5.0"
+ },
+ "bin": {
+ "tsdown": "dist/run.mjs"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ },
+ "peerDependencies": {
+ "@arethetypeswrong/core": "^0.18.1",
+ "@tsdown/css": "0.22.2",
+ "@tsdown/exe": "0.22.2",
+ "@vitejs/devtools": "*",
+ "publint": "^0.3.8",
+ "tsx": "*",
+ "typescript": "^5.0.0 || ^6.0.0",
+ "unplugin-unused": "^0.5.0",
+ "unrun": "*"
+ },
+ "peerDependenciesMeta": {
+ "@arethetypeswrong/core": {
+ "optional": true
+ },
+ "@tsdown/css": {
+ "optional": true
+ },
+ "@tsdown/exe": {
+ "optional": true
+ },
+ "@vitejs/devtools": {
+ "optional": true
+ },
+ "publint": {
+ "optional": true
+ },
+ "tsx": {
+ "optional": true
+ },
+ "typescript": {
+ "optional": true
+ },
+ "unplugin-unused": {
+ "optional": true
+ },
+ "unrun": {
+ "optional": true
+ }
+ }
+ },
+ "packages/client/node_modules/tsdown/node_modules/rolldown-plugin-dts": {
+ "version": "0.25.2",
+ "resolved": "https://registry.npmjs.org/rolldown-plugin-dts/-/rolldown-plugin-dts-0.25.2.tgz",
+ "integrity": "sha512-nMhN/R+vmR8GM45ZW1FWMSjRTSDDn/6w4GTf8RNrEFCBdl8B1kySWrU1ixPtbwzXoRlcO+R/S88VgXuJQwfdDg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/generator": "8.0.0-rc.6",
+ "@babel/helper-validator-identifier": "8.0.0-rc.6",
+ "@babel/parser": "8.0.0-rc.6",
+ "ast-kit": "^3.0.0-beta.1",
+ "birpc": "^4.0.0",
+ "dts-resolver": "^3.0.0",
+ "get-tsconfig": "5.0.0-beta.5",
+ "obug": "^2.1.1"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ },
+ "peerDependencies": {
+ "@ts-macro/tsc": "^0.3.6",
+ "@typescript/native-preview": ">=7.0.0-dev.20260325.1",
+ "rolldown": "^1.0.0",
+ "typescript": "^5.0.0 || ^6.0.0",
+ "vue-tsc": "~3.2.0"
+ },
+ "peerDependenciesMeta": {
+ "@ts-macro/tsc": {
+ "optional": true
+ },
+ "@typescript/native-preview": {
+ "optional": true
+ },
+ "typescript": {
+ "optional": true
+ },
+ "vue-tsc": {
+ "optional": true
+ }
+ }
+ },
"packages/data-provider": {
"name": "librechat-data-provider",
"version": "0.8.503",
diff --git a/packages/client/package.json b/packages/client/package.json
index dede35b41f..d3e744fc32 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -6,15 +6,22 @@
"type": "git",
"url": "https://github.com/danny-avila/LibreChat"
},
- "main": "dist/index.js",
- "module": "dist/index.es.js",
- "types": "dist/types/index.d.ts",
+ "main": "dist/index.cjs",
+ "module": "dist/index.mjs",
+ "types": "./dist/index.d.cts",
"exports": {
".": {
- "import": "./dist/index.es.js",
- "require": "./dist/index.js",
- "types": "./dist/types/index.d.ts"
- }
+ "import": {
+ "types": "./dist/index.d.mts",
+ "default": "./dist/index.mjs"
+ },
+ "require": {
+ "types": "./dist/index.d.cts",
+ "default": "./dist/index.cjs"
+ }
+ },
+ "./style.css": "./dist/style.css",
+ "./package.json": "./package.json"
},
"files": [
"dist"
@@ -22,11 +29,11 @@
"scripts": {
"clean": "rimraf dist",
"b:clean": "bun run rimraf dist",
- "build": "npm run clean && rollup -c --bundleConfigAsCjs",
- "build:dev": "npm run clean && NODE_ENV=development rollup -c --bundleConfigAsCjs",
- "b:build": "bun run b:clean && bun run rollup -c --silent --bundleConfigAsCjs",
- "build:watch": "rollup -c -w --bundleConfigAsCjs",
- "dev": "rollup -c -w --bundleConfigAsCjs"
+ "build": "npm run clean && tsdown",
+ "build:dev": "npm run clean && NODE_ENV=development tsdown",
+ "b:build": "bun run b:clean && bun run tsdown",
+ "build:watch": "tsdown --watch",
+ "dev": "tsdown --watch"
},
"peerDependencies": {
"@ariakit/react": "^0.4.16",
@@ -90,6 +97,7 @@
"@tanstack/react-virtual": "^3.13.13",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^14.0.0",
+ "@tsdown/css": "^0.22.2",
"@types/jest": "^29.5.14",
"@types/react": "^18.2.11",
"@types/react-dom": "^18.2.4",
@@ -112,6 +120,7 @@
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-typescript2": "^0.37.0",
"tailwindcss-radix": "^2.8.0",
+ "tsdown": "^0.22.2",
"typescript": "^5.9.3"
}
}
diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js
deleted file mode 100644
index 149545f626..0000000000
--- a/packages/client/rollup.config.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// ESM bundler config for React components
-import { fileURLToPath } from 'url';
-import alias from '@rollup/plugin-alias';
-import postcss from 'rollup-plugin-postcss';
-import replace from '@rollup/plugin-replace';
-import commonjs from '@rollup/plugin-commonjs';
-import resolve from '@rollup/plugin-node-resolve';
-import typescript from 'rollup-plugin-typescript2';
-import { dirname, resolve as pathResolve } from 'path';
-import peerDepsExternal from 'rollup-plugin-peer-deps-external';
-import pkg from './package.json';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const plugins = [
- peerDepsExternal(),
- alias({
- entries: [{ find: '~', replacement: pathResolve(__dirname, 'src') }],
- }),
- resolve({
- extensions: ['.js', '.jsx', '.ts', '.tsx'],
- browser: true,
- preferBuiltins: false,
- }),
- replace({
- 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
- 'process.env.VITE_ENABLE_LOGGER': JSON.stringify(process.env.VITE_ENABLE_LOGGER || 'false'),
- 'process.env.VITE_LOGGER_FILTER': JSON.stringify(process.env.VITE_LOGGER_FILTER || ''),
- preventAssignment: true,
- }),
- commonjs(),
- postcss({
- extract: false,
- inject: true,
- minimize: process.env.NODE_ENV === 'production',
- modules: false,
- config: {
- path: './postcss.config.js',
- },
- }),
- typescript({
- tsconfig: './tsconfig.json',
- useTsconfigDeclarationDir: true,
- clean: true,
- check: false,
- }),
-];
-
-const isDev = process.env.NODE_ENV !== 'production';
-
-export default {
- input: 'src/index.ts',
- output: [
- {
- file: pkg.main,
- format: 'cjs',
- sourcemap: isDev ? 'inline' : true,
- exports: 'named',
- },
- {
- file: pkg.module,
- format: 'esm',
- sourcemap: isDev ? 'inline' : true,
- exports: 'named',
- },
- ],
- external: [
- ...Object.keys(pkg.peerDependencies || {}),
- 'react/jsx-runtime',
- 'react/jsx-dev-runtime',
- ],
- preserveSymlinks: true,
- plugins,
- onwarn(warning, warn) {
- // Ignore "use client" directive warnings
- if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {
- return;
- }
- warn(warning);
- },
-};
diff --git a/packages/client/src/Providers/ToastContext.tsx b/packages/client/src/Providers/ToastContext.tsx
index afe24995d2..6a34228588 100644
--- a/packages/client/src/Providers/ToastContext.tsx
+++ b/packages/client/src/Providers/ToastContext.tsx
@@ -1,4 +1,5 @@
-import { createContext, useContext, ReactNode } from 'react';
+import { createContext, useContext, ReactNode, Context } from 'react';
+import { JSX } from 'react/jsx-runtime';
import type { TShowToast } from '~/common';
import useToast from '~/hooks/useToast';
@@ -6,15 +7,15 @@ type ToastContextType = {
showToast: ({ message, severity, showIcon, duration }: TShowToast) => void;
};
-export const ToastContext = createContext<ToastContextType>({
+export const ToastContext: Context<ToastContextType> = createContext<ToastContextType>({
showToast: () => ({}),
});
-export function useToastContext() {
+export function useToastContext(): ToastContextType {
return useContext(ToastContext);
}
-export default function ToastProvider({ children }: { children: ReactNode }) {
+export default function ToastProvider({ children }: { children: ReactNode }): JSX.Element {
const { showToast } = useToast();
return <ToastContext.Provider value={{ showToast }}>{children}</ToastContext.Provider>;
diff --git a/packages/client/src/components/Accordion.tsx b/packages/client/src/components/Accordion.tsx
index 813cf4fa02..b013d0378f 100644
--- a/packages/client/src/components/Accordion.tsx
+++ b/packages/client/src/components/Accordion.tsx
@@ -1,11 +1,17 @@
import * as React from 'react';
-import * as AccordionPrimitive from '@radix-ui/react-accordion';
import { ChevronDownIcon } from '@radix-ui/react-icons';
+import * as AccordionPrimitive from '@radix-ui/react-accordion';
import { cn } from '~/utils';
-const Accordion = AccordionPrimitive.Root;
+const Accordion: React.ForwardRefExoticComponent<
+ (AccordionPrimitive.AccordionSingleProps | AccordionPrimitive.AccordionMultipleProps) &
+ React.RefAttributes<HTMLDivElement>
+> = AccordionPrimitive.Root;
-const AccordionItem = React.forwardRef<
+const AccordionItem: React.ForwardRefExoticComponent<
+ Omit<AccordionPrimitive.AccordionItemProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof AccordionPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
>(({ className = '', ...props }, ref) => (
@@ -13,7 +19,10 @@ const AccordionItem = React.forwardRef<
));
AccordionItem.displayName = 'AccordionItem';
-const AccordionTrigger = React.forwardRef<
+const AccordionTrigger: React.ForwardRefExoticComponent<
+ Omit<AccordionPrimitive.AccordionTriggerProps & React.RefAttributes<HTMLButtonElement>, 'ref'> &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof AccordionPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
>(({ className = '', children, ...props }, ref) => (
@@ -33,7 +42,10 @@ const AccordionTrigger = React.forwardRef<
));
AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
-const AccordionContent = React.forwardRef<
+const AccordionContent: React.ForwardRefExoticComponent<
+ Omit<AccordionPrimitive.AccordionContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof AccordionPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
>(({ className = '', children, ...props }, ref) => (
diff --git a/packages/client/src/components/AlertDialog.tsx b/packages/client/src/components/AlertDialog.tsx
index 4e78fda211..3de8f59242 100644
--- a/packages/client/src/components/AlertDialog.tsx
+++ b/packages/client/src/components/AlertDialog.tsx
@@ -1,10 +1,13 @@
import * as React from 'react';
+import { JSX } from 'react/jsx-runtime';
import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
import { cn } from '~/utils';
-const AlertDialog = AlertDialogPrimitive.Root;
+const AlertDialog: React.FC<AlertDialogPrimitive.AlertDialogProps> = AlertDialogPrimitive.Root;
-const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
+const AlertDialogTrigger: React.ForwardRefExoticComponent<
+ AlertDialogPrimitive.AlertDialogTriggerProps & React.RefAttributes<HTMLButtonElement>
+> = AlertDialogPrimitive.Trigger;
type AlertPortalProps = AlertDialogPrimitive.AlertDialogPortalProps & { className?: string };
@@ -32,7 +35,10 @@ const AlertDialogOverlay = React.forwardRef<
));
AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName;
-const AlertDialogContent = React.forwardRef<
+const AlertDialogContent: React.ForwardRefExoticComponent<
+ Omit<AlertDialogPrimitive.AlertDialogContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
>(({ className = '', ...props }, ref) => (
@@ -51,12 +57,18 @@ const AlertDialogContent = React.forwardRef<
));
AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
-const AlertDialogHeader = ({ className = '', ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+const AlertDialogHeader: {
+ ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element;
+ displayName: string;
+} = ({ className = '', ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div className={cn('flex flex-col space-y-2 text-center sm:text-left', className)} {...props} />
);
AlertDialogHeader.displayName = 'AlertDialogHeader';
-const AlertDialogFooter = ({ className = '', ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+const AlertDialogFooter: {
+ ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element;
+ displayName: string;
+} = ({ className = '', ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div
className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}
{...props}
@@ -64,7 +76,13 @@ const AlertDialogFooter = ({ className = '', ...props }: React.HTMLAttributes<HT
);
AlertDialogFooter.displayName = 'AlertDialogFooter';
-const AlertDialogTitle = React.forwardRef<
+const AlertDialogTitle: React.ForwardRefExoticComponent<
+ Omit<
+ AlertDialogPrimitive.AlertDialogTitleProps & React.RefAttributes<HTMLHeadingElement>,
+ 'ref'
+ > &
+ React.RefAttributes<HTMLHeadingElement>
+> = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
>(({ className = '', ...props }, ref) => (
@@ -76,7 +94,13 @@ const AlertDialogTitle = React.forwardRef<
));
AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
-const AlertDialogDescription = React.forwardRef<
+const AlertDialogDescription: React.ForwardRefExoticComponent<
+ Omit<
+ AlertDialogPrimitive.AlertDialogDescriptionProps & React.RefAttributes<HTMLParagraphElement>,
+ 'ref'
+ > &
+ React.RefAttributes<HTMLParagraphElement>
+> = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
>(({ className = '', ...props }, ref) => (
@@ -88,7 +112,13 @@ const AlertDialogDescription = React.forwardRef<
));
AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName;
-const AlertDialogAction = React.forwardRef<
+const AlertDialogAction: React.ForwardRefExoticComponent<
+ Omit<
+ AlertDialogPrimitive.AlertDialogActionProps & React.RefAttributes<HTMLButtonElement>,
+ 'ref'
+ > &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Action>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
>(({ className = '', ...props }, ref) => (
@@ -103,7 +133,13 @@ const AlertDialogAction = React.forwardRef<
));
AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
-const AlertDialogCancel = React.forwardRef<
+const AlertDialogCancel: React.ForwardRefExoticComponent<
+ Omit<
+ AlertDialogPrimitive.AlertDialogCancelProps & React.RefAttributes<HTMLButtonElement>,
+ 'ref'
+ > &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
>(({ className = '', ...props }, ref) => (
diff --git a/packages/client/src/components/AnimatedSearchInput.tsx b/packages/client/src/components/AnimatedSearchInput.tsx
index 9e3411d1d7..1a07d72854 100644
--- a/packages/client/src/components/AnimatedSearchInput.tsx
+++ b/packages/client/src/components/AnimatedSearchInput.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import { Search } from 'lucide-react';
-import { TranslationKeys, useLocalize } from '~/hooks';
+import { JSX } from 'react/jsx-runtime';
+import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
const AnimatedSearchInput = ({
@@ -13,7 +14,7 @@ const AnimatedSearchInput = ({
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
isSearching?: boolean;
placeholder: string;
-}) => {
+}): JSX.Element => {
const isSearching = searching === true;
const hasValue = value != null && value.length > 0;
const localize = useLocalize();
diff --git a/packages/client/src/components/AnimatedTabs.tsx b/packages/client/src/components/AnimatedTabs.tsx
index 131d871aaf..3d5eab05de 100644
--- a/packages/client/src/components/AnimatedTabs.tsx
+++ b/packages/client/src/components/AnimatedTabs.tsx
@@ -1,8 +1,9 @@
-import * as Ariakit from '@ariakit/react';
import { forwardRef, useEffect, useRef } from 'react';
+import * as Ariakit from '@ariakit/react';
import type { ElementRef } from 'react';
import { cn } from '~/utils';
import './AnimatedTabs.css';
+import { JSX } from 'react/jsx-runtime';
export interface TabItem {
id?: string;
@@ -89,7 +90,7 @@ export function AnimatedTabs({
containerClassName = '',
tabListProps = {},
defaultSelectedId,
-}: AnimatedTabsProps) {
+}: AnimatedTabsProps): JSX.Element {
const tabIds = tabs.map((tab, index) => tab.id || `tab-${index}`);
const firstTabId = defaultSelectedId || tabIds[0];
const tabListRef = useRef<HTMLDivElement | null>(null);
diff --git a/packages/client/src/components/Badge.tsx b/packages/client/src/components/Badge.tsx
index 0a92d16c69..8a645fc1a3 100644
--- a/packages/client/src/components/Badge.tsx
+++ b/packages/client/src/components/Badge.tsx
@@ -1,8 +1,9 @@
-import type React from 'react';
import { X, Plus } from 'lucide-react';
import { motion } from 'framer-motion';
+import { JSX } from 'react/jsx-runtime';
import type { ButtonHTMLAttributes } from 'react';
import type { LucideIcon } from 'lucide-react';
+import type React from 'react';
import { cn } from '~/utils';
interface BadgeProps
@@ -35,7 +36,7 @@ export default function Badge({
onToggle,
className,
...props
-}: BadgeProps) {
+}: BadgeProps): JSX.Element {
const isMoveable = isEditing && isAvailable;
const isDisabled = id === '1' && isInChat;
diff --git a/packages/client/src/components/Breadcrumb.tsx b/packages/client/src/components/Breadcrumb.tsx
index f1026a8305..09e0e5e9af 100644
--- a/packages/client/src/components/Breadcrumb.tsx
+++ b/packages/client/src/components/Breadcrumb.tsx
@@ -1,9 +1,14 @@
import * as React from 'react';
+import { JSX } from 'react/jsx-runtime';
import { Slot } from '@radix-ui/react-slot';
import { ChevronRight, MoreHorizontal } from 'lucide-react';
import { cn } from '~/utils';
-const Breadcrumb = React.forwardRef<
+const Breadcrumb: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>, 'ref'> & {
+ separator?: React.ReactNode;
+ } & React.RefAttributes<HTMLElement>
+> = React.forwardRef<
HTMLElement,
React.ComponentPropsWithoutRef<'nav'> & {
separator?: React.ReactNode;
@@ -11,7 +16,10 @@ const Breadcrumb = React.forwardRef<
>(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />);
Breadcrumb.displayName = 'Breadcrumb';
-const BreadcrumbList = React.forwardRef<HTMLOListElement, React.ComponentPropsWithoutRef<'ol'>>(
+const BreadcrumbList: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.OlHTMLAttributes<HTMLOListElement>, HTMLOListElement>, 'ref'> &
+ React.RefAttributes<HTMLOListElement>
+> = React.forwardRef<HTMLOListElement, React.ComponentPropsWithoutRef<'ol'>>(
({ className, ...props }, ref) => (
<ol
ref={ref}
@@ -25,14 +33,24 @@ const BreadcrumbList = React.forwardRef<HTMLOListElement, React.ComponentPropsWi
);
BreadcrumbList.displayName = 'BreadcrumbList';
-const BreadcrumbItem = React.forwardRef<HTMLLIElement, React.ComponentPropsWithoutRef<'li'>>(
+const BreadcrumbItem: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, 'ref'> &
+ React.RefAttributes<HTMLLIElement>
+> = React.forwardRef<HTMLLIElement, React.ComponentPropsWithoutRef<'li'>>(
({ className, ...props }, ref) => (
<li ref={ref} className={cn('inline-flex items-center gap-1.5', className)} {...props} />
),
);
BreadcrumbItem.displayName = 'BreadcrumbItem';
-const BreadcrumbLink = React.forwardRef<
+const BreadcrumbLink: React.ForwardRefExoticComponent<
+ Omit<
+ React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>,
+ 'ref'
+ > & {
+ asChild?: boolean;
+ } & React.RefAttributes<HTMLAnchorElement>
+> = React.forwardRef<
HTMLAnchorElement,
React.ComponentPropsWithoutRef<'a'> & {
asChild?: boolean;
@@ -50,7 +68,10 @@ const BreadcrumbLink = React.forwardRef<
});
BreadcrumbLink.displayName = 'BreadcrumbLink';
-const BreadcrumbPage = React.forwardRef<HTMLSpanElement, React.ComponentPropsWithoutRef<'span'>>(
+const BreadcrumbPage: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, 'ref'> &
+ React.RefAttributes<HTMLSpanElement>
+> = React.forwardRef<HTMLSpanElement, React.ComponentPropsWithoutRef<'span'>>(
({ className, ...props }, ref) => (
<span
ref={ref}
@@ -64,7 +85,10 @@ const BreadcrumbPage = React.forwardRef<HTMLSpanElement, React.ComponentPropsWit
);
BreadcrumbPage.displayName = 'BreadcrumbPage';
-const BreadcrumbSeparator = ({ children, className, ...props }: React.ComponentProps<'li'>) => (
+const BreadcrumbSeparator: {
+ ({ children, className, ...props }: React.ComponentProps<'li'>): JSX.Element;
+ displayName: string;
+} = ({ children, className, ...props }: React.ComponentProps<'li'>): JSX.Element => (
<li
role="presentation"
aria-hidden="true"
@@ -76,7 +100,10 @@ const BreadcrumbSeparator = ({ children, className, ...props }: React.ComponentP
);
BreadcrumbSeparator.displayName = 'BreadcrumbSeparator';
-const BreadcrumbEllipsis = ({ className, ...props }: React.ComponentProps<'span'>) => (
+const BreadcrumbEllipsis: {
+ ({ className, ...props }: React.ComponentProps<'span'>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.ComponentProps<'span'>): JSX.Element => (
<span
role="presentation"
aria-hidden="true"
diff --git a/packages/client/src/components/Button.tsx b/packages/client/src/components/Button.tsx
index b7d9701e5b..53150bde5a 100644
--- a/packages/client/src/components/Button.tsx
+++ b/packages/client/src/components/Button.tsx
@@ -1,9 +1,26 @@
import * as React from 'react';
import { Slot } from '@radix-ui/react-slot';
+import { ClassProp } from 'class-variance-authority/types';
import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '~/utils';
-const buttonVariants = cva(
+const buttonVariants: (
+ props?:
+ | ({
+ variant?:
+ | 'default'
+ | 'link'
+ | 'submit'
+ | 'outline'
+ | 'destructive'
+ | 'secondary'
+ | 'ghost'
+ | null
+ | undefined;
+ size?: 'default' | 'icon' | 'sm' | 'lg' | null | undefined;
+ } & ClassProp)
+ | undefined,
+) => string = cva(
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
{
variants: {
@@ -39,7 +56,9 @@ export interface ButtonProps
asChild?: boolean;
}
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+const Button: React.ForwardRefExoticComponent<
+ ButtonProps & React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, type = 'button', ...props }, ref) => {
const Comp = asChild ? Slot : 'button';
return (
diff --git a/packages/client/src/components/Checkbox.tsx b/packages/client/src/components/Checkbox.tsx
index 38d94dd74d..b4b45c221c 100644
--- a/packages/client/src/components/Checkbox.tsx
+++ b/packages/client/src/components/Checkbox.tsx
@@ -20,7 +20,9 @@ export type CheckboxProps =
'aria-label'?: never;
});
-const Checkbox = React.forwardRef<React.ElementRef<typeof CheckboxPrimitive.Root>, CheckboxProps>(
+const Checkbox: React.ForwardRefExoticComponent<
+ CheckboxProps & React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<React.ElementRef<typeof CheckboxPrimitive.Root>, CheckboxProps>(
({ className = '', ...props }, ref) => (
<CheckboxPrimitive.Root
ref={ref}
diff --git a/packages/client/src/components/CheckboxButton.tsx b/packages/client/src/components/CheckboxButton.tsx
index 1858b7b68d..e91e7e0efe 100644
--- a/packages/client/src/components/CheckboxButton.tsx
+++ b/packages/client/src/components/CheckboxButton.tsx
@@ -3,7 +3,20 @@ import { useEffect } from 'react';
import { Checkbox, useStoreState, useCheckboxStore } from '@ariakit/react';
import { cn } from '~/utils';
-const CheckboxButton = React.forwardRef<
+const CheckboxButton: React.ForwardRefExoticComponent<
+ {
+ icon?: React.ReactNode;
+ label: string;
+ className?: string;
+ checked?: boolean;
+ defaultChecked?: boolean;
+ isCheckedClassName?: string;
+ setValue?: (values: {
+ e?: React.ChangeEvent<HTMLInputElement>;
+ value: boolean | string;
+ }) => void;
+ } & React.RefAttributes<HTMLInputElement>
+> = React.forwardRef<
HTMLInputElement,
{
icon?: React.ReactNode;
diff --git a/packages/client/src/components/Collapsible.tsx b/packages/client/src/components/Collapsible.tsx
index 9605c4e41a..a91c0b36db 100644
--- a/packages/client/src/components/Collapsible.tsx
+++ b/packages/client/src/components/Collapsible.tsx
@@ -1,9 +1,16 @@
+import { ForwardRefExoticComponent, RefAttributes } from 'react';
import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
-const Collapsible = CollapsiblePrimitive.Root;
+const Collapsible: ForwardRefExoticComponent<
+ CollapsiblePrimitive.CollapsibleProps & RefAttributes<HTMLDivElement>
+> = CollapsiblePrimitive.Root;
-const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
+const CollapsibleTrigger: ForwardRefExoticComponent<
+ CollapsiblePrimitive.CollapsibleTriggerProps & RefAttributes<HTMLButtonElement>
+> = CollapsiblePrimitive.CollapsibleTrigger;
-const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
+const CollapsibleContent: ForwardRefExoticComponent<
+ CollapsiblePrimitive.CollapsibleContentProps & RefAttributes<HTMLDivElement>
+> = CollapsiblePrimitive.CollapsibleContent;
export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/packages/client/src/components/Combobox.tsx b/packages/client/src/components/Combobox.tsx
index 147d3c1939..793a8af7de 100644
--- a/packages/client/src/components/Combobox.tsx
+++ b/packages/client/src/components/Combobox.tsx
@@ -1,4 +1,5 @@
import { startTransition } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { Search as SearchIcon } from 'lucide-react';
import * as RadixSelect from '@radix-ui/react-select';
import { CheckIcon, ChevronDownIcon } from '@radix-ui/react-icons';
@@ -34,7 +35,7 @@ export default function ComboboxComponent({
setValue: (value: string) => void;
isCollapsed: boolean;
SelectIcon?: React.ReactNode;
-}) {
+}): JSX.Element {
const options: OptionWithIcon[] = (items ?? []).map((option: string | OptionWithIcon) => {
if (typeof option === 'string') {
return { label: option, value: option };
diff --git a/packages/client/src/components/ControlCombobox.tsx b/packages/client/src/components/ControlCombobox.tsx
index ca932fa2b5..d7e9aaa65b 100644
--- a/packages/client/src/components/ControlCombobox.tsx
+++ b/packages/client/src/components/ControlCombobox.tsx
@@ -1,10 +1,11 @@
+import { useMemo, useState, useRef, memo, useEffect, MemoExoticComponent } from 'react';
import * as Ariakit from '@ariakit/react';
import { matchSorter } from 'match-sorter';
import { Search, ChevronDown } from 'lucide-react';
-import { useMemo, useState, useRef, memo, useEffect } from 'react';
import { SelectRenderer } from '@ariakit/react-core/select/select-renderer';
import type { OptionWithIcon } from '~/common';
import './AnimatePopover.css';
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
interface ControlComboboxProps {
@@ -47,7 +48,7 @@ function ControlCombobox({
iconSide = 'left',
selectId,
placement,
-}: ControlComboboxProps) {
+}: ControlComboboxProps): JSX.Element {
const [searchValue, setSearchValue] = useState('');
const buttonRef = useRef<HTMLButtonElement>(null);
const [buttonWidth, setButtonWidth] = useState<number | null>(null);
@@ -204,4 +205,5 @@ function ControlCombobox({
);
}
-export default memo(ControlCombobox);
+const ControlComboboxMemo: MemoExoticComponent<typeof ControlCombobox> = memo(ControlCombobox);
+export default ControlComboboxMemo;
diff --git a/packages/client/src/components/DataTable.tsx b/packages/client/src/components/DataTable.tsx
index 6a26e31d76..09136ac33a 100644
--- a/packages/client/src/components/DataTable.tsx
+++ b/packages/client/src/components/DataTable.tsx
@@ -1,4 +1,5 @@
import React, { useCallback, useEffect, useRef, useState, memo, useMemo } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { useVirtualizer } from '@tanstack/react-virtual';
import {
Row,
@@ -222,7 +223,7 @@ export default function DataTable<TData, TValue>({
filterValue,
isLoading,
enableSearch = true,
-}: DataTableProps<TData, TValue>) {
+}: DataTableProps<TData, TValue>): JSX.Element {
const localize = useLocalize();
const isSmallScreen = useMediaQuery('(max-width: 768px)');
const tableContainerRef = useRef<HTMLDivElement>(null);
diff --git a/packages/client/src/components/DataTable/DataTable.hooks.ts b/packages/client/src/components/DataTable/DataTable.hooks.ts
index d2941fb438..ed062f0b4c 100644
--- a/packages/client/src/components/DataTable/DataTable.hooks.ts
+++ b/packages/client/src/components/DataTable/DataTable.hooks.ts
@@ -1,7 +1,7 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useState, useEffect, useMemo, SetStateAction, Dispatch, CSSProperties } from 'react';
import type { TableColumn } from './DataTable.types';
-export function useDebounced<T>(value: T, delay: number) {
+export function useDebounced<T>(value: T, delay: number): T {
const [debounced, setDebounced] = useState(value);
useEffect(() => {
@@ -12,7 +12,9 @@ export function useDebounced<T>(value: T, delay: number) {
return debounced;
}
-export const useOptimizedRowSelection = (initialSelection: Record<string, boolean> = {}) => {
+export const useOptimizedRowSelection = (
+ initialSelection: Record<string, boolean> = {},
+): readonly [Record<string, boolean>, Dispatch<SetStateAction<Record<string, boolean>>>] => {
const [selection, setSelection] = useState(initialSelection);
return [selection, setSelection] as const;
};
@@ -21,7 +23,7 @@ export const useColumnStyles = <TData, TValue>(
columns: TableColumn<TData, TValue>[],
isSmallScreen: boolean,
containerRef: React.RefObject<HTMLDivElement>,
-) => {
+): Record<string, CSSProperties> => {
const [containerWidth, setContainerWidth] = useState(0);
useEffect(() => {
@@ -83,13 +85,20 @@ export const useColumnStyles = <TData, TValue>(
}, [columns, containerWidth, isSmallScreen]);
};
-export const useDynamicColumnWidths = useColumnStyles;
+export const useDynamicColumnWidths: <TData, TValue>(
+ columns: TableColumn<TData, TValue>[],
+ isSmallScreen: boolean,
+ containerRef: React.RefObject<HTMLDivElement>,
+) => Record<string, CSSProperties> = useColumnStyles;
export const useKeyboardNavigation = (
tableRef: React.RefObject<HTMLDivElement>,
rowCount: number,
onRowSelect?: (index: number) => void,
-) => {
+): {
+ focusedRowIndex: number;
+ setFocusedRowIndex: Dispatch<SetStateAction<number>>;
+} => {
const [focusedRowIndex, setFocusedRowIndex] = useState<number>(-1);
useEffect(() => {
diff --git a/packages/client/src/components/DataTable/DataTable.tsx b/packages/client/src/components/DataTable/DataTable.tsx
index e7244e68d2..2c11155e0a 100644
--- a/packages/client/src/components/DataTable/DataTable.tsx
+++ b/packages/client/src/components/DataTable/DataTable.tsx
@@ -1,4 +1,5 @@
import React, { useRef, useState, useEffect, useMemo, useCallback } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { useVirtualizer } from '@tanstack/react-virtual';
import { ArrowUp, ArrowDown, ArrowDownUp } from 'lucide-react';
import {
@@ -37,7 +38,7 @@ function DataTable<TData extends Record<string, unknown>, TValue>({
sorting,
onSortingChange,
customActionsRenderer,
-}: DataTableProps<TData, TValue>) {
+}: DataTableProps<TData, TValue>): JSX.Element {
const localize = useLocalize();
const isSmallScreen = useMediaQuery('(max-width: 768px)');
diff --git a/packages/client/src/components/DataTable/DataTableComponents.tsx b/packages/client/src/components/DataTable/DataTableComponents.tsx
index d291f763c0..830c05d4cc 100644
--- a/packages/client/src/components/DataTable/DataTableComponents.tsx
+++ b/packages/client/src/components/DataTable/DataTableComponents.tsx
@@ -1,4 +1,5 @@
import React, { memo, forwardRef } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { flexRender } from '@tanstack/react-table';
import type { Row } from '@tanstack/react-table';
import type { TableColumn } from './DataTable.types';
@@ -7,7 +8,7 @@ import { Checkbox } from '../Checkbox';
import { Skeleton } from '../Skeleton';
import { cn } from '~/utils';
-export const SelectionCheckbox = memo(
+export const SelectionCheckbox: React.MemoExoticComponent<
({
checked,
onChange,
@@ -16,7 +17,17 @@ export const SelectionCheckbox = memo(
checked: boolean;
onChange: (value: boolean) => void;
ariaLabel: string;
- }) => (
+ }) => JSX.Element
+> = memo(
+ ({
+ checked,
+ onChange,
+ ariaLabel,
+ }: {
+ checked: boolean;
+ onChange: (value: boolean) => void;
+ ariaLabel: string;
+ }): JSX.Element => (
<div
role="button"
tabIndex={0}
@@ -124,20 +135,29 @@ interface GenericRowProps {
selected: boolean;
}
-export const MemoizedTableRow = memo(
- ForwardTableRowComponent as (props: GenericRowProps) => JSX.Element,
- (prev: GenericRowProps, next: GenericRowProps) =>
- prev.row.original === next.row.original && prev.selected === next.selected,
-);
+export const MemoizedTableRow: React.MemoExoticComponent<(props: GenericRowProps) => JSX.Element> =
+ memo(
+ ForwardTableRowComponent as (props: GenericRowProps) => JSX.Element,
+ (prev: GenericRowProps, next: GenericRowProps) =>
+ prev.row.original === next.row.original && prev.selected === next.selected,
+ );
-export const SkeletonRows = memo(
+export const SkeletonRows: React.MemoExoticComponent<
+ <TData extends Record<string, unknown>, TValue>({
+ count,
+ columns,
+ }: {
+ count?: number;
+ columns: TableColumn<TData, TValue>[];
+ }) => JSX.Element
+> = memo(
<TData extends Record<string, unknown>, TValue>({
count = 10,
columns,
}: {
count?: number;
columns: TableColumn<TData, TValue>[];
- }) => (
+ }): JSX.Element => (
<>
{Array.from({ length: count }, (_, index) => (
<TableRow key={`skeleton-${index}`} className="h-[56px] border-b border-border-light">
diff --git a/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx b/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
index aa6dd2294f..6d47cdafc5 100644
--- a/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
+++ b/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
@@ -1,8 +1,9 @@
import { Component, ErrorInfo, ReactNode, createRef } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { RefreshCw } from 'lucide-react';
+import { useLocalize } from '~/hooks';
import { Button } from '../Button';
import { logger } from '~/utils';
-import { useLocalize } from '~/hooks';
/**
* Error boundary specifically for DataTable component.
@@ -114,7 +115,7 @@ class DataTableErrorBoundaryInner extends Component<
}
}
-export function DataTableErrorBoundary(props: DataTableErrorBoundaryProps) {
+export function DataTableErrorBoundary(props: DataTableErrorBoundaryProps): JSX.Element {
const localize = useLocalize();
return <DataTableErrorBoundaryInner {...props} localize={localize} />;
}
diff --git a/packages/client/src/components/DataTable/DataTableSearch.tsx b/packages/client/src/components/DataTable/DataTableSearch.tsx
index 30ced61cbe..f269d0a154 100644
--- a/packages/client/src/components/DataTable/DataTableSearch.tsx
+++ b/packages/client/src/components/DataTable/DataTableSearch.tsx
@@ -1,12 +1,21 @@
-import { memo } from 'react';
import { startTransition } from 'react';
+import { memo, MemoExoticComponent } from 'react';
+import { JSX } from 'react/jsx-runtime';
import type { DataTableSearchProps } from './DataTable.types';
import { useLocalize } from '~/hooks';
import { Input } from '../Input';
import { cn } from '~/utils';
-export const DataTableSearch = memo(
- ({ value, onChange, placeholder, className, disabled = false }: DataTableSearchProps) => {
+export const DataTableSearch: MemoExoticComponent<
+ ({ value, onChange, placeholder, className, disabled }: DataTableSearchProps) => JSX.Element
+> = memo(
+ ({
+ value,
+ onChange,
+ placeholder,
+ className,
+ disabled = false,
+ }: DataTableSearchProps): JSX.Element => {
const localize = useLocalize();
return (
diff --git a/packages/client/src/components/DelayedRender.tsx b/packages/client/src/components/DelayedRender.tsx
index 0899d1dd32..e15a71f8df 100644
--- a/packages/client/src/components/DelayedRender.tsx
+++ b/packages/client/src/components/DelayedRender.tsx
@@ -6,7 +6,7 @@ interface DelayedRenderProps {
children: React.ReactNode;
}
-const DelayedRender = ({ delay, children }: DelayedRenderProps) =>
+const DelayedRender = ({ delay, children }: DelayedRenderProps): React.ReactNode =>
useDelayedRender(delay)(() => children);
export default DelayedRender;
diff --git a/packages/client/src/components/Dialog.tsx b/packages/client/src/components/Dialog.tsx
index 572faf9100..c5b97cc2e6 100644
--- a/packages/client/src/components/Dialog.tsx
+++ b/packages/client/src/components/Dialog.tsx
@@ -1,13 +1,16 @@
import * as React from 'react';
+import { X } from 'lucide-react';
+import { JSX } from 'react/jsx-runtime';
import * as DialogPrimitive from '@radix-ui/react-dialog';
+import { Button, ButtonProps } from './Button';
import { useMediaQuery } from '~/hooks';
-import { Button } from './Button';
-import { X } from 'lucide-react';
import { cn } from '~/utils';
-const Dialog = DialogPrimitive.Root;
+const Dialog: React.FC<DialogPrimitive.DialogProps> = DialogPrimitive.Root;
-const DialogTrigger = DialogPrimitive.Trigger;
+const DialogTrigger: React.ForwardRefExoticComponent<
+ DialogPrimitive.DialogTriggerProps & React.RefAttributes<HTMLButtonElement>
+> = DialogPrimitive.Trigger;
type DialogPortalProps = DialogPrimitive.DialogPortalProps & { className?: string };
@@ -40,10 +43,12 @@ type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.
disableScroll?: boolean;
};
-const DialogContent = React.forwardRef<
- React.ElementRef<typeof DialogPrimitive.Content>,
- DialogContentProps
->(
+const DialogContent: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> & {
+ showCloseButton?: boolean;
+ disableScroll?: boolean;
+ } & React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<React.ElementRef<typeof DialogPrimitive.Content>, DialogContentProps>(
(
{ className, children = true, showCloseButton = true, disableScroll = false, ...props },
ref,
@@ -79,7 +84,10 @@ const DialogContent = React.forwardRef<
);
DialogContent.displayName = DialogPrimitive.Content.displayName;
-const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+const DialogHeader: {
+ ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div
className={cn(
'flex flex-col space-y-2 border-b border-black/10 p-6 pb-4 text-left dark:border-white/10',
@@ -90,7 +98,10 @@ const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivEleme
);
DialogHeader.displayName = 'DialogHeader';
-const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+const DialogFooter: {
+ ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div
className={cn('flex flex-row justify-between space-x-2 px-6 py-4', className ?? '')}
{...props}
@@ -98,7 +109,10 @@ const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivEleme
);
DialogFooter.displayName = 'DialogFooter';
-const DialogTitle = React.forwardRef<
+const DialogTitle: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogTitleProps & React.RefAttributes<HTMLHeadingElement>, 'ref'> &
+ React.RefAttributes<HTMLHeadingElement>
+> = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
@@ -110,7 +124,10 @@ const DialogTitle = React.forwardRef<
));
DialogTitle.displayName = DialogPrimitive.Title.displayName;
-const DialogDescription = React.forwardRef<
+const DialogDescription: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogDescriptionProps & React.RefAttributes<HTMLParagraphElement>, 'ref'> &
+ React.RefAttributes<HTMLParagraphElement>
+> = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
@@ -122,7 +139,10 @@ const DialogDescription = React.forwardRef<
));
DialogDescription.displayName = DialogPrimitive.Description.displayName;
-const DialogClose = React.forwardRef<
+const DialogClose: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogCloseProps & React.RefAttributes<HTMLButtonElement>, 'ref'> &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Close>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Close>
>(({ className, ...props }, ref) => (
@@ -139,7 +159,10 @@ const DialogClose = React.forwardRef<
));
DialogClose.displayName = DialogPrimitive.Title.displayName;
-const DialogButton = React.forwardRef<
+const DialogButton: React.ForwardRefExoticComponent<
+ Omit<ButtonProps & React.RefAttributes<HTMLButtonElement>, 'ref'> &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof Button>,
React.ComponentPropsWithoutRef<typeof Button>
>(({ className, ...props }, ref) => (
diff --git a/packages/client/src/components/DialogTemplate.tsx b/packages/client/src/components/DialogTemplate.tsx
index d3ee806641..6a286cbdff 100644
--- a/packages/client/src/components/DialogTemplate.tsx
+++ b/packages/client/src/components/DialogTemplate.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, ReactNode, Ref } from 'react';
+import { forwardRef, ForwardRefExoticComponent, ReactNode, Ref, RefAttributes } from 'react';
import {
DialogClose,
DialogContent,
@@ -29,7 +29,9 @@ type DialogTemplateProps = {
showCancelButton?: boolean;
};
-const DialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDivElement>) => {
+const DialogTemplate: ForwardRefExoticComponent<
+ DialogTemplateProps & RefAttributes<HTMLDivElement>
+> = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDivElement>) => {
const {
title,
description,
diff --git a/packages/client/src/components/DropdownMenu.tsx b/packages/client/src/components/DropdownMenu.tsx
index 013301bc6a..a73fe6e7c1 100644
--- a/packages/client/src/components/DropdownMenu.tsx
+++ b/packages/client/src/components/DropdownMenu.tsx
@@ -1,21 +1,24 @@
import * as React from 'react';
+import { JSX } from 'react/jsx-runtime';
import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react';
import { cn } from '~/utils';
-function DropdownMenu({ ...props }: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
+function DropdownMenu({
+ ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>): JSX.Element {
return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
}
function DropdownMenuPortal({
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>): JSX.Element {
return <DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />;
}
function DropdownMenuTrigger({
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>): JSX.Element {
return <DropdownMenuPrimitive.Trigger data-slot="dropdown-menu-trigger" {...props} />;
}
@@ -23,7 +26,7 @@ function DropdownMenuContent({
className,
sideOffset = 4,
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>): JSX.Element {
return (
<DropdownMenuPrimitive.Portal>
<DropdownMenuPrimitive.Content
@@ -39,7 +42,9 @@ function DropdownMenuContent({
);
}
-function DropdownMenuGroup({ ...props }: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
+function DropdownMenuGroup({
+ ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>): JSX.Element {
return <DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />;
}
@@ -51,7 +56,7 @@ function DropdownMenuItem({
}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
inset?: boolean;
variant?: 'default' | 'destructive';
-}) {
+}): JSX.Element {
return (
<DropdownMenuPrimitive.Item
data-slot="dropdown-menu-item"
@@ -71,7 +76,7 @@ function DropdownMenuCheckboxItem({
children,
checked,
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>): JSX.Element {
return (
<DropdownMenuPrimitive.CheckboxItem
data-slot="dropdown-menu-checkbox-item"
@@ -94,7 +99,7 @@ function DropdownMenuCheckboxItem({
function DropdownMenuRadioGroup({
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>): JSX.Element {
return <DropdownMenuPrimitive.RadioGroup data-slot="dropdown-menu-radio-group" {...props} />;
}
@@ -102,7 +107,7 @@ function DropdownMenuRadioItem({
className,
children,
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>): JSX.Element {
return (
<DropdownMenuPrimitive.RadioItem
data-slot="dropdown-menu-radio-item"
@@ -128,7 +133,7 @@ function DropdownMenuLabel({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
inset?: boolean;
-}) {
+}): JSX.Element {
return (
<DropdownMenuPrimitive.Label
data-slot="dropdown-menu-label"
@@ -142,7 +147,7 @@ function DropdownMenuLabel({
function DropdownMenuSeparator({
className,
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>): JSX.Element {
return (
<DropdownMenuPrimitive.Separator
data-slot="dropdown-menu-separator"
@@ -152,7 +157,7 @@ function DropdownMenuSeparator({
);
}
-function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<'span'>) {
+function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<'span'>): JSX.Element {
return (
<span
data-slot="dropdown-menu-shortcut"
@@ -162,7 +167,9 @@ function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<'spa
);
}
-function DropdownMenuSub({ ...props }: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
+function DropdownMenuSub({
+ ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>): JSX.Element {
return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
}
@@ -173,7 +180,7 @@ function DropdownMenuSubTrigger({
...props
}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
inset?: boolean;
-}) {
+}): JSX.Element {
return (
<DropdownMenuPrimitive.SubTrigger
data-slot="dropdown-menu-sub-trigger"
@@ -193,7 +200,7 @@ function DropdownMenuSubTrigger({
function DropdownMenuSubContent({
className,
...props
-}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>): JSX.Element {
return (
<DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content"
diff --git a/packages/client/src/components/FileUpload.tsx b/packages/client/src/components/FileUpload.tsx
index 3481a36e8e..c0cec6b032 100644
--- a/packages/client/src/components/FileUpload.tsx
+++ b/packages/client/src/components/FileUpload.tsx
@@ -7,22 +7,22 @@ type FileUploadProps = {
handleFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
};
-const FileUpload = forwardRef<HTMLInputElement, FileUploadProps>(
- ({ children, handleFileChange }, ref) => {
- return (
- <>
- {children}
- <input
- ref={ref}
- multiple
- type="file"
- style={{ display: 'none' }}
- onChange={handleFileChange}
- />
- </>
- );
- },
-);
+const FileUpload: React.ForwardRefExoticComponent<
+ FileUploadProps & React.RefAttributes<HTMLInputElement>
+> = forwardRef<HTMLInputElement, FileUploadProps>(({ children, handleFileChange }, ref) => {
+ return (
+ <>
+ {children}
+ <input
+ ref={ref}
+ multiple
+ type="file"
+ style={{ display: 'none' }}
+ onChange={handleFileChange}
+ />
+ </>
+ );
+});
FileUpload.displayName = 'FileUpload';
diff --git a/packages/client/src/components/FilterInput.tsx b/packages/client/src/components/FilterInput.tsx
index 04f5fe33a1..273894e68d 100644
--- a/packages/client/src/components/FilterInput.tsx
+++ b/packages/client/src/components/FilterInput.tsx
@@ -23,7 +23,9 @@ export interface FilterInputProps
* onChange={(e) => setSearchQuery(e.target.value)}
* />
*/
-const FilterInput = React.forwardRef<HTMLInputElement, FilterInputProps>(
+const FilterInput: React.ForwardRefExoticComponent<
+ FilterInputProps & React.RefAttributes<HTMLInputElement>
+> = React.forwardRef<HTMLInputElement, FilterInputProps>(
({ className, label, inputId, containerClassName, ...props }, ref) => {
return (
<div className={cn('relative', containerClassName)}>
diff --git a/packages/client/src/components/FormInput.tsx b/packages/client/src/components/FormInput.tsx
index 2d6c55e348..c1dc0f3982 100644
--- a/packages/client/src/components/FormInput.tsx
+++ b/packages/client/src/components/FormInput.tsx
@@ -1,4 +1,5 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
import type { ControllerRenderProps, FieldValues, FieldPath } from 'react-hook-form';
import { Label } from './Label';
import { Input } from './Input';
@@ -25,7 +26,7 @@ export default function FormInput<
containerClass?: string;
type?: 'string' | 'number';
labelAdjacent?: React.ReactNode;
-}) {
+}): JSX.Element {
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value;
diff --git a/packages/client/src/components/HoverCard.tsx b/packages/client/src/components/HoverCard.tsx
index 5b64adbfa1..ba389711cd 100644
--- a/packages/client/src/components/HoverCard.tsx
+++ b/packages/client/src/components/HoverCard.tsx
@@ -2,13 +2,20 @@ import * as React from 'react';
import * as HoverCardPrimitive from '@radix-ui/react-hover-card';
import { cn } from '~/utils';
-const HoverCard = HoverCardPrimitive.Root;
+const HoverCard: React.FC<HoverCardPrimitive.HoverCardProps> = HoverCardPrimitive.Root;
-const HoverCardTrigger = HoverCardPrimitive.Trigger;
+const HoverCardTrigger: React.ForwardRefExoticComponent<
+ HoverCardPrimitive.HoverCardTriggerProps & React.RefAttributes<HTMLAnchorElement>
+> = HoverCardPrimitive.Trigger;
-const HoverCardPortal = HoverCardPrimitive.Portal;
+const HoverCardPortal: React.FC<HoverCardPrimitive.HoverCardPortalProps> =
+ HoverCardPrimitive.Portal;
-const HoverCardContent = React.forwardRef<
+const HoverCardContent: React.ForwardRefExoticComponent<
+ Omit<HoverCardPrimitive.HoverCardContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> & {
+ disabled?: boolean;
+ } & React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof HoverCardPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content> & { disabled?: boolean }
>(({ className = '', align = 'center', sideOffset = 6, disabled = false, ...props }, ref) => {
diff --git a/packages/client/src/components/InfoHoverCard.tsx b/packages/client/src/components/InfoHoverCard.tsx
index 5b56beb5f2..a87f52d323 100644
--- a/packages/client/src/components/InfoHoverCard.tsx
+++ b/packages/client/src/components/InfoHoverCard.tsx
@@ -1,4 +1,5 @@
import { useState } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { CircleHelpIcon } from 'lucide-react';
import { HoverCard, HoverCardTrigger, HoverCardPortal, HoverCardContent } from './HoverCard';
import { ESide } from '~/common';
@@ -8,7 +9,7 @@ type InfoHoverCardProps = {
text: string;
};
-const InfoHoverCard = ({ side, text }: InfoHoverCardProps) => {
+const InfoHoverCard = ({ side, text }: InfoHoverCardProps): JSX.Element => {
const [isOpen, setIsOpen] = useState(false);
return (
diff --git a/packages/client/src/components/Input.tsx b/packages/client/src/components/Input.tsx
index 7b4fa5c946..6f502e08aa 100644
--- a/packages/client/src/components/Input.tsx
+++ b/packages/client/src/components/Input.tsx
@@ -3,18 +3,19 @@ import { cn } from '~/utils';
export type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
-const Input = React.forwardRef<HTMLInputElement, InputProps>(({ className, ...props }, ref) => {
- return (
- <input
- className={cn(
- 'flex h-10 w-full rounded-lg border border-border-light bg-transparent px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
- className ?? '',
- )}
- ref={ref}
- {...props}
- />
- );
-});
+const Input: React.ForwardRefExoticComponent<InputProps & React.RefAttributes<HTMLInputElement>> =
+ React.forwardRef<HTMLInputElement, InputProps>(({ className, ...props }, ref) => {
+ return (
+ <input
+ className={cn(
+ 'flex h-10 w-full rounded-lg border border-border-light bg-transparent px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+ className ?? '',
+ )}
+ ref={ref}
+ {...props}
+ />
+ );
+ });
Input.displayName = 'Input';
diff --git a/packages/client/src/components/InputNumber.tsx b/packages/client/src/components/InputNumber.tsx
index 7f32a298ec..0102eb4d42 100644
--- a/packages/client/src/components/InputNumber.tsx
+++ b/packages/client/src/components/InputNumber.tsx
@@ -5,26 +5,28 @@ import * as React from 'react';
import RCInputNumber from 'rc-input-number';
import * as InputNumberPrimitive from 'rc-input-number';
import { cn } from '~/utils';
+import { ValueType } from '@rc-component/mini-decimal';
// TODO help needed
// React.ElementRef<typeof LabelPrimitive.Root>,
// React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
-const InputNumber = React.forwardRef<
- React.ElementRef<typeof RCInputNumber>,
- InputNumberPrimitive.InputNumberProps
->(({ className, ...props }, ref) => {
- return (
- <RCInputNumber
- className={cn(
- 'flex max-h-5 w-full rounded-md border border-gray-300 bg-transparent px-3 py-2 text-sm placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-50',
- className ?? '',
- )}
- ref={ref}
- {...props}
- />
- );
-});
+const InputNumber: React.ForwardRefExoticComponent<
+ InputNumberPrimitive.InputNumberProps<ValueType> & React.RefAttributes<HTMLInputElement>
+> = React.forwardRef<React.ElementRef<typeof RCInputNumber>, InputNumberPrimitive.InputNumberProps>(
+ ({ className, ...props }, ref) => {
+ return (
+ <RCInputNumber
+ className={cn(
+ 'flex max-h-5 w-full rounded-md border border-gray-300 bg-transparent px-3 py-2 text-sm placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-50',
+ className ?? '',
+ )}
+ ref={ref}
+ {...props}
+ />
+ );
+ },
+);
InputNumber.displayName = 'Input';
// console.log(_InputNumber);
diff --git a/packages/client/src/components/InputOTP.tsx b/packages/client/src/components/InputOTP.tsx
index 32b8ba08f4..59e6454ac3 100644
--- a/packages/client/src/components/InputOTP.tsx
+++ b/packages/client/src/components/InputOTP.tsx
@@ -1,9 +1,69 @@
import * as React from 'react';
-import { OTPInput, OTPInputContext } from 'input-otp';
import { Minus } from 'lucide-react';
+import { OTPInput, OTPInputContext, RenderProps } from 'input-otp';
import { cn } from '~/utils';
-const InputOTP = React.forwardRef<
+const InputOTP: React.ForwardRefExoticComponent<
+ (
+ | Omit<
+ Omit<
+ React.InputHTMLAttributes<HTMLInputElement>,
+ | 'value'
+ | 'onChange'
+ | 'maxLength'
+ | 'containerClassName'
+ | 'textAlign'
+ | 'onComplete'
+ | 'pushPasswordManagerStrategy'
+ | 'pasteTransformer'
+ | 'noScriptCSSFallback'
+ > & {
+ value?: string;
+ onChange?: (newValue: string) => unknown;
+ maxLength: number;
+ textAlign?: 'left' | 'center' | 'right';
+ onComplete?: (...args: unknown[]) => unknown;
+ pushPasswordManagerStrategy?: 'increase-width' | 'none';
+ pasteTransformer?: (pasted: string) => string;
+ containerClassName?: string;
+ noScriptCSSFallback?: string | null;
+ } & {
+ render: (props: RenderProps) => React.ReactNode;
+ children?: never;
+ } & React.RefAttributes<HTMLInputElement>,
+ 'ref'
+ >
+ | Omit<
+ Omit<
+ React.InputHTMLAttributes<HTMLInputElement>,
+ | 'value'
+ | 'onChange'
+ | 'maxLength'
+ | 'containerClassName'
+ | 'textAlign'
+ | 'onComplete'
+ | 'pushPasswordManagerStrategy'
+ | 'pasteTransformer'
+ | 'noScriptCSSFallback'
+ > & {
+ value?: string;
+ onChange?: (newValue: string) => unknown;
+ maxLength: number;
+ textAlign?: 'left' | 'center' | 'right';
+ onComplete?: (...args: unknown[]) => unknown;
+ pushPasswordManagerStrategy?: 'increase-width' | 'none';
+ pasteTransformer?: (pasted: string) => string;
+ containerClassName?: string;
+ noScriptCSSFallback?: string | null;
+ } & {
+ render?: never;
+ children: React.ReactNode;
+ } & React.RefAttributes<HTMLInputElement>,
+ 'ref'
+ >
+ ) &
+ React.RefAttributes<HTMLInputElement>
+> = React.forwardRef<
React.ElementRef<typeof OTPInput>,
React.ComponentPropsWithoutRef<typeof OTPInput>
>(({ className, containerClassName, ...props }, ref) => (
@@ -19,15 +79,21 @@ const InputOTP = React.forwardRef<
));
InputOTP.displayName = 'InputOTP';
-const InputOTPGroup = React.forwardRef<
- React.ElementRef<'div'>,
- React.ComponentPropsWithoutRef<'div'>
->(({ className, ...props }, ref) => (
- <div ref={ref} className={cn('flex items-center', className)} {...props} />
-));
+const InputOTPGroup: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<React.ElementRef<'div'>, React.ComponentPropsWithoutRef<'div'>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn('flex items-center', className)} {...props} />
+ ),
+);
InputOTPGroup.displayName = 'InputOTPGroup';
-const InputOTPSlot = React.forwardRef<
+const InputOTPSlot: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'ref'> & {
+ index: number;
+ } & React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<'div'>,
React.ComponentPropsWithoutRef<'div'> & { index: number }
>(({ index, className, ...props }, ref) => {
@@ -60,14 +126,16 @@ const InputOTPSlot = React.forwardRef<
});
InputOTPSlot.displayName = 'InputOTPSlot';
-const InputOTPSeparator = React.forwardRef<
- React.ElementRef<'div'>,
- React.ComponentPropsWithoutRef<'div'>
->(({ ...props }, ref) => (
- <div ref={ref} role="separator" {...props}>
- <Minus />
- </div>
-));
+const InputOTPSeparator: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<React.ElementRef<'div'>, React.ComponentPropsWithoutRef<'div'>>(
+ ({ ...props }, ref) => (
+ <div ref={ref} role="separator" {...props}>
+ <Minus />
+ </div>
+ ),
+);
InputOTPSeparator.displayName = 'InputOTPSeparator';
export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator };
diff --git a/packages/client/src/components/InputWithDropDown.tsx b/packages/client/src/components/InputWithDropDown.tsx
index da7829a11a..0af4de8721 100644
--- a/packages/client/src/components/InputWithDropDown.tsx
+++ b/packages/client/src/components/InputWithDropDown.tsx
@@ -7,7 +7,12 @@ export type InputWithDropdownProps = React.InputHTMLAttributes<HTMLInputElement>
onSelect?: (value: string) => void;
};
-const InputWithDropdown = React.forwardRef<HTMLInputElement, InputWithDropdownProps>(
+const InputWithDropdown: React.ForwardRefExoticComponent<
+ React.InputHTMLAttributes<HTMLInputElement> & {
+ options: string[];
+ onSelect?: (value: string) => void;
+ } & React.RefAttributes<HTMLInputElement>
+> = React.forwardRef<HTMLInputElement, InputWithDropdownProps>(
({ className, options, onSelect, ...props }, ref) => {
const [isOpen, setIsOpen] = React.useState(false);
const [inputValue, setInputValue] = React.useState((props.value as string) || '');
diff --git a/packages/client/src/components/Label.tsx b/packages/client/src/components/Label.tsx
index d250e47e3f..ef15f3051c 100644
--- a/packages/client/src/components/Label.tsx
+++ b/packages/client/src/components/Label.tsx
@@ -2,7 +2,11 @@ import * as React from 'react';
import * as LabelPrimitive from '@radix-ui/react-label';
import { cn } from '~/utils';
-const Label = React.forwardRef<
+const Label: React.ForwardRefExoticComponent<
+ Omit<LabelPrimitive.LabelProps & React.RefAttributes<HTMLLabelElement>, 'ref'> & {
+ className?: string;
+ } & React.RefAttributes<HTMLLabelElement>
+> = React.forwardRef<
React.ElementRef<typeof LabelPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & {
className?: string;
diff --git a/packages/client/src/components/MultiSearch.tsx b/packages/client/src/components/MultiSearch.tsx
index 56d1843e71..d0b9e8b26b 100644
--- a/packages/client/src/components/MultiSearch.tsx
+++ b/packages/client/src/components/MultiSearch.tsx
@@ -1,5 +1,6 @@
-import { Search, X } from 'lucide-react';
import React, { useState, useMemo, useCallback, useRef } from 'react';
+import { JSX } from 'react/jsx-runtime';
+import { Search, X } from 'lucide-react';
import { cn } from '~/utils';
/** This is a generic that can be added to Menu and Select components */
@@ -13,7 +14,7 @@ export default function MultiSearch({
onChange: (filter: string) => void;
placeholder?: string;
className?: string;
-}) {
+}): JSX.Element {
const inputRef = useRef<HTMLInputElement>(null);
const onChangeHandler: React.ChangeEventHandler<HTMLInputElement> = useCallback(
diff --git a/packages/client/src/components/MultiSelect.tsx b/packages/client/src/components/MultiSelect.tsx
index bb48841468..5275cb572d 100644
--- a/packages/client/src/components/MultiSelect.tsx
+++ b/packages/client/src/components/MultiSelect.tsx
@@ -9,6 +9,7 @@ import {
SelectProvider,
} from '@ariakit/react';
import './AnimatePopover.css';
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
type MultiSelectItem<T extends string> = T | { label: string; value: T };
@@ -84,7 +85,7 @@ export default function MultiSelect<T extends string>({
selectedValues = [],
setSelectedValues,
renderItemContent,
-}: MultiSelectProps<T>) {
+}: MultiSelectProps<T>): JSX.Element {
const selectRef = useRef<HTMLButtonElement>(null);
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
diff --git a/packages/client/src/components/OGDialogTemplate.tsx b/packages/client/src/components/OGDialogTemplate.tsx
index 2414915a4b..5fd9a581fe 100644
--- a/packages/client/src/components/OGDialogTemplate.tsx
+++ b/packages/client/src/components/OGDialogTemplate.tsx
@@ -1,4 +1,11 @@
-import { forwardRef, isValidElement, ReactNode, Ref } from 'react';
+import {
+ forwardRef,
+ ForwardRefExoticComponent,
+ isValidElement,
+ ReactNode,
+ Ref,
+ RefAttributes,
+} from 'react';
import {
OGDialogTitle,
OGDialogClose,
@@ -62,7 +69,9 @@ type DialogTemplateProps = {
onClose?: () => void;
};
-const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDivElement>) => {
+const OGDialogTemplate: ForwardRefExoticComponent<
+ DialogTemplateProps & RefAttributes<HTMLDivElement>
+> = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDivElement>) => {
const localize = useLocalize();
const {
title,
diff --git a/packages/client/src/components/OriginalDialog.tsx b/packages/client/src/components/OriginalDialog.tsx
index e870cbc8c0..70a19e3433 100644
--- a/packages/client/src/components/OriginalDialog.tsx
+++ b/packages/client/src/components/OriginalDialog.tsx
@@ -1,6 +1,7 @@
import * as React from 'react';
-import * as DialogPrimitive from '@radix-ui/react-dialog';
import { X } from 'lucide-react';
+import { JSX } from 'react/jsx-runtime';
+import * as DialogPrimitive from '@radix-ui/react-dialog';
import { cn } from '~/utils';
const DialogDepthContext = React.createContext(0);
@@ -10,47 +11,55 @@ interface OGDialogProps extends DialogPrimitive.DialogProps {
triggerRefs?: React.RefObject<HTMLButtonElement | HTMLInputElement | HTMLDivElement | null>[];
}
-const Dialog = React.forwardRef<HTMLDivElement, OGDialogProps>(
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- ({ children, triggerRef, triggerRefs, onOpenChange, ...props }, ref) => {
- const parentDepth = React.useContext(DialogDepthContext);
- const currentDepth = parentDepth + 1;
-
- const handleOpenChange = (open: boolean) => {
- if (!open && triggerRef?.current) {
- setTimeout(() => {
- triggerRef.current?.focus();
- }, 0);
- }
- if (triggerRefs?.length) {
- triggerRefs.forEach((ref) => {
- if (ref?.current) {
- setTimeout(() => {
- ref.current?.focus();
- }, 0);
- }
- });
- }
- onOpenChange?.(open);
- };
-
- return (
- <DialogDepthContext.Provider value={currentDepth}>
- <DialogPrimitive.Root {...props} onOpenChange={handleOpenChange}>
- {children}
- </DialogPrimitive.Root>
- </DialogDepthContext.Provider>
- );
- },
-);
+const Dialog: React.ForwardRefExoticComponent<OGDialogProps & React.RefAttributes<HTMLDivElement>> =
+ React.forwardRef<HTMLDivElement, OGDialogProps>(
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ ({ children, triggerRef, triggerRefs, onOpenChange, ...props }, ref) => {
+ const parentDepth = React.useContext(DialogDepthContext);
+ const currentDepth = parentDepth + 1;
+
+ const handleOpenChange = (open: boolean) => {
+ if (!open && triggerRef?.current) {
+ setTimeout(() => {
+ triggerRef.current?.focus();
+ }, 0);
+ }
+ if (triggerRefs?.length) {
+ triggerRefs.forEach((ref) => {
+ if (ref?.current) {
+ setTimeout(() => {
+ ref.current?.focus();
+ }, 0);
+ }
+ });
+ }
+ onOpenChange?.(open);
+ };
+
+ return (
+ <DialogDepthContext.Provider value={currentDepth}>
+ <DialogPrimitive.Root {...props} onOpenChange={handleOpenChange}>
+ {children}
+ </DialogPrimitive.Root>
+ </DialogDepthContext.Provider>
+ );
+ },
+ );
-const DialogTrigger = DialogPrimitive.Trigger;
+const DialogTrigger: React.ForwardRefExoticComponent<
+ DialogPrimitive.DialogTriggerProps & React.RefAttributes<HTMLButtonElement>
+> = DialogPrimitive.Trigger;
-const DialogPortal = DialogPrimitive.Portal;
+const DialogPortal: React.FC<DialogPrimitive.DialogPortalProps> = DialogPrimitive.Portal;
-const DialogClose = DialogPrimitive.Close;
+const DialogClose: React.ForwardRefExoticComponent<
+ DialogPrimitive.DialogCloseProps & React.RefAttributes<HTMLButtonElement>
+> = DialogPrimitive.Close;
-export const DialogOverlay = React.forwardRef<
+export const DialogOverlay: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogOverlayProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Overlay>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
>(({ className, style, ...props }, ref) => {
@@ -77,10 +86,13 @@ type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.
overlayClassName?: string;
};
-const DialogContent = React.forwardRef<
- React.ElementRef<typeof DialogPrimitive.Content>,
- DialogContentProps
->(
+const DialogContent: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> & {
+ showCloseButton?: boolean;
+ disableScroll?: boolean;
+ overlayClassName?: string;
+ } & React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<React.ElementRef<typeof DialogPrimitive.Content>, DialogContentProps>(
(
{
className,
@@ -161,12 +173,18 @@ const DialogContent = React.forwardRef<
);
DialogContent.displayName = DialogPrimitive.Content.displayName;
-const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+const DialogHeader: {
+ ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div className={cn('flex flex-col space-y-1.5 text-center sm:text-left', className)} {...props} />
);
DialogHeader.displayName = 'DialogHeader';
-const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+const DialogFooter: {
+ ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div
className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}
{...props}
@@ -174,7 +192,10 @@ const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivEleme
);
DialogFooter.displayName = 'DialogFooter';
-const DialogTitle = React.forwardRef<
+const DialogTitle: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogTitleProps & React.RefAttributes<HTMLHeadingElement>, 'ref'> &
+ React.RefAttributes<HTMLHeadingElement>
+> = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
@@ -186,7 +207,10 @@ const DialogTitle = React.forwardRef<
));
DialogTitle.displayName = DialogPrimitive.Title.displayName;
-const DialogDescription = React.forwardRef<
+const DialogDescription: React.ForwardRefExoticComponent<
+ Omit<DialogPrimitive.DialogDescriptionProps & React.RefAttributes<HTMLParagraphElement>, 'ref'> &
+ React.RefAttributes<HTMLParagraphElement>
+> = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
diff --git a/packages/client/src/components/Pagination.tsx b/packages/client/src/components/Pagination.tsx
index 815befaccc..259cc5bbec 100644
--- a/packages/client/src/components/Pagination.tsx
+++ b/packages/client/src/components/Pagination.tsx
@@ -1,9 +1,13 @@
import * as React from 'react';
+import { JSX } from 'react/jsx-runtime';
import { ChevronLeft, ChevronRight, MoreHorizontal } from 'lucide-react';
import { ButtonProps, buttonVariants } from './Button';
import { cn } from '~/utils';
-const Pagination = ({ className, ...props }: React.ComponentProps<'nav'>) => (
+const Pagination: {
+ ({ className, ...props }: React.ComponentProps<'nav'>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.ComponentProps<'nav'>): JSX.Element => (
<nav
role="navigation"
aria-label="pagination"
@@ -13,16 +17,22 @@ const Pagination = ({ className, ...props }: React.ComponentProps<'nav'>) => (
);
Pagination.displayName = 'Pagination';
-const PaginationContent = React.forwardRef<HTMLUListElement, React.ComponentProps<'ul'>>(
+const PaginationContent: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLUListElement>, HTMLUListElement>, 'ref'> &
+ React.RefAttributes<HTMLUListElement>
+> = React.forwardRef<HTMLUListElement, React.ComponentProps<'ul'>>(
({ className, ...props }, ref) => (
<ul ref={ref} className={cn('flex flex-row items-center gap-1', className)} {...props} />
),
);
PaginationContent.displayName = 'PaginationContent';
-const PaginationItem = React.forwardRef<HTMLLIElement, React.ComponentProps<'li'>>(
- ({ className, ...props }, ref) => <li ref={ref} className={cn('', className)} {...props} />,
-);
+const PaginationItem: React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, 'ref'> &
+ React.RefAttributes<HTMLLIElement>
+> = React.forwardRef<HTMLLIElement, React.ComponentProps<'li'>>(({ className, ...props }, ref) => (
+ <li ref={ref} className={cn('', className)} {...props} />
+));
PaginationItem.displayName = 'PaginationItem';
type PaginationLinkProps = {
@@ -30,13 +40,16 @@ type PaginationLinkProps = {
} & Pick<ButtonProps, 'size'> &
React.ComponentProps<'a'>;
-const PaginationLink = ({
+const PaginationLink: {
+ ({ className, isActive, size, children, ...props }: PaginationLinkProps): JSX.Element;
+ displayName: string;
+} = ({
className,
isActive = false,
size = 'icon',
children,
...props
-}: PaginationLinkProps) => (
+}: PaginationLinkProps): JSX.Element => (
<a
aria-current={isActive ? 'page' : undefined}
className={cn(
@@ -53,10 +66,10 @@ const PaginationLink = ({
);
PaginationLink.displayName = 'PaginationLink';
-const PaginationPrevious = ({
- className,
- ...props
-}: React.ComponentProps<typeof PaginationLink>) => (
+const PaginationPrevious: {
+ ({ className, ...props }: React.ComponentProps<typeof PaginationLink>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>): JSX.Element => (
<PaginationLink
aria-label="Go to previous page"
size="default"
@@ -69,7 +82,10 @@ const PaginationPrevious = ({
);
PaginationPrevious.displayName = 'PaginationPrevious';
-const PaginationNext = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>) => (
+const PaginationNext: {
+ ({ className, ...props }: React.ComponentProps<typeof PaginationLink>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>): JSX.Element => (
<PaginationLink
aria-label="Go to next page"
size="default"
@@ -82,7 +98,10 @@ const PaginationNext = ({ className, ...props }: React.ComponentProps<typeof Pag
);
PaginationNext.displayName = 'PaginationNext';
-const PaginationEllipsis = ({ className, ...props }: React.ComponentProps<'span'>) => (
+const PaginationEllipsis: {
+ ({ className, ...props }: React.ComponentProps<'span'>): JSX.Element;
+ displayName: string;
+} = ({ className, ...props }: React.ComponentProps<'span'>): JSX.Element => (
<span
aria-hidden
className={cn('flex h-9 w-9 items-center justify-center', className)}
diff --git a/packages/client/src/components/PixelCard.tsx b/packages/client/src/components/PixelCard.tsx
index c1f3d8971a..904e2fc05b 100644
--- a/packages/client/src/components/PixelCard.tsx
+++ b/packages/client/src/components/PixelCard.tsx
@@ -1,4 +1,5 @@
import { useEffect, useRef, useCallback } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
class Pixel {
@@ -169,7 +170,7 @@ export default function PixelCard({
randomness = 0.3,
width,
height,
-}: PixelCardProps) {
+}: PixelCardProps): JSX.Element {
const containerRef = useRef<HTMLDivElement>(null);
const canvasRef = useRef<HTMLCanvasElement>(null);
const pixelsRef = useRef<Pixel[]>([]);
diff --git a/packages/client/src/components/Progress.tsx b/packages/client/src/components/Progress.tsx
index e8e0b0f6b2..64c45d45e1 100644
--- a/packages/client/src/components/Progress.tsx
+++ b/packages/client/src/components/Progress.tsx
@@ -2,7 +2,10 @@ import * as React from 'react';
import * as ProgressPrimitive from '@radix-ui/react-progress';
import { cn } from '~/utils';
-const Progress = React.forwardRef<
+const Progress: React.ForwardRefExoticComponent<
+ Omit<ProgressPrimitive.ProgressProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof ProgressPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
>(({ className, value, ...props }, ref) => (
diff --git a/packages/client/src/components/QuestionMark.tsx b/packages/client/src/components/QuestionMark.tsx
index f018226f19..b01bb0d791 100644
--- a/packages/client/src/components/QuestionMark.tsx
+++ b/packages/client/src/components/QuestionMark.tsx
@@ -1,6 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export const QuestionMark = ({ className = '' }) => {
+export const QuestionMark = ({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element => {
return (
<span>
<div
diff --git a/packages/client/src/components/Radio.tsx b/packages/client/src/components/Radio.tsx
index 6f1a473617..0115c6b9d5 100644
--- a/packages/client/src/components/Radio.tsx
+++ b/packages/client/src/components/Radio.tsx
@@ -18,7 +18,7 @@ interface RadioProps {
'aria-labelledby'?: string;
}
-const Radio = memo(function Radio({
+const Radio: React.NamedExoticComponent<RadioProps> = memo(function Radio({
options,
value,
onChange,
diff --git a/packages/client/src/components/Resizable.tsx b/packages/client/src/components/Resizable.tsx
index 817f860313..cc6eea00bb 100644
--- a/packages/client/src/components/Resizable.tsx
+++ b/packages/client/src/components/Resizable.tsx
@@ -1,13 +1,17 @@
+import { JSX } from 'react/jsx-runtime';
import { GripVertical } from 'lucide-react';
import { Group, Panel, Separator } from 'react-resizable-panels';
import type { ComponentProps } from 'react';
import { cn } from '~/utils';
-const ResizablePanelGroup = ({ className = '', ...props }: ComponentProps<typeof Group>) => (
+const ResizablePanelGroup = ({
+ className = '',
+ ...props
+}: ComponentProps<typeof Group>): JSX.Element => (
<Group className={cn('h-full w-full', className)} {...props} />
);
-const ResizablePanel = Panel;
+const ResizablePanel: typeof Panel = Panel;
const ResizableHandle = ({
withHandle,
@@ -15,7 +19,7 @@ const ResizableHandle = ({
...props
}: ComponentProps<typeof Separator> & {
withHandle?: boolean;
-}) => (
+}): JSX.Element => (
<Separator
className={cn(
'relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1',
@@ -37,7 +41,7 @@ const ResizableHandleAlt = ({
...props
}: ComponentProps<typeof Separator> & {
withHandle?: boolean;
-}) => (
+}): JSX.Element => (
<Separator
className={cn(
'group relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1',
diff --git a/packages/client/src/components/SecretInput.tsx b/packages/client/src/components/SecretInput.tsx
index 33e018f1e9..57b718a9c4 100644
--- a/packages/client/src/components/SecretInput.tsx
+++ b/packages/client/src/components/SecretInput.tsx
@@ -19,7 +19,9 @@ export interface SecretInputProps
controlsOnHover?: boolean;
}
-const SecretInput = React.forwardRef<HTMLInputElement, SecretInputProps>(
+const SecretInput: React.ForwardRefExoticComponent<
+ SecretInputProps & React.RefAttributes<HTMLInputElement>
+> = React.forwardRef<HTMLInputElement, SecretInputProps>(
(
{
id,
diff --git a/packages/client/src/components/Select.tsx b/packages/client/src/components/Select.tsx
index 51671c0782..1cdc604e44 100644
--- a/packages/client/src/components/Select.tsx
+++ b/packages/client/src/components/Select.tsx
@@ -4,15 +4,22 @@ import { CaretSortIcon, CheckIcon, ChevronDownIcon, ChevronUpIcon } from '@radix
import { cn } from '~/utils';
// @ts-ignore - Radix UI type conflicts with React types
-const Select = SelectPrimitive.Root;
+const Select: React.FC<SelectPrimitive.SelectProps> = SelectPrimitive.Root;
// @ts-ignore - Radix UI type conflicts with React types
-const SelectGroup = SelectPrimitive.Group;
+const SelectGroup: React.ForwardRefExoticComponent<
+ SelectPrimitive.SelectGroupProps & React.RefAttributes<HTMLDivElement>
+> = SelectPrimitive.Group;
-const SelectValue = SelectPrimitive.Value;
+const SelectValue: React.ForwardRefExoticComponent<
+ SelectPrimitive.SelectValueProps & React.RefAttributes<HTMLSpanElement>
+> = SelectPrimitive.Value;
// @ts-ignore - Radix UI type conflicts with React types
-const SelectTrigger = React.forwardRef<
+const SelectTrigger: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectTriggerProps & React.RefAttributes<HTMLButtonElement>, 'ref'> &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
>(({ className = '', children, ...props }, ref) => (
@@ -33,7 +40,10 @@ const SelectTrigger = React.forwardRef<
));
SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
-const SelectScrollUpButton = React.forwardRef<
+const SelectScrollUpButton: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectScrollUpButtonProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
>(({ className = '', ...props }, ref) => (
@@ -50,7 +60,10 @@ const SelectScrollUpButton = React.forwardRef<
));
SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
-const SelectScrollDownButton = React.forwardRef<
+const SelectScrollDownButton: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectScrollDownButtonProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
>(({ className = '', ...props }, ref) => (
@@ -67,7 +80,10 @@ const SelectScrollDownButton = React.forwardRef<
));
SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
-const SelectContent = React.forwardRef<
+const SelectContent: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
>(({ className = '', children, position = 'popper', ...props }, ref) => (
@@ -101,7 +117,10 @@ const SelectContent = React.forwardRef<
));
SelectContent.displayName = SelectPrimitive.Content.displayName;
-const SelectLabel = React.forwardRef<
+const SelectLabel: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectLabelProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
>(({ className = '', ...props }, ref) => (
@@ -113,7 +132,10 @@ const SelectLabel = React.forwardRef<
));
SelectLabel.displayName = SelectPrimitive.Label.displayName;
-const SelectItem = React.forwardRef<
+const SelectItem: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectItemProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
>(({ className = '', children, ...props }, ref) => (
@@ -136,7 +158,10 @@ const SelectItem = React.forwardRef<
));
SelectItem.displayName = SelectPrimitive.Item.displayName;
-const SelectSeparator = React.forwardRef<
+const SelectSeparator: React.ForwardRefExoticComponent<
+ Omit<SelectPrimitive.SelectSeparatorProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
>(({ className = '', ...props }, ref) => (
diff --git a/packages/client/src/components/SelectDropDown.tsx b/packages/client/src/components/SelectDropDown.tsx
index e9a6027bc1..c73d8856f1 100644
--- a/packages/client/src/components/SelectDropDown.tsx
+++ b/packages/client/src/components/SelectDropDown.tsx
@@ -1,4 +1,5 @@
import React, { useRef } from 'react';
+import { JSX } from 'react/jsx-runtime';
import {
Label,
Listbox,
@@ -73,7 +74,7 @@ function SelectDropDown({
searchClassName,
searchPlaceholder,
showOptionIcon = false,
-}: SelectDropDownProps) {
+}: SelectDropDownProps): JSX.Element {
const transitionProps = { className: 'top-full mt-3' };
if (showAbove) {
transitionProps.className = 'bottom-full mb-3';
diff --git a/packages/client/src/components/Separator.tsx b/packages/client/src/components/Separator.tsx
index 7ba6d38096..e628114574 100644
--- a/packages/client/src/components/Separator.tsx
+++ b/packages/client/src/components/Separator.tsx
@@ -3,7 +3,11 @@ import * as SeparatorPrimitive from '@radix-ui/react-separator';
import { cn } from '~/utils';
-const Separator = React.forwardRef<
+const Separator: React.ForwardRefExoticComponent<
+ Omit<SeparatorPrimitive.SeparatorProps & React.RefAttributes<HTMLDivElement>, 'ref'> & {
+ className?: string;
+ } & React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof SeparatorPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root> & {
className?: string;
diff --git a/packages/client/src/components/Skeleton.tsx b/packages/client/src/components/Skeleton.tsx
index a903db77a0..90da649ae5 100644
--- a/packages/client/src/components/Skeleton.tsx
+++ b/packages/client/src/components/Skeleton.tsx
@@ -1,6 +1,7 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-function Skeleton({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+function Skeleton({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element {
return (
<div
className={cn(
diff --git a/packages/client/src/components/Slider.tsx b/packages/client/src/components/Slider.tsx
index 3845b8901f..4cf13a5f26 100644
--- a/packages/client/src/components/Slider.tsx
+++ b/packages/client/src/components/Slider.tsx
@@ -12,46 +12,47 @@ type SliderProps = React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> &
| { 'aria-label': string; 'aria-labelledby': string }
);
-const Slider = React.forwardRef<React.ElementRef<typeof SliderPrimitive.Root>, SliderProps>(
- (
- {
- className,
- onDoubleClick,
- 'aria-labelledby': ariaLabelledBy,
- 'aria-label': ariaLabel,
- 'aria-describedby': ariaDescribedBy,
- ...props
- },
- ref,
- ) => (
- <SliderPrimitive.Root
- ref={ref}
- {...props}
- {...{
- className: cn(
- 'relative flex w-full cursor-pointer touch-none select-none items-center',
- className,
- ),
+const Slider: React.ForwardRefExoticComponent<SliderProps & React.RefAttributes<HTMLSpanElement>> =
+ React.forwardRef<React.ElementRef<typeof SliderPrimitive.Root>, SliderProps>(
+ (
+ {
+ className,
onDoubleClick,
- }}
- >
- <SliderPrimitive.Track
- {...{ className: 'relative h-2 w-full grow overflow-hidden rounded-full bg-secondary' }}
- >
- <SliderPrimitive.Range {...{ className: 'absolute h-full bg-primary' }} />
- </SliderPrimitive.Track>
- <SliderPrimitive.Thumb
+ 'aria-labelledby': ariaLabelledBy,
+ 'aria-label': ariaLabel,
+ 'aria-describedby': ariaDescribedBy,
+ ...props
+ },
+ ref,
+ ) => (
+ <SliderPrimitive.Root
+ ref={ref}
+ {...props}
{...{
- className:
- 'block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
- 'aria-labelledby': ariaLabelledBy,
- 'aria-label': ariaLabel,
- 'aria-describedby': ariaDescribedBy,
+ className: cn(
+ 'relative flex w-full cursor-pointer touch-none select-none items-center',
+ className,
+ ),
+ onDoubleClick,
}}
- />
- </SliderPrimitive.Root>
- ),
-);
+ >
+ <SliderPrimitive.Track
+ {...{ className: 'relative h-2 w-full grow overflow-hidden rounded-full bg-secondary' }}
+ >
+ <SliderPrimitive.Range {...{ className: 'absolute h-full bg-primary' }} />
+ </SliderPrimitive.Track>
+ <SliderPrimitive.Thumb
+ {...{
+ className:
+ 'block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+ 'aria-labelledby': ariaLabelledBy,
+ 'aria-label': ariaLabel,
+ 'aria-describedby': ariaDescribedBy,
+ }}
+ />
+ </SliderPrimitive.Root>
+ ),
+ );
Slider.displayName = SliderPrimitive.Root.displayName;
export { Slider };
diff --git a/packages/client/src/components/Switch.tsx b/packages/client/src/components/Switch.tsx
index 42c8c561e7..66d1e1508c 100644
--- a/packages/client/src/components/Switch.tsx
+++ b/packages/client/src/components/Switch.tsx
@@ -17,7 +17,9 @@ type SwitchProps =
'aria-label'?: never;
});
-const Switch = React.forwardRef<React.ElementRef<typeof SwitchPrimitives.Root>, SwitchProps>(
+const Switch: React.ForwardRefExoticComponent<
+ SwitchProps & React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<React.ElementRef<typeof SwitchPrimitives.Root>, SwitchProps>(
({ className, ...props }, ref) => (
<SwitchPrimitives.Root
className={cn(
diff --git a/packages/client/src/components/Table.tsx b/packages/client/src/components/Table.tsx
index a14ac3a8ac..662ac5bae9 100644
--- a/packages/client/src/components/Table.tsx
+++ b/packages/client/src/components/Table.tsx
@@ -5,50 +5,56 @@ interface TableProps extends React.HTMLAttributes<HTMLTableElement> {
unwrapped?: boolean;
}
-const Table = React.forwardRef<HTMLTableElement, TableProps>(
- ({ className, unwrapped = false, ...props }, ref) => {
- const tableElement = (
- <table ref={ref} className={cn('w-full caption-bottom text-sm', className)} {...props} />
- );
+const Table: React.ForwardRefExoticComponent<TableProps & React.RefAttributes<HTMLTableElement>> =
+ React.forwardRef<HTMLTableElement, TableProps>(
+ ({ className, unwrapped = false, ...props }, ref) => {
+ const tableElement = (
+ <table ref={ref} className={cn('w-full caption-bottom text-sm', className)} {...props} />
+ );
- if (unwrapped) {
- return tableElement;
- }
+ if (unwrapped) {
+ return tableElement;
+ }
- return <div className="relative w-full overflow-auto">{tableElement}</div>;
- },
-);
+ return <div className="relative w-full overflow-auto">{tableElement}</div>;
+ },
+ );
Table.displayName = 'Table';
-const TableHeader = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
- <thead ref={ref} className={cn('[&_tr]:border-b', className)} {...props} />
-));
+const TableHeader: React.ForwardRefExoticComponent<
+ React.HTMLAttributes<HTMLTableSectionElement> & React.RefAttributes<HTMLTableSectionElement>
+> = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
+ ({ className, ...props }, ref) => (
+ <thead ref={ref} className={cn('[&_tr]:border-b', className)} {...props} />
+ ),
+);
TableHeader.displayName = 'TableHeader';
-const TableBody = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
- <tbody ref={ref} className={cn('[&_tr:last-child]:border-0', className)} {...props} />
-));
+const TableBody: React.ForwardRefExoticComponent<
+ React.HTMLAttributes<HTMLTableSectionElement> & React.RefAttributes<HTMLTableSectionElement>
+> = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
+ ({ className, ...props }, ref) => (
+ <tbody ref={ref} className={cn('[&_tr:last-child]:border-0', className)} {...props} />
+ ),
+);
TableBody.displayName = 'TableBody';
-const TableFooter = React.forwardRef<
- HTMLTableSectionElement,
- React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
- <tfoot
- ref={ref}
- className={cn('border-t bg-muted/50 font-medium [&>tr]:last:border-b-0', className)}
- {...props}
- />
-));
+const TableFooter: React.ForwardRefExoticComponent<
+ React.HTMLAttributes<HTMLTableSectionElement> & React.RefAttributes<HTMLTableSectionElement>
+> = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
+ ({ className, ...props }, ref) => (
+ <tfoot
+ ref={ref}
+ className={cn('border-t bg-muted/50 font-medium [&>tr]:last:border-b-0', className)}
+ {...props}
+ />
+ ),
+);
TableFooter.displayName = 'TableFooter';
-const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTMLTableRowElement>>(
+const TableRow: React.ForwardRefExoticComponent<
+ React.HTMLAttributes<HTMLTableRowElement> & React.RefAttributes<HTMLTableRowElement>
+> = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTMLTableRowElement>>(
({ className, ...props }, ref) => (
<tr
ref={ref}
@@ -62,55 +68,59 @@ const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTML
);
TableRow.displayName = 'TableRow';
-const TableHead = React.forwardRef<
- HTMLTableCellElement,
- React.ThHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
- <th
- ref={ref}
- className={cn(
- 'h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0',
- className,
- )}
- {...props}
- />
-));
+const TableHead: React.ForwardRefExoticComponent<
+ React.ThHTMLAttributes<HTMLTableCellElement> & React.RefAttributes<HTMLTableCellElement>
+> = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<HTMLTableCellElement>>(
+ ({ className, ...props }, ref) => (
+ <th
+ ref={ref}
+ className={cn(
+ 'h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0',
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
TableHead.displayName = 'TableHead';
-const TableCell = React.forwardRef<
- HTMLTableCellElement,
- React.TdHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
- <td
- ref={ref}
- className={cn('p-4 align-middle [&:has([role=checkbox])]:pr-0', className)}
- {...props}
- />
-));
+const TableCell: React.ForwardRefExoticComponent<
+ React.TdHTMLAttributes<HTMLTableCellElement> & React.RefAttributes<HTMLTableCellElement>
+> = React.forwardRef<HTMLTableCellElement, React.TdHTMLAttributes<HTMLTableCellElement>>(
+ ({ className, ...props }, ref) => (
+ <td
+ ref={ref}
+ className={cn('p-4 align-middle [&:has([role=checkbox])]:pr-0', className)}
+ {...props}
+ />
+ ),
+);
TableCell.displayName = 'TableCell';
-const TableRowHeader = React.forwardRef<
- HTMLTableCellElement,
- React.ThHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
- <th
- ref={ref}
- scope="row"
- className={cn(
- 'p-4 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0',
- className,
- )}
- {...props}
- />
-));
+const TableRowHeader: React.ForwardRefExoticComponent<
+ React.ThHTMLAttributes<HTMLTableCellElement> & React.RefAttributes<HTMLTableCellElement>
+> = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<HTMLTableCellElement>>(
+ ({ className, ...props }, ref) => (
+ <th
+ ref={ref}
+ scope="row"
+ className={cn(
+ 'p-4 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0',
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
TableRowHeader.displayName = 'TableRowHeader';
-const TableCaption = React.forwardRef<
- HTMLTableCaptionElement,
- React.HTMLAttributes<HTMLTableCaptionElement>
->(({ className, ...props }, ref) => (
- <caption ref={ref} className={cn('mt-4 text-sm text-muted-foreground', className)} {...props} />
-));
+const TableCaption: React.ForwardRefExoticComponent<
+ React.HTMLAttributes<HTMLTableCaptionElement> & React.RefAttributes<HTMLTableCaptionElement>
+> = React.forwardRef<HTMLTableCaptionElement, React.HTMLAttributes<HTMLTableCaptionElement>>(
+ ({ className, ...props }, ref) => (
+ <caption ref={ref} className={cn('mt-4 text-sm text-muted-foreground', className)} {...props} />
+ ),
+);
TableCaption.displayName = 'TableCaption';
export {
diff --git a/packages/client/src/components/Tabs.tsx b/packages/client/src/components/Tabs.tsx
index b4bc2a901c..81658ab072 100644
--- a/packages/client/src/components/Tabs.tsx
+++ b/packages/client/src/components/Tabs.tsx
@@ -2,9 +2,14 @@ import * as React from 'react';
import * as TabsPrimitive from '@radix-ui/react-tabs';
import { cn } from '~/utils';
-const Tabs = TabsPrimitive.Root;
+const Tabs: React.ForwardRefExoticComponent<
+ TabsPrimitive.TabsProps & React.RefAttributes<HTMLDivElement>
+> = TabsPrimitive.Root;
-const TabsList = React.forwardRef<
+const TabsList: React.ForwardRefExoticComponent<
+ Omit<TabsPrimitive.TabsListProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.List>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
>(({ className = '', ...props }, ref) => (
@@ -19,7 +24,10 @@ const TabsList = React.forwardRef<
));
TabsList.displayName = TabsPrimitive.List.displayName;
-const TabsTrigger = React.forwardRef<
+const TabsTrigger: React.ForwardRefExoticComponent<
+ Omit<TabsPrimitive.TabsTriggerProps & React.RefAttributes<HTMLButtonElement>, 'ref'> &
+ React.RefAttributes<HTMLButtonElement>
+> = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
>(({ className = '', ...props }, ref) => (
@@ -34,7 +42,10 @@ const TabsTrigger = React.forwardRef<
));
TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
-const TabsContent = React.forwardRef<
+const TabsContent: React.ForwardRefExoticComponent<
+ Omit<TabsPrimitive.TabsContentProps & React.RefAttributes<HTMLDivElement>, 'ref'> &
+ React.RefAttributes<HTMLDivElement>
+> = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
>(({ className = '', ...props }, ref) => (
diff --git a/packages/client/src/components/Tag.tsx b/packages/client/src/components/Tag.tsx
index 1ae58b5cc1..012eb25a3a 100644
--- a/packages/client/src/components/Tag.tsx
+++ b/packages/client/src/components/Tag.tsx
@@ -47,4 +47,14 @@ const TagPrimitiveRoot = React.forwardRef<HTMLDivElement, TagProps>(
TagPrimitiveRoot.displayName = 'Tag';
-export const Tag = React.memo(TagPrimitiveRoot);
+export const Tag: React.MemoExoticComponent<
+ React.ForwardRefExoticComponent<
+ Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'ref'> & {
+ label: string;
+ labelClassName?: string;
+ CancelButton?: React.ReactNode;
+ LabelNode?: React.ReactNode;
+ onRemove?: (e: React.MouseEvent<HTMLButtonElement>) => void;
+ } & React.RefAttributes<HTMLDivElement>
+ >
+> = React.memo(TagPrimitiveRoot);
diff --git a/packages/client/src/components/Textarea.tsx b/packages/client/src/components/Textarea.tsx
index f9167e91c1..0ad61c8786 100644
--- a/packages/client/src/components/Textarea.tsx
+++ b/packages/client/src/components/Textarea.tsx
@@ -5,20 +5,20 @@ import { cn } from '~/utils';
export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
-const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
- ({ className = '', ...props }, ref) => {
- return (
- <textarea
- className={cn(
- 'flex h-20 w-full resize-none rounded-md border border-gray-300 bg-transparent px-3 py-2 text-sm placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-50 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900',
- className,
- )}
- ref={ref}
- {...props}
- />
- );
- },
-);
+const Textarea: React.ForwardRefExoticComponent<
+ TextareaProps & React.RefAttributes<HTMLTextAreaElement>
+> = React.forwardRef<HTMLTextAreaElement, TextareaProps>(({ className = '', ...props }, ref) => {
+ return (
+ <textarea
+ className={cn(
+ 'flex h-20 w-full resize-none rounded-md border border-gray-300 bg-transparent px-3 py-2 text-sm placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-50 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900',
+ className,
+ )}
+ ref={ref}
+ {...props}
+ />
+ );
+});
Textarea.displayName = 'Textarea';
export { Textarea };
diff --git a/packages/client/src/components/TextareaAutosize.tsx b/packages/client/src/components/TextareaAutosize.tsx
index d85ccbbf61..3d5c3622ff 100644
--- a/packages/client/src/components/TextareaAutosize.tsx
+++ b/packages/client/src/components/TextareaAutosize.tsx
@@ -1,5 +1,11 @@
+import {
+ forwardRef,
+ RefAttributes,
+ ForwardRefExoticComponent,
+ useLayoutEffect,
+ useState,
+} from 'react';
import { useAtomValue } from 'jotai';
-import { forwardRef, useLayoutEffect, useState } from 'react';
import ReactTextareaAutosize from 'react-textarea-autosize';
import type { TextareaAutosizeProps } from 'react-textarea-autosize';
import { chatDirectionAtom } from '~/store';
@@ -16,11 +22,11 @@ export type TextareaAutosizePropsWithAria =
'aria-label'?: never;
});
-export const TextareaAutosize = forwardRef<HTMLTextAreaElement, TextareaAutosizePropsWithAria>(
- (props, ref) => {
- const [, setIsRerendered] = useState(false);
- const chatDirection = useAtomValue(chatDirectionAtom).toLowerCase();
- useLayoutEffect(() => setIsRerendered(true), []);
- return <ReactTextareaAutosize dir={chatDirection} {...props} ref={ref} />;
- },
-);
+export const TextareaAutosize: ForwardRefExoticComponent<
+ TextareaAutosizePropsWithAria & RefAttributes<HTMLTextAreaElement>
+> = forwardRef<HTMLTextAreaElement, TextareaAutosizePropsWithAria>((props, ref) => {
+ const [, setIsRerendered] = useState(false);
+ const chatDirection = useAtomValue(chatDirectionAtom).toLowerCase();
+ useLayoutEffect(() => setIsRerendered(true), []);
+ return <ReactTextareaAutosize dir={chatDirection} {...props} ref={ref} />;
+});
diff --git a/packages/client/src/components/ThemeSelector.tsx b/packages/client/src/components/ThemeSelector.tsx
index 5956e87b39..ebe110b58c 100644
--- a/packages/client/src/components/ThemeSelector.tsx
+++ b/packages/client/src/components/ThemeSelector.tsx
@@ -1,4 +1,5 @@
import { useContext, useCallback, useEffect, useState } from 'react';
+import { JSX } from 'react/jsx-runtime';
import { Sun, Moon, Monitor } from 'lucide-react';
import { ThemeContext, isDark } from '../theme';
import { useLocalize } from '../hooks';
@@ -54,7 +55,7 @@ const Theme = ({ theme, onChange }: { theme: string; onChange: (value: string) =
);
};
-const ThemeSelector = ({ returnThemeOnly }: { returnThemeOnly?: boolean }) => {
+const ThemeSelector = ({ returnThemeOnly }: { returnThemeOnly?: boolean }): JSX.Element => {
const { theme, setTheme } = useContext(ThemeContext);
const [announcement, setAnnouncement] = useState('');
const localize = useLocalize();
diff --git a/packages/client/src/components/Toast.tsx b/packages/client/src/components/Toast.tsx
index f78b6d5aaa..7c47ef5d2f 100644
--- a/packages/client/src/components/Toast.tsx
+++ b/packages/client/src/components/Toast.tsx
@@ -1,8 +1,9 @@
+import { JSX } from 'react/jsx-runtime';
import * as RadixToast from '@radix-ui/react-toast';
import { NotificationSeverity } from '~/common';
import { useToast } from '~/hooks';
-export function Toast() {
+export function Toast(): JSX.Element {
const { toast, onOpenChange } = useToast();
const severityClassName = {
/* Going up by 100 units in terms of darkness (eg bg-green-500 to bg-green-600) for
diff --git a/packages/client/src/components/Tooltip.tsx b/packages/client/src/components/Tooltip.tsx
index ddcdeef6c9..21457c9435 100644
--- a/packages/client/src/components/Tooltip.tsx
+++ b/packages/client/src/components/Tooltip.tsx
@@ -1,6 +1,13 @@
+import {
+ memo,
+ forwardRef,
+ useCallback,
+ useMemo,
+ RefAttributes,
+ ForwardRefExoticComponent,
+} from 'react';
import DOMPurify from 'dompurify';
import * as Ariakit from '@ariakit/react';
-import { memo, forwardRef, useCallback, useMemo } from 'react';
import { AnimatePresence, motion } from 'framer-motion';
import { cn } from '~/utils';
import './Tooltip.css';
@@ -104,7 +111,9 @@ const TooltipPopup = memo(function TooltipPopup({
);
});
-export const TooltipAnchor = forwardRef<HTMLDivElement, TooltipAnchorProps>(function TooltipAnchor(
+export const TooltipAnchor: ForwardRefExoticComponent<
+ Omit<TooltipAnchorProps, 'ref'> & RefAttributes<HTMLDivElement>
+> = forwardRef<HTMLDivElement, TooltipAnchorProps>(function TooltipAnchor(
{ description, side = 'top', className, role, enableHTML = false, ...props },
ref,
) {
diff --git a/packages/client/src/hooks/ThemeContext.old.tsx b/packages/client/src/hooks/ThemeContext.old.tsx
index 74516fcab0..d026868b76 100644
--- a/packages/client/src/hooks/ThemeContext.old.tsx
+++ b/packages/client/src/hooks/ThemeContext.old.tsx
@@ -1,7 +1,8 @@
//ThemeContext.js
// source: https://plainenglish.io/blog/light-and-dark-mode-in-react-web-application-with-tailwind-css-89674496b942
-import { useSetAtom } from 'jotai';
import React, { createContext, useState, useEffect } from 'react';
+import { useSetAtom } from 'jotai';
+import { JSX } from 'react/jsx-runtime';
import { getInitialTheme, applyFontSize } from '~/utils';
import { fontSizeAtom } from '~/store';
@@ -24,7 +25,8 @@ export const isDark = (theme: string): boolean => {
return theme === 'dark';
};
-export const ThemeContext = createContext<ProviderValue>(defaultContextValue);
+export const ThemeContext: React.Context<ProviderValue> =
+ createContext<ProviderValue>(defaultContextValue);
export const ThemeProvider = ({
initialTheme,
@@ -32,7 +34,7 @@ export const ThemeProvider = ({
}: {
initialTheme?: string;
children: React.ReactNode;
-}) => {
+}): JSX.Element => {
const [theme, setTheme] = useState(getInitialTheme);
const setFontSize = useSetAtom(fontSizeAtom);
diff --git a/packages/client/src/hooks/useAvatar.ts b/packages/client/src/hooks/useAvatar.ts
index 8b183bb276..c57b058efa 100644
--- a/packages/client/src/hooks/useAvatar.ts
+++ b/packages/client/src/hooks/useAvatar.ts
@@ -5,7 +5,7 @@ import type { TUser } from 'librechat-data-provider';
const avatarCache: Record<string, string> = {};
-const useAvatar = (user: TUser | undefined) => {
+const useAvatar = (user: TUser | undefined): string => {
return useMemo(() => {
const { username, name } = user ?? {};
const seed = name || username;
diff --git a/packages/client/src/hooks/useCombobox.ts b/packages/client/src/hooks/useCombobox.ts
index 3282f2b7e8..90eeb8b9ac 100644
--- a/packages/client/src/hooks/useCombobox.ts
+++ b/packages/client/src/hooks/useCombobox.ts
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { SetStateAction, Dispatch, useMemo, useState } from 'react';
import { matchSorter } from 'match-sorter';
import type { OptionWithIcon, MentionOption } from '~/common';
@@ -8,7 +8,13 @@ export default function useCombobox({
}: {
value: string;
options: Array<OptionWithIcon | MentionOption>;
-}) {
+}): {
+ open: boolean;
+ setOpen: Dispatch<SetStateAction<boolean>>;
+ searchValue: string;
+ setSearchValue: Dispatch<SetStateAction<string>>;
+ matches: (OptionWithIcon | MentionOption)[];
+} {
const [open, setOpen] = useState(false);
const [searchValue, setSearchValue] = useState('');
diff --git a/packages/client/src/hooks/useDelayedRender.tsx b/packages/client/src/hooks/useDelayedRender.tsx
index 6524f47aed..ddb14af275 100644
--- a/packages/client/src/hooks/useDelayedRender.tsx
+++ b/packages/client/src/hooks/useDelayedRender.tsx
@@ -26,7 +26,7 @@ const useDelayedRender = (delay: number) => {
};
}, [delay, delayed]);
- return (fn: () => ReactNode) => {
+ return (fn: () => ReactNode): ReactNode => {
if (delayed && timerPromiseRef.current) {
throw timerPromiseRef.current;
}
diff --git a/packages/client/src/hooks/useLocalize.ts b/packages/client/src/hooks/useLocalize.ts
index cab3dd6547..1652c11f4a 100644
--- a/packages/client/src/hooks/useLocalize.ts
+++ b/packages/client/src/hooks/useLocalize.ts
@@ -6,7 +6,7 @@ import { resources } from '~/locales/i18n';
export type TranslationKeys = keyof typeof resources.en.translation;
/** Language lifecycle is managed by the host app — do not add i18n.changeLanguage() calls here. */
-export default function useLocalize() {
+export default function useLocalize(): (phraseKey: TranslationKeys, options?: TOptions) => string {
const { t } = useTranslation();
return useCallback(
diff --git a/packages/client/src/hooks/useMediaQuery.tsx b/packages/client/src/hooks/useMediaQuery.tsx
index 74c6362b9a..067474c964 100644
--- a/packages/client/src/hooks/useMediaQuery.tsx
+++ b/packages/client/src/hooks/useMediaQuery.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react';
-export default function useMediaQuery(query: string) {
+export default function useMediaQuery(query: string): boolean {
const [matches, setMatches] = useState(false);
useEffect(() => {
diff --git a/packages/client/src/hooks/useToast.ts b/packages/client/src/hooks/useToast.ts
index 9937c640dd..fe9adf316e 100644
--- a/packages/client/src/hooks/useToast.ts
+++ b/packages/client/src/hooks/useToast.ts
@@ -1,10 +1,14 @@
-import { useAtom } from 'jotai';
import { useRef, useEffect } from 'react';
+import { useAtom } from 'jotai';
import type { TShowToast } from '~/common';
-import { NotificationSeverity } from '~/common';
import { toastState, type ToastState } from '~/store';
+import { NotificationSeverity } from '~/common';
-export default function useToast(showDelay = 100) {
+export default function useToast(showDelay = 100): {
+ toast: ToastState;
+ onOpenChange: (open: boolean) => void;
+ showToast: ({ message, severity, showIcon, duration, status }: TShowToast) => void;
+} {
const [toast, setToast] = useAtom(toastState);
const showTimerRef = useRef<number | null>(null);
const hideTimerRef = useRef<number | null>(null);
@@ -26,7 +30,7 @@ export default function useToast(showDelay = 100) {
showIcon = true,
duration = 3000, // default duration for the toast to be visible
status,
- }: TShowToast) => {
+ }: TShowToast): void => {
// Clear existing timeouts
if (showTimerRef.current !== null) {
clearTimeout(showTimerRef.current);
@@ -52,7 +56,7 @@ export default function useToast(showDelay = 100) {
return {
toast,
- onOpenChange: (open: boolean) => setToast({ ...toast, open }),
+ onOpenChange: (open: boolean): void => setToast({ ...toast, open }),
showToast,
};
}
diff --git a/packages/client/src/locales/i18n.ts b/packages/client/src/locales/i18n.ts
index f463723a4f..42ec38b2ea 100644
--- a/packages/client/src/locales/i18n.ts
+++ b/packages/client/src/locales/i18n.ts
@@ -1,7 +1,10 @@
import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
import LanguageDetector from 'i18next-browser-languagedetector';
-
+import translationZh_Hans from './zh-Hans/translation.json';
+import translationZh_Hant from './zh-Hant/translation.json';
+import translationPt_BR from './pt-BR/translation.json';
+import translationPt_PT from './pt-PT/translation.json';
import translationEn from './en/translation.json';
import translationAr from './ar/translation.json';
import translationCa from './ca/translation.json';
@@ -14,8 +17,6 @@ import translationFa from './fa/translation.json';
import translationFr from './fr/translation.json';
import translationIt from './it/translation.json';
import translationPl from './pl/translation.json';
-import translationPt_BR from './pt-BR/translation.json';
-import translationPt_PT from './pt-PT/translation.json';
import translationRu from './ru/translation.json';
import translationJa from './ja/translation.json';
import translationKa from './ka/translation.json';
@@ -29,12 +30,185 @@ import translationId from './id/translation.json';
import translationHe from './he/translation.json';
import translationHu from './hu/translation.json';
import translationFi from './fi/translation.json';
-import translationZh_Hans from './zh-Hans/translation.json';
-import translationZh_Hant from './zh-Hant/translation.json';
export const defaultNS = 'translation';
-export const resources = {
+export const resources: {
+ readonly en: {
+ readonly translation: {
+ com_ui_cancel: string;
+ com_ui_no_options: string;
+ com_ui_delete_selected_items: string;
+ com_ui_filter_by: string;
+ com_ui_cancel_dialog: string;
+ com_ui_no_results_found: string;
+ com_ui_select_all: string;
+ com_ui_no_selection: string;
+ com_ui_confirm_bulk_delete: string;
+ com_ui_delete_success: string;
+ com_ui_retry: string;
+ com_ui_selected_count: string;
+ com_ui_data_table: string;
+ com_ui_no_data: string;
+ com_ui_delete_selected: string;
+ com_ui_search: string;
+ com_ui_search_table: string;
+ com_ui_search_table_description: string;
+ com_ui_data_table_scroll_area: string;
+ com_ui_select_row: string;
+ com_ui_loading_more_data: string;
+ com_ui_no_search_results: string;
+ com_ui_table_error: string;
+ com_ui_table_error_description: string;
+ com_ui_error_details: string;
+ com_ui_enabled: string;
+ com_ui_disabled: string;
+ com_ui_toggle_theme: string;
+ com_ui_dark_theme_enabled: string;
+ com_ui_light_theme_enabled: string;
+ };
+ };
+ readonly ar: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly ca: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly cs: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly 'zh-Hans': {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly 'zh-Hant': {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly da: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly de: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly es: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly et: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly fa: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly fr: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly it: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly pl: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly 'pt-BR': {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly 'pt-PT': {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly ru: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly ja: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly ka: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly sv: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly ko: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly th: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly tr: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly vi: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly nl: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly id: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly he: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly hu: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+ readonly fi: {
+ readonly translation: {
+ com_ui_cancel: string;
+ };
+ };
+} = {
en: { translation: translationEn },
ar: { translation: translationAr },
ca: { translation: translationCa },
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 36a3f05844..9b1d49e22a 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -1,8 +1,12 @@
-import { atom } from 'jotai';
+import { atom, PrimitiveAtom } from 'jotai';
import { NotificationSeverity } from '~/common';
-export const chatDirectionAtom = atom<string>('ltr');
-export const fontSizeAtom = atom<string>('text-base');
+export const chatDirectionAtom: PrimitiveAtom<string> & {
+ init: string;
+} = atom<string>('ltr');
+export const fontSizeAtom: PrimitiveAtom<string> & {
+ init: string;
+} = atom<string>('text-base');
export type ToastState = {
open: boolean;
@@ -11,7 +15,9 @@ export type ToastState = {
showIcon: boolean;
};
-export const toastState = atom<ToastState>({
+export const toastState: PrimitiveAtom<ToastState> & {
+ init: ToastState;
+} = atom<ToastState>({
open: false,
message: '',
severity: NotificationSeverity.SUCCESS,
diff --git a/packages/client/src/svgs/AnthropicIcon.tsx b/packages/client/src/svgs/AnthropicIcon.tsx
index d634bd0118..fee9b79333 100644
--- a/packages/client/src/svgs/AnthropicIcon.tsx
+++ b/packages/client/src/svgs/AnthropicIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
export default function AnthropicIcon({
size = 25,
@@ -5,7 +6,7 @@ export default function AnthropicIcon({
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
viewBox="0 0 24 16"
diff --git a/packages/client/src/svgs/AnthropicMinimalIcon.tsx b/packages/client/src/svgs/AnthropicMinimalIcon.tsx
index dea61ef6ca..d50d77d4ad 100644
--- a/packages/client/src/svgs/AnthropicMinimalIcon.tsx
+++ b/packages/client/src/svgs/AnthropicMinimalIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function AnthropicMinimalIcon() {
+export default function AnthropicMinimalIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/AppleIcon.tsx b/packages/client/src/svgs/AppleIcon.tsx
index 9994ca5f88..bffdf3f52a 100644
--- a/packages/client/src/svgs/AppleIcon.tsx
+++ b/packages/client/src/svgs/AppleIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function AppleIcon() {
+export default function AppleIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/ArchiveIcon.tsx b/packages/client/src/svgs/ArchiveIcon.tsx
index cf85d69cc5..a6e76de690 100644
--- a/packages/client/src/svgs/ArchiveIcon.tsx
+++ b/packages/client/src/svgs/ArchiveIcon.tsx
@@ -1,4 +1,10 @@
-export default function ArchiveIcon({ className = 'icon-md' }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function ArchiveIcon({
+ className = 'icon-md',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
width="18"
diff --git a/packages/client/src/svgs/AssistantIcon.tsx b/packages/client/src/svgs/AssistantIcon.tsx
index 05233817f1..c8514f3f2a 100644
--- a/packages/client/src/svgs/AssistantIcon.tsx
+++ b/packages/client/src/svgs/AssistantIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
export default function AssistantIcon({
@@ -6,7 +7,7 @@ export default function AssistantIcon({
}: {
className?: string;
size?: string | number;
-}) {
+}): JSX.Element {
const unit = 24;
const height = size;
const width = size;
diff --git a/packages/client/src/svgs/AttachmentIcon.tsx b/packages/client/src/svgs/AttachmentIcon.tsx
index 51aa489d7e..2a6035bacb 100644
--- a/packages/client/src/svgs/AttachmentIcon.tsx
+++ b/packages/client/src/svgs/AttachmentIcon.tsx
@@ -1,4 +1,10 @@
-export default function AttachmentIcon({ className = '' }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function AttachmentIcon({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
width="24"
diff --git a/packages/client/src/svgs/AudioPaths.tsx b/packages/client/src/svgs/AudioPaths.tsx
index 874f54328d..51d2569efc 100644
--- a/packages/client/src/svgs/AudioPaths.tsx
+++ b/packages/client/src/svgs/AudioPaths.tsx
@@ -1,4 +1,6 @@
-export default function AudioPaths() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function AudioPaths(): JSX.Element {
return (
<>
<path
diff --git a/packages/client/src/svgs/AzureMinimalIcon.tsx b/packages/client/src/svgs/AzureMinimalIcon.tsx
index e51d7aca32..a3ba7af85c 100644
--- a/packages/client/src/svgs/AzureMinimalIcon.tsx
+++ b/packages/client/src/svgs/AzureMinimalIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
export default function AzureMinimalIcon({
@@ -6,7 +7,7 @@ export default function AzureMinimalIcon({
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
const height = size;
const width = size;
diff --git a/packages/client/src/svgs/BedrockIcon.tsx b/packages/client/src/svgs/BedrockIcon.tsx
index ec69f3c4e0..bb6efd63d9 100644
--- a/packages/client/src/svgs/BedrockIcon.tsx
+++ b/packages/client/src/svgs/BedrockIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
export default function BedrockIcon({
@@ -6,7 +7,7 @@ export default function BedrockIcon({
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
width={size}
diff --git a/packages/client/src/svgs/BirthdayIcon.tsx b/packages/client/src/svgs/BirthdayIcon.tsx
index b0567778bd..0566894178 100644
--- a/packages/client/src/svgs/BirthdayIcon.tsx
+++ b/packages/client/src/svgs/BirthdayIcon.tsx
@@ -1,7 +1,12 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
-export default function BirthdayIcon({ className = '' }) {
+export default function BirthdayIcon({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
version="1.1"
diff --git a/packages/client/src/svgs/Blocks.tsx b/packages/client/src/svgs/Blocks.tsx
index 6c3aab213b..000ef3305d 100644
--- a/packages/client/src/svgs/Blocks.tsx
+++ b/packages/client/src/svgs/Blocks.tsx
@@ -1,5 +1,6 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function Blocks({ className = '' }: { className?: string }) {
+export default function Blocks({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
width="24"
diff --git a/packages/client/src/svgs/CautionIcon.tsx b/packages/client/src/svgs/CautionIcon.tsx
index b8adae79a3..97372c33da 100644
--- a/packages/client/src/svgs/CautionIcon.tsx
+++ b/packages/client/src/svgs/CautionIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function CautionIcon() {
+export default function CautionIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/ChatGPTMinimalIcon.tsx b/packages/client/src/svgs/ChatGPTMinimalIcon.tsx
index 80d7c862bc..3c28e715ac 100644
--- a/packages/client/src/svgs/ChatGPTMinimalIcon.tsx
+++ b/packages/client/src/svgs/ChatGPTMinimalIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function ChatGPTMinimalIcon() {
+export default function ChatGPTMinimalIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/ChatIcon.tsx b/packages/client/src/svgs/ChatIcon.tsx
index de14015d48..1f275e9602 100644
--- a/packages/client/src/svgs/ChatIcon.tsx
+++ b/packages/client/src/svgs/ChatIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function ChatIcon() {
+export default function ChatIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/CheckMark.tsx b/packages/client/src/svgs/CheckMark.tsx
index 75921475b7..144f326c82 100644
--- a/packages/client/src/svgs/CheckMark.tsx
+++ b/packages/client/src/svgs/CheckMark.tsx
@@ -1,6 +1,7 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function CheckMark({ className = '' }: { className?: string }) {
+export default function CheckMark({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
fill="none"
diff --git a/packages/client/src/svgs/CircleHelpIcon.tsx b/packages/client/src/svgs/CircleHelpIcon.tsx
index 1f0265b50d..296c4ea379 100644
--- a/packages/client/src/svgs/CircleHelpIcon.tsx
+++ b/packages/client/src/svgs/CircleHelpIcon.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
-export default function CircleHelpIcon({ className = 'icon-md-heavy', size = '1em' }) {
+export default function CircleHelpIcon({
+ className = 'icon-md-heavy',
+ size = '1em',
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/Clipboard.tsx b/packages/client/src/svgs/Clipboard.tsx
index a7c1fda81a..d68b13244c 100644
--- a/packages/client/src/svgs/Clipboard.tsx
+++ b/packages/client/src/svgs/Clipboard.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
-export default function Clipboard({ className = 'icon-md-heavy', size = '1em' }) {
+export default function Clipboard({
+ className = 'icon-md-heavy',
+ size = '1em',
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/CodePaths.tsx b/packages/client/src/svgs/CodePaths.tsx
index adddb42ec3..aec617275c 100644
--- a/packages/client/src/svgs/CodePaths.tsx
+++ b/packages/client/src/svgs/CodePaths.tsx
@@ -1,4 +1,6 @@
-export default function CodePaths() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function CodePaths(): JSX.Element {
return (
<>
<path
diff --git a/packages/client/src/svgs/CodeyIcon.tsx b/packages/client/src/svgs/CodeyIcon.tsx
index 1a40cfe647..286170d456 100644
--- a/packages/client/src/svgs/CodeyIcon.tsx
+++ b/packages/client/src/svgs/CodeyIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
export default function CodeyIcon({
size = 25,
@@ -5,7 +6,7 @@ export default function CodeyIcon({
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
// width="100%"
diff --git a/packages/client/src/svgs/ContinueIcon.tsx b/packages/client/src/svgs/ContinueIcon.tsx
index b4dcd5c7e1..69181cc579 100644
--- a/packages/client/src/svgs/ContinueIcon.tsx
+++ b/packages/client/src/svgs/ContinueIcon.tsx
@@ -1,6 +1,7 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function ContinueIcon({ className = '' }: { className?: string }) {
+export default function ContinueIcon({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/ConvoIcon.tsx b/packages/client/src/svgs/ConvoIcon.tsx
index edd9fd4148..cf3dd314ac 100644
--- a/packages/client/src/svgs/ConvoIcon.tsx
+++ b/packages/client/src/svgs/ConvoIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function ConvoIcon() {
+export default function ConvoIcon(): JSX.Element {
return (
<svg
data-testid="convo-icon"
diff --git a/packages/client/src/svgs/CrossIcon.tsx b/packages/client/src/svgs/CrossIcon.tsx
index 635f2c7cc0..b52b65d03b 100644
--- a/packages/client/src/svgs/CrossIcon.tsx
+++ b/packages/client/src/svgs/CrossIcon.tsx
@@ -1,7 +1,12 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
-export default function CrossIcon({ className = '' }) {
+export default function CrossIcon({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/CustomMinimalIcon.tsx b/packages/client/src/svgs/CustomMinimalIcon.tsx
index dabe8f6200..85d3fb3f1d 100644
--- a/packages/client/src/svgs/CustomMinimalIcon.tsx
+++ b/packages/client/src/svgs/CustomMinimalIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
export default function CustomMinimalIcon({
size = 25,
@@ -5,7 +6,7 @@ export default function CustomMinimalIcon({
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/DarkModeIcon.tsx b/packages/client/src/svgs/DarkModeIcon.tsx
index 3b91f0842a..3575aecd2e 100644
--- a/packages/client/src/svgs/DarkModeIcon.tsx
+++ b/packages/client/src/svgs/DarkModeIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function DarkModeIcon() {
+export default function DarkModeIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/DataIcon.tsx b/packages/client/src/svgs/DataIcon.tsx
index 92a445b96e..935473b6ff 100644
--- a/packages/client/src/svgs/DataIcon.tsx
+++ b/packages/client/src/svgs/DataIcon.tsx
@@ -1,4 +1,6 @@
-export default function DataIcon({ className = 'icon-sm' }: { className?: string }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function DataIcon({ className = 'icon-sm' }: { className?: string }): JSX.Element {
return (
<svg
width="18"
diff --git a/packages/client/src/svgs/DiscordIcon.tsx b/packages/client/src/svgs/DiscordIcon.tsx
index af4ae0f12f..09cab0d68d 100644
--- a/packages/client/src/svgs/DiscordIcon.tsx
+++ b/packages/client/src/svgs/DiscordIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function DiscordIcon() {
+export default function DiscordIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/DislikeIcon.tsx b/packages/client/src/svgs/DislikeIcon.tsx
index 40a23ad0ea..589b4cec12 100644
--- a/packages/client/src/svgs/DislikeIcon.tsx
+++ b/packages/client/src/svgs/DislikeIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function DislikeIcon() {
+export default function DislikeIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/DotsIcon.tsx b/packages/client/src/svgs/DotsIcon.tsx
index b0f9f00da0..854e1448bb 100644
--- a/packages/client/src/svgs/DotsIcon.tsx
+++ b/packages/client/src/svgs/DotsIcon.tsx
@@ -1,10 +1,11 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
export default function DotsIcon({
className = 'h-4 w-4 flex-shrink-0 text-gray-500',
}: {
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/EditIcon.tsx b/packages/client/src/svgs/EditIcon.tsx
index ae28655633..2f75243e8f 100644
--- a/packages/client/src/svgs/EditIcon.tsx
+++ b/packages/client/src/svgs/EditIcon.tsx
@@ -6,30 +6,31 @@ type IconProps = {
size?: string;
};
-const EditIcon = React.forwardRef<SVGSVGElement, IconProps>((props: IconProps, ref) => {
- const { className = 'icon-md', size = '1.2em' } = props;
- return (
- <svg
- ref={ref}
- fill="none"
- strokeWidth="2"
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 24 24"
- strokeLinecap="round"
- strokeLinejoin="round"
- height={size}
- width={size}
- className={cn(className)}
- aria-hidden="true"
- >
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M13.2929 4.29291C15.0641 2.52167 17.9359 2.52167 19.7071 4.2929C21.4783 6.06414 21.4783 8.93588 19.7071 10.7071L18.7073 11.7069L11.1603 19.2539C10.7182 19.696 10.1489 19.989 9.53219 20.0918L4.1644 20.9864C3.84584 21.0395 3.52125 20.9355 3.29289 20.7071C3.06453 20.4788 2.96051 20.1542 3.0136 19.8356L3.90824 14.4678C4.01103 13.8511 4.30396 13.2818 4.7461 12.8397L13.2929 4.29291ZM13 7.41422L6.16031 14.2539C6.01293 14.4013 5.91529 14.591 5.88102 14.7966L5.21655 18.7835L9.20339 18.119C9.40898 18.0847 9.59872 17.9871 9.7461 17.8397L16.5858 11L13 7.41422ZM18 9.5858L14.4142 6.00001L14.7071 5.70712C15.6973 4.71693 17.3027 4.71693 18.2929 5.70712C19.2831 6.69731 19.2831 8.30272 18.2929 9.29291L18 9.5858Z"
- fill="currentColor"
- ></path>
- </svg>
- );
-});
+const EditIcon: React.ForwardRefExoticComponent<IconProps & React.RefAttributes<SVGSVGElement>> =
+ React.forwardRef<SVGSVGElement, IconProps>((props: IconProps, ref) => {
+ const { className = 'icon-md', size = '1.2em' } = props;
+ return (
+ <svg
+ ref={ref}
+ fill="none"
+ strokeWidth="2"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 24 24"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ height={size}
+ width={size}
+ className={cn(className)}
+ aria-hidden="true"
+ >
+ <path
+ fillRule="evenodd"
+ clipRule="evenodd"
+ d="M13.2929 4.29291C15.0641 2.52167 17.9359 2.52167 19.7071 4.2929C21.4783 6.06414 21.4783 8.93588 19.7071 10.7071L18.7073 11.7069L11.1603 19.2539C10.7182 19.696 10.1489 19.989 9.53219 20.0918L4.1644 20.9864C3.84584 21.0395 3.52125 20.9355 3.29289 20.7071C3.06453 20.4788 2.96051 20.1542 3.0136 19.8356L3.90824 14.4678C4.01103 13.8511 4.30396 13.2818 4.7461 12.8397L13.2929 4.29291ZM13 7.41422L6.16031 14.2539C6.01293 14.4013 5.91529 14.591 5.88102 14.7966L5.21655 18.7835L9.20339 18.119C9.40898 18.0847 9.59872 17.9871 9.7461 17.8397L16.5858 11L13 7.41422ZM18 9.5858L14.4142 6.00001L14.7071 5.70712C15.6973 4.71693 17.3027 4.71693 18.2929 5.70712C19.2831 6.69731 19.2831 8.30272 18.2929 9.29291L18 9.5858Z"
+ fill="currentColor"
+ ></path>
+ </svg>
+ );
+ });
export default EditIcon;
diff --git a/packages/client/src/svgs/ExperimentIcon.tsx b/packages/client/src/svgs/ExperimentIcon.tsx
index 476e925ff4..212d90b6a0 100644
--- a/packages/client/src/svgs/ExperimentIcon.tsx
+++ b/packages/client/src/svgs/ExperimentIcon.tsx
@@ -1,4 +1,6 @@
-export default function ExperimentIcon() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function ExperimentIcon(): JSX.Element {
return (
<svg
width="24"
diff --git a/packages/client/src/svgs/FacebookIcon.tsx b/packages/client/src/svgs/FacebookIcon.tsx
index 54680776a6..b77c637878 100644
--- a/packages/client/src/svgs/FacebookIcon.tsx
+++ b/packages/client/src/svgs/FacebookIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function FacebookIcon() {
+export default function FacebookIcon(): JSX.Element {
return (
<svg viewBox="0 0 40 40" width="25" height="25" aria-hidden="true">
<linearGradient
diff --git a/packages/client/src/svgs/FileIcon.tsx b/packages/client/src/svgs/FileIcon.tsx
index b02976bbf4..3baf630374 100644
--- a/packages/client/src/svgs/FileIcon.tsx
+++ b/packages/client/src/svgs/FileIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import type { TFile } from 'librechat-data-provider';
export default function FileIcon({
@@ -10,7 +11,7 @@ export default function FileIcon({
paths: React.FC;
title: string;
};
-}) {
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/FilePaths.tsx b/packages/client/src/svgs/FilePaths.tsx
index 29341ebeb9..94de953a58 100644
--- a/packages/client/src/svgs/FilePaths.tsx
+++ b/packages/client/src/svgs/FilePaths.tsx
@@ -1,4 +1,6 @@
-export default function FilePaths() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function FilePaths(): JSX.Element {
return (
<>
<path
diff --git a/packages/client/src/svgs/GPTIcon.tsx b/packages/client/src/svgs/GPTIcon.tsx
index 477882be6e..7c343eddd9 100644
--- a/packages/client/src/svgs/GPTIcon.tsx
+++ b/packages/client/src/svgs/GPTIcon.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
export default function GPTIcon({
@@ -6,7 +7,7 @@ export default function GPTIcon({
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
const unit = '41';
const height = size;
const width = size;
diff --git a/packages/client/src/svgs/GeminiIcon.tsx b/packages/client/src/svgs/GeminiIcon.tsx
index 4835e6e58f..0e50a0a81d 100644
--- a/packages/client/src/svgs/GeminiIcon.tsx
+++ b/packages/client/src/svgs/GeminiIcon.tsx
@@ -1,10 +1,12 @@
+import { JSX } from 'react/jsx-runtime';
+
export default function GeminiIcon({
size = 25,
className = '',
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
width={size}
diff --git a/packages/client/src/svgs/GithubIcon.tsx b/packages/client/src/svgs/GithubIcon.tsx
index 089692a770..e637d3ad3c 100644
--- a/packages/client/src/svgs/GithubIcon.tsx
+++ b/packages/client/src/svgs/GithubIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function GithubIcon() {
+export default function GithubIcon(): JSX.Element {
return (
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" fill="none" aria-hidden="true">
<path
diff --git a/packages/client/src/svgs/GoogleIcon.tsx b/packages/client/src/svgs/GoogleIcon.tsx
index 0dcafc2942..306435700f 100644
--- a/packages/client/src/svgs/GoogleIcon.tsx
+++ b/packages/client/src/svgs/GoogleIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function GoogleIcon() {
+export default function GoogleIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/GoogleIconChat.tsx b/packages/client/src/svgs/GoogleIconChat.tsx
index 5e4da789e7..0ec7a741a4 100644
--- a/packages/client/src/svgs/GoogleIconChat.tsx
+++ b/packages/client/src/svgs/GoogleIconChat.tsx
@@ -1,15 +1,12 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
export default function Google({
- size = 25,
className = '',
}: {
size?: number;
className?: string;
-}) {
- const unit = '41';
- const height = size;
- const width = size;
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/GoogleMinimalIcon.tsx b/packages/client/src/svgs/GoogleMinimalIcon.tsx
index 9c7e3aad3e..26aba74fe3 100644
--- a/packages/client/src/svgs/GoogleMinimalIcon.tsx
+++ b/packages/client/src/svgs/GoogleMinimalIcon.tsx
@@ -1,5 +1,6 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function GoogleMinimalIcon({ className = '' }: { className?: string }) {
+export default function GoogleMinimalIcon({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/LightModeIcon.tsx b/packages/client/src/svgs/LightModeIcon.tsx
index ab58472a00..f3c6031a00 100644
--- a/packages/client/src/svgs/LightModeIcon.tsx
+++ b/packages/client/src/svgs/LightModeIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function LightModeIcon() {
+export default function LightModeIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/LightningIcon.tsx b/packages/client/src/svgs/LightningIcon.tsx
index a9b7b633bf..ee7880c9cb 100644
--- a/packages/client/src/svgs/LightningIcon.tsx
+++ b/packages/client/src/svgs/LightningIcon.tsx
@@ -1,6 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function LightningIcon({ className = '' }) {
+export default function LightningIcon({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/LikeIcon.tsx b/packages/client/src/svgs/LikeIcon.tsx
index 8e3b7ba5bf..a430fc5e58 100644
--- a/packages/client/src/svgs/LikeIcon.tsx
+++ b/packages/client/src/svgs/LikeIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function LikeIcon() {
+export default function LikeIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/LinkIcon.tsx b/packages/client/src/svgs/LinkIcon.tsx
index 79935df032..30f1039a7a 100644
--- a/packages/client/src/svgs/LinkIcon.tsx
+++ b/packages/client/src/svgs/LinkIcon.tsx
@@ -1,4 +1,6 @@
-export default function LinkIcon() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function LinkIcon(): JSX.Element {
return (
<svg
width="18"
diff --git a/packages/client/src/svgs/ListeningIcon.tsx b/packages/client/src/svgs/ListeningIcon.tsx
index 1bdc7fb894..074a2c6e29 100644
--- a/packages/client/src/svgs/ListeningIcon.tsx
+++ b/packages/client/src/svgs/ListeningIcon.tsx
@@ -1,10 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
type ListeningIconProps = {
className?: string;
};
-export default function ListeningIcon({ className }: ListeningIconProps) {
+export default function ListeningIcon({ className }: ListeningIconProps): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/LockIcon.tsx b/packages/client/src/svgs/LockIcon.tsx
index efcf505288..3ac81a3816 100644
--- a/packages/client/src/svgs/LockIcon.tsx
+++ b/packages/client/src/svgs/LockIcon.tsx
@@ -1,4 +1,6 @@
-export default function LockIcon() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function LockIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/LogOutIcon.tsx b/packages/client/src/svgs/LogOutIcon.tsx
index 754ea10a77..de5a5eb299 100644
--- a/packages/client/src/svgs/LogOutIcon.tsx
+++ b/packages/client/src/svgs/LogOutIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function LogOutIcon() {
+export default function LogOutIcon(): JSX.Element {
return (
<svg
width="18"
diff --git a/packages/client/src/svgs/MCPIcon.tsx b/packages/client/src/svgs/MCPIcon.tsx
index f5db9df940..558b75508c 100644
--- a/packages/client/src/svgs/MCPIcon.tsx
+++ b/packages/client/src/svgs/MCPIcon.tsx
@@ -1,4 +1,6 @@
-export default function MCPIcon({ className }: { className?: string }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function MCPIcon({ className }: { className?: string }): JSX.Element {
return (
<svg
width="195"
diff --git a/packages/client/src/svgs/MessagesSquared.tsx b/packages/client/src/svgs/MessagesSquared.tsx
index 58582d0e4f..939d355481 100644
--- a/packages/client/src/svgs/MessagesSquared.tsx
+++ b/packages/client/src/svgs/MessagesSquared.tsx
@@ -1,6 +1,7 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
-export default function MessagesSquared({ className }: { className?: string }) {
+export default function MessagesSquared({ className }: { className?: string }): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/MinimalPlugin.tsx b/packages/client/src/svgs/MinimalPlugin.tsx
index d38a3180e0..ef9b712f82 100644
--- a/packages/client/src/svgs/MinimalPlugin.tsx
+++ b/packages/client/src/svgs/MinimalPlugin.tsx
@@ -1,10 +1,12 @@
+import { JSX } from 'react/jsx-runtime';
+
export default function MinimalPlugin({
size,
className = 'icon-md',
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
width={size}
diff --git a/packages/client/src/svgs/MobileSidebar.tsx b/packages/client/src/svgs/MobileSidebar.tsx
index 999de0b91c..a9e4e0703d 100644
--- a/packages/client/src/svgs/MobileSidebar.tsx
+++ b/packages/client/src/svgs/MobileSidebar.tsx
@@ -1,4 +1,6 @@
-export default function MobileSidebar({ className }: { className?: string }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function MobileSidebar({ className }: { className?: string }): JSX.Element {
return (
<svg
width="24"
diff --git a/packages/client/src/svgs/MoonshotIcon.tsx b/packages/client/src/svgs/MoonshotIcon.tsx
index 599de9f058..821174e5ac 100644
--- a/packages/client/src/svgs/MoonshotIcon.tsx
+++ b/packages/client/src/svgs/MoonshotIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function MoonshotIcon({ className = '' }: { className?: string }) {
+export default function MoonshotIcon({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/NewChatIcon.tsx b/packages/client/src/svgs/NewChatIcon.tsx
index 20ae52863d..ac0a2537b4 100644
--- a/packages/client/src/svgs/NewChatIcon.tsx
+++ b/packages/client/src/svgs/NewChatIcon.tsx
@@ -1,5 +1,6 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function NewChatIcon({ className = '' }: { className?: string }) {
+export default function NewChatIcon({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
width="16"
diff --git a/packages/client/src/svgs/OpenAIMinimalIcon.tsx b/packages/client/src/svgs/OpenAIMinimalIcon.tsx
index 36dd2bc517..ecb8f8e167 100644
--- a/packages/client/src/svgs/OpenAIMinimalIcon.tsx
+++ b/packages/client/src/svgs/OpenAIMinimalIcon.tsx
@@ -1,4 +1,10 @@
-export default function OpenAIMinimalIcon({ className = 'h-4 w-4' }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function OpenAIMinimalIcon({
+ className = 'h-4 w-4',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/OpenIDIcon.tsx b/packages/client/src/svgs/OpenIDIcon.tsx
index 88702c19d0..aaae6b5852 100644
--- a/packages/client/src/svgs/OpenIDIcon.tsx
+++ b/packages/client/src/svgs/OpenIDIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function OpenIDIcon() {
+export default function OpenIDIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/PaLMIcon.tsx b/packages/client/src/svgs/PaLMIcon.tsx
index 90358c4ba7..5d58b101c0 100644
--- a/packages/client/src/svgs/PaLMIcon.tsx
+++ b/packages/client/src/svgs/PaLMIcon.tsx
@@ -1,10 +1,12 @@
+import { JSX } from 'react/jsx-runtime';
+
export default function PaLMIcon({
size = 25,
className = '',
}: {
size?: number;
className?: string;
-}) {
+}): JSX.Element {
return (
<svg
// width="100%"
diff --git a/packages/client/src/svgs/PaLMinimalIcon.tsx b/packages/client/src/svgs/PaLMinimalIcon.tsx
index 5cfb909167..e236ef7d68 100644
--- a/packages/client/src/svgs/PaLMinimalIcon.tsx
+++ b/packages/client/src/svgs/PaLMinimalIcon.tsx
@@ -1,5 +1,6 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function PaLMinimalIcon({ className = '' }: { className?: string }) {
+export default function PaLMinimalIcon({ className = '' }: { className?: string }): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/PersonalizationIcon.tsx b/packages/client/src/svgs/PersonalizationIcon.tsx
index a40dcbc86a..54f8914bc3 100644
--- a/packages/client/src/svgs/PersonalizationIcon.tsx
+++ b/packages/client/src/svgs/PersonalizationIcon.tsx
@@ -1,4 +1,10 @@
-export default function PersonalizationIcon({ className = '' }: { className?: string }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function PersonalizationIcon({
+ className = '',
+}: {
+ className?: string;
+}): JSX.Element {
return (
<svg
width="24"
diff --git a/packages/client/src/svgs/PinIcon.tsx b/packages/client/src/svgs/PinIcon.tsx
index 322268e508..458ea8814c 100644
--- a/packages/client/src/svgs/PinIcon.tsx
+++ b/packages/client/src/svgs/PinIcon.tsx
@@ -1,4 +1,6 @@
-export default function PinIcon({ unpin = false }: { unpin?: boolean }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function PinIcon({ unpin = false }: { unpin?: boolean }): JSX.Element {
if (unpin) {
return (
<svg
diff --git a/packages/client/src/svgs/Plugin.tsx b/packages/client/src/svgs/Plugin.tsx
index 37fdea05c8..ab0f55a00e 100644
--- a/packages/client/src/svgs/Plugin.tsx
+++ b/packages/client/src/svgs/Plugin.tsx
@@ -1,6 +1,8 @@
+import { JSX } from 'react/jsx-runtime';
+import type { SVGProps } from 'react';
import { cn } from '~/utils/';
-export default function Plugin({ className = '', ...props }) {
+export default function Plugin({ className = '', ...props }: SVGProps<SVGSVGElement>): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/RegenerateIcon.tsx b/packages/client/src/svgs/RegenerateIcon.tsx
index d7ca1cbbe4..078ec21798 100644
--- a/packages/client/src/svgs/RegenerateIcon.tsx
+++ b/packages/client/src/svgs/RegenerateIcon.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function RegenerateIcon({ className = '', size = '1em' }) {
+export default function RegenerateIcon({
+ className = '',
+ size = '1em',
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/RenameIcon.tsx b/packages/client/src/svgs/RenameIcon.tsx
index 4dc5f7cfed..4fd2d05118 100644
--- a/packages/client/src/svgs/RenameIcon.tsx
+++ b/packages/client/src/svgs/RenameIcon.tsx
@@ -1,4 +1,6 @@
-export default function RenameIcon() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function RenameIcon(): JSX.Element {
return (
<svg
fill="none"
diff --git a/packages/client/src/svgs/SamlIcon.tsx b/packages/client/src/svgs/SamlIcon.tsx
index eac9c9d7d5..7cee28801c 100644
--- a/packages/client/src/svgs/SamlIcon.tsx
+++ b/packages/client/src/svgs/SamlIcon.tsx
@@ -8,8 +8,9 @@
* - AUTHOR: HashiCorp
*/
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function SamlIcon() {
+export default function SamlIcon(): JSX.Element {
return (
<svg
width="800px"
diff --git a/packages/client/src/svgs/SaveIcon.tsx b/packages/client/src/svgs/SaveIcon.tsx
index 737889cc90..ca32cb7d36 100644
--- a/packages/client/src/svgs/SaveIcon.tsx
+++ b/packages/client/src/svgs/SaveIcon.tsx
@@ -1,9 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
+
type SaveIconProps = {
size?: string | number;
className?: string;
};
-export default function SaveIcon({ size = '1em', className }: SaveIconProps) {
+export default function SaveIcon({ size = '1em', className }: SaveIconProps): JSX.Element {
return (
<svg
viewBox="64 64 896 896"
diff --git a/packages/client/src/svgs/SendIcon.tsx b/packages/client/src/svgs/SendIcon.tsx
index 703c645f0b..f68ee176e9 100644
--- a/packages/client/src/svgs/SendIcon.tsx
+++ b/packages/client/src/svgs/SendIcon.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function SendIcon({ size = 24, className = '' }) {
+export default function SendIcon({
+ size = 24,
+ className = '',
+}: {
+ size?: number | undefined;
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
width={size}
diff --git a/packages/client/src/svgs/SendMessageIcon.tsx b/packages/client/src/svgs/SendMessageIcon.tsx
index a48c868bdb..3aef3c976d 100644
--- a/packages/client/src/svgs/SendMessageIcon.tsx
+++ b/packages/client/src/svgs/SendMessageIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function SendMessageIcon() {
+export default function SendMessageIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/SharePointIcon.tsx b/packages/client/src/svgs/SharePointIcon.tsx
index 5764a27a1c..caa77ee637 100644
--- a/packages/client/src/svgs/SharePointIcon.tsx
+++ b/packages/client/src/svgs/SharePointIcon.tsx
@@ -1,5 +1,10 @@
import React from 'react';
-export default function SharePointIcon({ className = '' }) {
+import { JSX } from 'react/jsx-runtime';
+export default function SharePointIcon({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
fill="currentColor"
diff --git a/packages/client/src/svgs/SheetPaths.tsx b/packages/client/src/svgs/SheetPaths.tsx
index a98e14cae3..1902a56bc7 100644
--- a/packages/client/src/svgs/SheetPaths.tsx
+++ b/packages/client/src/svgs/SheetPaths.tsx
@@ -1,4 +1,6 @@
-export default function SheetPaths() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function SheetPaths(): JSX.Element {
return (
<>
<path
diff --git a/packages/client/src/svgs/Sidebar.tsx b/packages/client/src/svgs/Sidebar.tsx
index 910343cfb2..17b155d22c 100644
--- a/packages/client/src/svgs/Sidebar.tsx
+++ b/packages/client/src/svgs/Sidebar.tsx
@@ -1,4 +1,6 @@
-export default function Sidebar({ className }: { className?: string }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function Sidebar({ className }: { className?: string }): JSX.Element {
return (
<svg
width="24"
diff --git a/packages/client/src/svgs/Sparkles.tsx b/packages/client/src/svgs/Sparkles.tsx
index 8b1604dd84..dd8582b79e 100644
--- a/packages/client/src/svgs/Sparkles.tsx
+++ b/packages/client/src/svgs/Sparkles.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function Sparkles({ className = '', size = 24 }) {
+export default function Sparkles({
+ className = '',
+ size = 24,
+}: {
+ className?: string | undefined;
+ size?: number | undefined;
+}): JSX.Element {
return (
<svg
width={size}
diff --git a/packages/client/src/svgs/SpeechIcon.tsx b/packages/client/src/svgs/SpeechIcon.tsx
index f3e74f3e66..abc8f37173 100644
--- a/packages/client/src/svgs/SpeechIcon.tsx
+++ b/packages/client/src/svgs/SpeechIcon.tsx
@@ -1,10 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
type SpeechIconProps = {
className?: string;
};
-export default function SpeechIcon({ className }: SpeechIconProps) {
+export default function SpeechIcon({ className }: SpeechIconProps): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/Spinner.tsx b/packages/client/src/svgs/Spinner.tsx
index 84fbf8f327..b61af9d119 100644
--- a/packages/client/src/svgs/Spinner.tsx
+++ b/packages/client/src/svgs/Spinner.tsx
@@ -1,3 +1,4 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils/';
interface SpinnerProps {
@@ -14,7 +15,7 @@ export default function Spinner({
color = 'currentColor',
bgOpacity = 0.1,
speed = 0.75,
-}: SpinnerProps) {
+}: SpinnerProps): JSX.Element {
const cssVars = {
'--spinner-speed': `${speed}s`,
} as React.CSSProperties;
diff --git a/packages/client/src/svgs/SquirclePlusIcon.tsx b/packages/client/src/svgs/SquirclePlusIcon.tsx
index c7548f2c7d..ce2837bba1 100644
--- a/packages/client/src/svgs/SquirclePlusIcon.tsx
+++ b/packages/client/src/svgs/SquirclePlusIcon.tsx
@@ -1,4 +1,6 @@
-export default function SquirclePlusIcon() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function SquirclePlusIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/StopGeneratingIcon.tsx b/packages/client/src/svgs/StopGeneratingIcon.tsx
index 35d19ca02e..fd3155146f 100644
--- a/packages/client/src/svgs/StopGeneratingIcon.tsx
+++ b/packages/client/src/svgs/StopGeneratingIcon.tsx
@@ -1,6 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function StopGeneratingIcon({ className = '' }: { className?: string }) {
+export default function StopGeneratingIcon({
+ className = '',
+}: {
+ className?: string;
+}): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/SunIcon.tsx b/packages/client/src/svgs/SunIcon.tsx
index b0842d346a..eeb69d364d 100644
--- a/packages/client/src/svgs/SunIcon.tsx
+++ b/packages/client/src/svgs/SunIcon.tsx
@@ -1,6 +1,7 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function SunIcon() {
+export default function SunIcon(): JSX.Element {
return (
<svg
stroke="currentColor"
diff --git a/packages/client/src/svgs/SwitchIcon.tsx b/packages/client/src/svgs/SwitchIcon.tsx
index e97cf24f3b..582bb8e844 100644
--- a/packages/client/src/svgs/SwitchIcon.tsx
+++ b/packages/client/src/svgs/SwitchIcon.tsx
@@ -1,9 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
+
type SwitchIconProps = {
size?: string | number;
className?: string;
};
-export default function SwitchIcon({ size = '1em', className }: SwitchIconProps) {
+export default function SwitchIcon({ size = '1em', className }: SwitchIconProps): JSX.Element {
return (
<svg
viewBox="64 64 896 896"
diff --git a/packages/client/src/svgs/TextPaths.tsx b/packages/client/src/svgs/TextPaths.tsx
index 89d7353b6d..04d4521b29 100644
--- a/packages/client/src/svgs/TextPaths.tsx
+++ b/packages/client/src/svgs/TextPaths.tsx
@@ -1,4 +1,6 @@
-export default function TextPaths() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function TextPaths(): JSX.Element {
return (
<>
<path
diff --git a/packages/client/src/svgs/ThumbDownIcon.tsx b/packages/client/src/svgs/ThumbDownIcon.tsx
index 581222ee0d..92027b2328 100644
--- a/packages/client/src/svgs/ThumbDownIcon.tsx
+++ b/packages/client/src/svgs/ThumbDownIcon.tsx
@@ -1,4 +1,14 @@
-export default function ThumbDownIcon({ className = '', size = '1em', bold = false }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function ThumbDownIcon({
+ className = '',
+ size = '1em',
+ bold = false,
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+ bold?: boolean | undefined;
+}): JSX.Element {
return bold ? (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/ThumbUpIcon.tsx b/packages/client/src/svgs/ThumbUpIcon.tsx
index 33f1495dcb..7a86e98602 100644
--- a/packages/client/src/svgs/ThumbUpIcon.tsx
+++ b/packages/client/src/svgs/ThumbUpIcon.tsx
@@ -1,4 +1,14 @@
-export default function ThumbUpIcon({ className = '', size = '1em', bold = false }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function ThumbUpIcon({
+ className = '',
+ size = '1em',
+ bold = false,
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+ bold?: boolean | undefined;
+}): JSX.Element {
return bold ? (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/TrashIcon.tsx b/packages/client/src/svgs/TrashIcon.tsx
index fcab75beed..85c94ee667 100644
--- a/packages/client/src/svgs/TrashIcon.tsx
+++ b/packages/client/src/svgs/TrashIcon.tsx
@@ -1,10 +1,11 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
type TrashIconProps = {
className?: string;
};
-export default function TrashIcon({ className = '' }: TrashIconProps) {
+export default function TrashIcon({ className = '' }: TrashIconProps): JSX.Element {
return (
<svg
fill="none"
diff --git a/packages/client/src/svgs/UserIcon.tsx b/packages/client/src/svgs/UserIcon.tsx
index 1003f08222..928dc98282 100644
--- a/packages/client/src/svgs/UserIcon.tsx
+++ b/packages/client/src/svgs/UserIcon.tsx
@@ -1,4 +1,6 @@
-export default function UserIcon() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function UserIcon(): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/svgs/VectorIcon.tsx b/packages/client/src/svgs/VectorIcon.tsx
index 57aaa363ee..3889680f64 100644
--- a/packages/client/src/svgs/VectorIcon.tsx
+++ b/packages/client/src/svgs/VectorIcon.tsx
@@ -1,4 +1,6 @@
-export default function VectorIcon({ className }: { className?: string }) {
+import { JSX } from 'react/jsx-runtime';
+
+export default function VectorIcon({ className }: { className?: string }): JSX.Element {
return (
<svg
width="20"
diff --git a/packages/client/src/svgs/VideoPaths.tsx b/packages/client/src/svgs/VideoPaths.tsx
index 6876824e42..9a28e1dd4e 100644
--- a/packages/client/src/svgs/VideoPaths.tsx
+++ b/packages/client/src/svgs/VideoPaths.tsx
@@ -1,4 +1,6 @@
-export default function VideoPaths() {
+import { JSX } from 'react/jsx-runtime';
+
+export default function VideoPaths(): JSX.Element {
return (
<>
{/* Video container - rounded rectangle (not filled) */}
diff --git a/packages/client/src/svgs/VolumeIcon.tsx b/packages/client/src/svgs/VolumeIcon.tsx
index f08784e884..42e043a499 100644
--- a/packages/client/src/svgs/VolumeIcon.tsx
+++ b/packages/client/src/svgs/VolumeIcon.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function VolumeIcon({ className = '', size = '1em' }) {
+export default function VolumeIcon({
+ className = '',
+ size = '1em',
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+}): JSX.Element {
return (
<svg
viewBox="0 0 24 24"
diff --git a/packages/client/src/svgs/VolumeMuteIcon.tsx b/packages/client/src/svgs/VolumeMuteIcon.tsx
index 29a9954503..6f6aa8f0b5 100644
--- a/packages/client/src/svgs/VolumeMuteIcon.tsx
+++ b/packages/client/src/svgs/VolumeMuteIcon.tsx
@@ -1,6 +1,13 @@
+import { JSX } from 'react/jsx-runtime';
import { cn } from '~/utils';
-export default function VolumeMuteIcon({ className = '', size = '1em' }) {
+export default function VolumeMuteIcon({
+ className = '',
+ size = '1em',
+}: {
+ className?: string | undefined;
+ size?: string | undefined;
+}): JSX.Element {
return (
<svg
viewBox="0 0 24 24"
diff --git a/packages/client/src/svgs/XAIcon.tsx b/packages/client/src/svgs/XAIcon.tsx
index 2ee679dcd3..ea4a1fc8b5 100644
--- a/packages/client/src/svgs/XAIcon.tsx
+++ b/packages/client/src/svgs/XAIcon.tsx
@@ -1,6 +1,11 @@
import React from 'react';
+import { JSX } from 'react/jsx-runtime';
-export default function XAIcon({ className = '' }) {
+export default function XAIcon({
+ className = '',
+}: {
+ className?: string | undefined;
+}): JSX.Element {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/theme/atoms/themeAtoms.ts b/packages/client/src/theme/atoms/themeAtoms.ts
index 0babc4036b..5923b18183 100644
--- a/packages/client/src/theme/atoms/themeAtoms.ts
+++ b/packages/client/src/theme/atoms/themeAtoms.ts
@@ -1,36 +1,49 @@
// This file is kept for backward compatibility but is no longer used internally.
// Theme state is now managed via React useState + localStorage in ThemeProvider.
-import { atomWithStorage } from 'jotai/utils';
+import { WritableAtom } from 'jotai';
+import { atomWithStorage, RESET } from 'jotai/utils';
import { IThemeRGB } from '../types';
/**
* @deprecated Use ThemeContext instead. This atom is no longer used internally.
*/
-export const themeModeAtom = atomWithStorage<string>('color-theme', 'system', undefined, {
+export const themeModeAtom: WritableAtom<
+ string,
+ [string | typeof RESET | ((prev: string) => string | typeof RESET)],
+ void
+> = atomWithStorage<string>('color-theme', 'system', undefined, {
getOnInit: true,
});
/**
* @deprecated Use ThemeContext instead. This atom is no longer used internally.
*/
-export const themeColorsAtom = atomWithStorage<IThemeRGB | undefined>(
- 'theme-colors',
- undefined,
- undefined,
- {
- getOnInit: true,
- },
-);
+export const themeColorsAtom: WritableAtom<
+ IThemeRGB | undefined,
+ [
+ | IThemeRGB
+ | typeof RESET
+ | ((prev: IThemeRGB | undefined) => IThemeRGB | typeof RESET | undefined)
+ | undefined,
+ ],
+ void
+> = atomWithStorage<IThemeRGB | undefined>('theme-colors', undefined, undefined, {
+ getOnInit: true,
+});
/**
* @deprecated Use ThemeContext instead. This atom is no longer used internally.
*/
-export const themeNameAtom = atomWithStorage<string | undefined>(
- 'theme-name',
- undefined,
- undefined,
- {
- getOnInit: true,
- },
-);
+export const themeNameAtom: WritableAtom<
+ string | undefined,
+ [
+ | string
+ | typeof RESET
+ | ((prev: string | undefined) => string | typeof RESET | undefined)
+ | undefined,
+ ],
+ void
+> = atomWithStorage<string | undefined>('theme-name', undefined, undefined, {
+ getOnInit: true,
+});
diff --git a/packages/client/src/theme/context/ThemeProvider.tsx b/packages/client/src/theme/context/ThemeProvider.tsx
index 4e654b0464..8872fd6210 100644
--- a/packages/client/src/theme/context/ThemeProvider.tsx
+++ b/packages/client/src/theme/context/ThemeProvider.tsx
@@ -7,8 +7,9 @@ import React, {
useState,
useRef,
} from 'react';
-import { IThemeRGB } from '../types';
+import { JSX } from 'react/jsx-runtime';
import applyTheme from '../utils/applyTheme';
+import { IThemeRGB } from '../types';
const THEME_KEY = 'color-theme';
const THEME_COLORS_KEY = 'theme-colors';
@@ -25,7 +26,7 @@ type ThemeContextType = {
};
// Export ThemeContext so it can be imported from hooks
-export const ThemeContext = createContext<ThemeContextType>({
+export const ThemeContext: React.Context<ThemeContextType> = createContext<ThemeContextType>({
theme: 'system',
setTheme: () => undefined,
setThemeRGB: () => undefined,
@@ -123,7 +124,7 @@ export function ThemeProvider({
themeRGB: propThemeRGB,
themeName: propThemeName,
initialTheme,
-}: ThemeProviderProps) {
+}: ThemeProviderProps): JSX.Element {
const [theme, setThemeState] = useState<string>(getInitialTheme);
const [themeRGB, setThemeRGBState] = useState<IThemeRGB | undefined>(getInitialThemeColors);
const [themeName, setThemeNameState] = useState<string | undefined>(getInitialThemeName);
@@ -254,7 +255,7 @@ export function ThemeProvider({
/**
* Hook to access the current theme context
*/
-export function useTheme() {
+export function useTheme(): ThemeContextType {
const context = useContext(ThemeContext);
if (!context) {
throw new Error('useTheme must be used within a ThemeProvider');
diff --git a/packages/client/src/theme/utils/applyTheme.ts b/packages/client/src/theme/utils/applyTheme.ts
index f98db54dd8..b3fc4514b8 100644
--- a/packages/client/src/theme/utils/applyTheme.ts
+++ b/packages/client/src/theme/utils/applyTheme.ts
@@ -93,7 +93,7 @@ function mapTheme(rgb: IThemeRGB): Partial<IThemeVariables> {
* Applies theme to the document root
* Sets CSS variables as rgb() values for compatibility with existing CSS
*/
-export default function applyTheme(themeRGB?: IThemeRGB) {
+export default function applyTheme(themeRGB?: IThemeRGB): void {
if (!themeRGB) return;
const themeObject = mapTheme(themeRGB);
diff --git a/packages/client/src/utils/logger.ts b/packages/client/src/utils/logger.ts
index 73e4fac5a5..4830ba7fe4 100644
--- a/packages/client/src/utils/logger.ts
+++ b/packages/client/src/utils/logger.ts
@@ -24,7 +24,14 @@ const createLogFunction = (
};
};
-const logger = {
+const logger: {
+ log: LogFunction;
+ dir: LogFunction;
+ warn: LogFunction;
+ info: LogFunction;
+ error: LogFunction;
+ debug: LogFunction;
+} = {
log: createLogFunction(console.log, 'log'),
dir: createLogFunction(console.dir, 'dir'),
warn: createLogFunction(console.warn, 'warn'),
diff --git a/packages/client/src/utils/theme.ts b/packages/client/src/utils/theme.ts
index a5bc645a07..e84e05f45c 100644
--- a/packages/client/src/utils/theme.ts
+++ b/packages/client/src/utils/theme.ts
@@ -1,4 +1,4 @@
-export const applyFontSize = (val: string) => {
+export const applyFontSize = (val: string): void => {
const root = document.documentElement;
const size = val.split('-')[1]; // This will be 'xs', 'sm', 'base', 'lg', or 'xl'
@@ -21,7 +21,7 @@ export const applyFontSize = (val: string) => {
}
};
-export const getInitialTheme = () => {
+export const getInitialTheme = (): string => {
if (typeof window !== 'undefined' && window.localStorage) {
const storedPrefs = window.localStorage.getItem('color-theme');
if (typeof storedPrefs === 'string') {
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index e15bc2ab53..65b1eb1f72 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -8,6 +8,7 @@
"declaration": true,
"declarationMap": true,
"declarationDir": "./dist/types",
+ "isolatedDeclarations": true,
"sourceMap": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
diff --git a/packages/client/tsdown.config.mjs b/packages/client/tsdown.config.mjs
new file mode 100644
index 0000000000..cbb178a929
--- /dev/null
+++ b/packages/client/tsdown.config.mjs
@@ -0,0 +1,32 @@
+import { defineConfig } from 'tsdown';
+
+// Mirror the prior Rollup `@rollup/plugin-replace` substitutions: only these three are
+// baked at lib-build time. `import.meta.env.MODE` and `REACT_APP_*` are intentionally left
+// intact so the consuming Vite app resolves them at app-build time.
+const define = {
+ 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
+ 'process.env.VITE_ENABLE_LOGGER': JSON.stringify(process.env.VITE_ENABLE_LOGGER || 'false'),
+ 'process.env.VITE_LOGGER_FILTER': JSON.stringify(process.env.VITE_LOGGER_FILTER || ''),
+};
+
+export default defineConfig({
+ entry: ['src/index.ts'],
+ format: ['esm', 'cjs'],
+ platform: 'browser',
+ dts: { oxc: true },
+ outDir: 'dist',
+ sourcemap: true,
+ // Force .mjs/.cjs (and .d.mts/.d.cts) regardless of package `type`, so the package can stay
+ // CommonJS (jest.config.js / babel.config.js are CJS) while still shipping dual ESM/CJS.
+ fixedExtension: true,
+ define,
+ // Extract all component CSS into a single `dist/style.css` (no import left in the JS, so the
+ // CJS output stays valid CommonJS). Consumers import `@librechat/client/style.css` once.
+ css: { inject: false },
+ // Externalize every third-party import (consumers provide the peers + react/jsx-runtime);
+ // bundle only relative, `~`-aliased, and absolute sources.
+ deps: {
+ neverBundle: (id) => !id.startsWith('.') && !id.startsWith('~') && !id.startsWith('/'),
+ onlyBundle: false,
+ },
+});
diff --git a/turbo.json b/turbo.json
index e3b8c98be7..c7b3738753 100644
--- a/turbo.json
+++ b/turbo.json
@@ -13,6 +13,7 @@
"scripts/**",
"rollup.config.js",
"server-rollup.config.js",
+ "tsdown.config.mjs",
"tsconfig.json",
"tsconfig.build.json",
"vite.config.ts",