From b3b061fc2e251c98048abf912db62b1042768ddd Mon Sep 17 00:00:00 2001 From: Giancarlo Buomprisco Date: Tue, 3 Sep 2024 18:17:11 +0800 Subject: [PATCH 1/2] Remove RQ experimental (#60) * Updated dependencies * Remove RQ Experimental - unused and some customers report issues with it --- apps/e2e/package.json | 2 +- apps/web/components/root-providers.tsx | 41 +- apps/web/package.json | 5 +- packages/analytics/package.json | 2 +- packages/billing/gateway/package.json | 2 +- packages/cms/core/package.json | 2 +- packages/cms/keystatic/package.json | 2 +- packages/cms/wordpress/package.json | 2 +- packages/email-templates/package.json | 2 +- packages/features/accounts/package.json | 2 +- packages/features/admin/package.json | 2 +- packages/features/auth/package.json | 2 +- packages/features/notifications/package.json | 2 +- packages/features/team-accounts/package.json | 2 +- packages/shared/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 376 ++++++++++--------- tooling/eslint/package.json | 8 +- tooling/tailwind/package.json | 2 +- 19 files changed, 239 insertions(+), 221 deletions(-) diff --git a/apps/e2e/package.json b/apps/e2e/package.json index 3d77a2bb3..b1d6bc431 100644 --- a/apps/e2e/package.json +++ b/apps/e2e/package.json @@ -13,7 +13,7 @@ "license": "ISC", "devDependencies": { "@playwright/test": "^1.46.1", - "@types/node": "^22.5.1", + "@types/node": "^22.5.2", "node-html-parser": "^6.1.13" } } diff --git a/apps/web/components/root-providers.tsx b/apps/web/components/root-providers.tsx index 4d1d7068d..fcc3fa4a0 100644 --- a/apps/web/components/root-providers.tsx +++ b/apps/web/components/root-providers.tsx @@ -4,7 +4,6 @@ import { useMemo } from 'react'; import dynamic from 'next/dynamic'; -import { ReactQueryStreamedHydration } from '@tanstack/react-query-next-experimental'; import { ThemeProvider } from 'next-themes'; import { CaptchaProvider } from '@kit/auth/captcha/client'; @@ -53,29 +52,27 @@ export function RootProviders({ - - - - + + + - - - {children} - - - + + + {children} + + + - - - - - + + + + diff --git a/apps/web/package.json b/apps/web/package.json index 890f78bab..f31345aa6 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -57,10 +57,9 @@ "@radix-ui/react-icons": "^1.3.0", "@supabase/supabase-js": "^2.45.3", "@tanstack/react-query": "5.52.2", - "@tanstack/react-query-next-experimental": "^5.53.1", "@tanstack/react-table": "^8.20.5", "date-fns": "^3.6.0", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "next": "14.2.7", "next-sitemap": "^4.2.3", "next-themes": "0.3.0", @@ -80,7 +79,7 @@ "@kit/tsconfig": "workspace:^", "@next/bundle-analyzer": "14.2.7", "@types/mdx": "^2.0.13", - "@types/node": "^22.5.1", + "@types/node": "^22.5.2", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "autoprefixer": "^10.4.20", diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 7849e7105..35ab17e5c 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -17,7 +17,7 @@ "@kit/prettier-config": "workspace:*", "@kit/tailwind-config": "workspace:*", "@kit/tsconfig": "workspace:*", - "@types/node": "^22.5.1" + "@types/node": "^22.5.2" }, "eslintConfig": { "root": true, diff --git a/packages/billing/gateway/package.json b/packages/billing/gateway/package.json index 8d94a2c24..10a9bf840 100644 --- a/packages/billing/gateway/package.json +++ b/packages/billing/gateway/package.json @@ -30,7 +30,7 @@ "@supabase/supabase-js": "^2.45.3", "@types/react": "^18.3.5", "date-fns": "^3.6.0", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "next": "14.2.7", "react": "18.3.1", "react-hook-form": "^7.53.0", diff --git a/packages/cms/core/package.json b/packages/cms/core/package.json index 0dd98fa0f..c3b70cba4 100644 --- a/packages/cms/core/package.json +++ b/packages/cms/core/package.json @@ -16,7 +16,7 @@ "@kit/eslint-config": "workspace:*", "@kit/prettier-config": "workspace:*", "@kit/tsconfig": "workspace:*", - "@types/node": "^22.5.1" + "@types/node": "^22.5.2" }, "eslintConfig": { "root": true, diff --git a/packages/cms/keystatic/package.json b/packages/cms/keystatic/package.json index 9e4c2d154..8b268aec4 100644 --- a/packages/cms/keystatic/package.json +++ b/packages/cms/keystatic/package.json @@ -25,7 +25,7 @@ "@kit/prettier-config": "workspace:*", "@kit/tsconfig": "workspace:*", "@kit/ui": "workspace:^", - "@types/node": "^22.5.1", + "@types/node": "^22.5.2", "@types/react": "^18.3.5", "react": "18.3.1", "zod": "^3.23.8" diff --git a/packages/cms/wordpress/package.json b/packages/cms/wordpress/package.json index e2cce3da1..773ec4afb 100644 --- a/packages/cms/wordpress/package.json +++ b/packages/cms/wordpress/package.json @@ -19,7 +19,7 @@ "@kit/prettier-config": "workspace:*", "@kit/tsconfig": "workspace:*", "@kit/ui": "workspace:^", - "@types/node": "^22.5.1", + "@types/node": "^22.5.2", "wp-types": "^4.66.1" }, "eslintConfig": { diff --git a/packages/email-templates/package.json b/packages/email-templates/package.json index 8f1562102..43918fd6e 100644 --- a/packages/email-templates/package.json +++ b/packages/email-templates/package.json @@ -13,7 +13,7 @@ ".": "./src/index.ts" }, "dependencies": { - "@react-email/components": "0.0.24" + "@react-email/components": "0.0.25" }, "devDependencies": { "@kit/eslint-config": "workspace:*", diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json index b408b5dda..7408e2159 100644 --- a/packages/features/accounts/package.json +++ b/packages/features/accounts/package.json @@ -38,7 +38,7 @@ "@tanstack/react-query": "5.52.2", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "next": "14.2.7", "next-themes": "0.3.0", "react": "18.3.1", diff --git a/packages/features/admin/package.json b/packages/features/admin/package.json index 1906a9cf8..078741203 100644 --- a/packages/features/admin/package.json +++ b/packages/features/admin/package.json @@ -25,7 +25,7 @@ "@tanstack/react-query": "5.52.2", "@tanstack/react-table": "^8.20.5", "@types/react": "^18.3.5", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "next": "14.2.7", "react": "18.3.1", "react-dom": "18.3.1", diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json index d4a9dbaa1..f34fa21f2 100644 --- a/packages/features/auth/package.json +++ b/packages/features/auth/package.json @@ -31,7 +31,7 @@ "@supabase/supabase-js": "^2.45.3", "@tanstack/react-query": "5.52.2", "@types/react": "^18.3.5", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "next": "14.2.7", "react-hook-form": "^7.53.0", "react-i18next": "^15.0.1", diff --git a/packages/features/notifications/package.json b/packages/features/notifications/package.json index ed850bba6..00e27e867 100644 --- a/packages/features/notifications/package.json +++ b/packages/features/notifications/package.json @@ -23,7 +23,7 @@ "@supabase/supabase-js": "^2.45.3", "@tanstack/react-query": "5.52.2", "@types/react": "^18.3.5", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "react": "18.3.1", "react-dom": "18.3.1", "react-i18next": "^15.0.1" diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json index 58d77babf..e237cc2cb 100644 --- a/packages/features/team-accounts/package.json +++ b/packages/features/team-accounts/package.json @@ -39,7 +39,7 @@ "@types/react-dom": "^18.3.0", "class-variance-authority": "^0.7.0", "date-fns": "^3.6.0", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "next": "14.2.7", "react": "18.3.1", "react-dom": "18.3.1", diff --git a/packages/shared/package.json b/packages/shared/package.json index ddea96db7..ce8527971 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -23,7 +23,7 @@ "@types/react": "^18.3.5" }, "dependencies": { - "pino": "^9.3.2" + "pino": "^9.4.0" }, "eslintConfig": { "root": true, diff --git a/packages/ui/package.json b/packages/ui/package.json index 1ae811bd2..514df2908 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -31,7 +31,7 @@ "clsx": "^2.1.1", "cmdk": "1.0.0", "input-otp": "1.2.4", - "lucide-react": "^0.437.0", + "lucide-react": "^0.438.0", "react-top-loading-bar": "2.3.1", "recharts": "^2.12.7", "tailwind-merge": "^2.5.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d103f7729..ac05daca0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: version: 0.21.4 '@turbo/gen': specifier: ^2.1.1 - version: 2.1.1(@types/node@22.5.1)(typescript@5.5.4) + version: 2.1.1(@types/node@22.5.2)(typescript@5.5.4) cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -40,8 +40,8 @@ importers: specifier: ^1.46.1 version: 1.46.1 '@types/node': - specifier: ^22.5.1 - version: 22.5.1 + specifier: ^22.5.2 + version: 22.5.2 node-html-parser: specifier: ^6.1.13 version: 6.1.13 @@ -126,9 +126,6 @@ importers: '@tanstack/react-query': specifier: 5.52.2 version: 5.52.2(react@18.3.1) - '@tanstack/react-query-next-experimental': - specifier: ^5.53.1 - version: 5.53.1(@tanstack/react-query@5.52.2(react@18.3.1))(next@14.2.7(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@tanstack/react-table': specifier: ^8.20.5 version: 8.20.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -136,8 +133,8 @@ importers: specifier: ^3.6.0 version: 3.6.0 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) next: specifier: 14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -191,8 +188,8 @@ importers: specifier: ^2.0.13 version: 2.0.13 '@types/node': - specifier: ^22.5.1 - version: 22.5.1 + specifier: ^22.5.2 + version: 22.5.2 '@types/react': specifier: ^18.3.5 version: 18.3.5 @@ -216,7 +213,7 @@ importers: version: 1.191.3 tailwindcss: specifier: 3.4.10 - version: 3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)) + version: 3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -236,8 +233,8 @@ importers: specifier: workspace:* version: link:../../tooling/typescript '@types/node': - specifier: ^22.5.1 - version: 22.5.1 + specifier: ^22.5.2 + version: 22.5.2 packages/billing/core: devDependencies: @@ -308,8 +305,8 @@ importers: specifier: ^3.6.0 version: 3.6.0 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) next: specifier: 14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -433,8 +430,8 @@ importers: specifier: workspace:* version: link:../../../tooling/typescript '@types/node': - specifier: ^22.5.1 - version: 22.5.1 + specifier: ^22.5.2 + version: 22.5.2 packages/cms/keystatic: dependencies: @@ -464,8 +461,8 @@ importers: specifier: workspace:^ version: link:../../ui '@types/node': - specifier: ^22.5.1 - version: 22.5.1 + specifier: ^22.5.2 + version: 22.5.2 '@types/react': specifier: ^18.3.5 version: 18.3.5 @@ -494,8 +491,8 @@ importers: specifier: workspace:^ version: link:../../ui '@types/node': - specifier: ^22.5.1 - version: 22.5.1 + specifier: ^22.5.2 + version: 22.5.2 wp-types: specifier: ^4.66.1 version: 4.66.1 @@ -542,8 +539,8 @@ importers: packages/email-templates: dependencies: '@react-email/components': - specifier: 0.0.24 - version: 0.0.24(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 0.0.25 + version: 0.0.25(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@kit/eslint-config': specifier: workspace:* @@ -622,8 +619,8 @@ importers: specifier: ^18.3.0 version: 18.3.0 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) next: specifier: 14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -697,8 +694,8 @@ importers: specifier: ^18.3.5 version: 18.3.5 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) next: specifier: 14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -757,8 +754,8 @@ importers: specifier: ^18.3.5 version: 18.3.5 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) next: specifier: 14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -805,8 +802,8 @@ importers: specifier: ^18.3.5 version: 18.3.5 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) react: specifier: 18.3.1 version: 18.3.1 @@ -887,8 +884,8 @@ importers: specifier: ^3.6.0 version: 3.6.0 lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) next: specifier: 14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1122,8 +1119,8 @@ importers: packages/shared: dependencies: pino: - specifier: ^9.3.2 - version: 9.3.2 + specifier: ^9.4.0 + version: 9.4.0 devDependencies: '@kit/eslint-config': specifier: workspace:* @@ -1249,8 +1246,8 @@ importers: specifier: 1.2.4 version: 1.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) lucide-react: - specifier: ^0.437.0 - version: 0.437.0(react@18.3.1) + specifier: ^0.438.0 + version: 0.438.0(react@18.3.1) react-top-loading-bar: specifier: 2.3.1 version: 2.3.1(react@18.3.1) @@ -1320,10 +1317,10 @@ importers: version: 1.5.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwindcss: specifier: 3.4.10 - version: 3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)) + version: 3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)) tailwindcss-animate: specifier: ^1.0.7 - version: 1.0.7(tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4))) + version: 1.0.7(tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4))) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -1343,11 +1340,11 @@ importers: specifier: ^8.56.10 version: 8.56.10 '@typescript-eslint/eslint-plugin': - specifier: ^8.3.0 - version: 8.3.0(@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) + specifier: ^8.4.0 + version: 8.4.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) '@typescript-eslint/parser': - specifier: ^8.3.0 - version: 8.3.0(eslint@8.57.0)(typescript@5.5.4) + specifier: ^8.4.0 + version: 8.4.0(eslint@8.57.0)(typescript@5.5.4) eslint-config-prettier: specifier: ^9.1.0 version: 9.1.0(eslint@8.57.0) @@ -1355,11 +1352,11 @@ importers: specifier: ^2.1.1 version: 2.1.1(eslint@8.57.0) eslint-plugin-import: - specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0) + specifier: ^2.30.0 + version: 2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0) eslint-plugin-react: - specifier: ^7.35.0 - version: 7.35.0(eslint@8.57.0) + specifier: ^7.35.1 + version: 7.35.1(eslint@8.57.0) eslint-plugin-react-hooks: specifier: ^4.6.2 version: 4.6.2(eslint@8.57.0) @@ -1400,16 +1397,16 @@ importers: dependencies: autoprefixer: specifier: ^10.4.20 - version: 10.4.20(postcss@8.4.41) + version: 10.4.20(postcss@8.4.44) postcss: - specifier: 8.4.41 - version: 8.4.41 + specifier: 8.4.44 + version: 8.4.44 tailwindcss: specifier: 3.4.10 - version: 3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)) + version: 3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)) tailwindcss-animate: specifier: ^1.0.7 - version: 1.0.7(tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4))) + version: 1.0.7(tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4))) devDependencies: '@kit/eslint-config': specifier: workspace:^ @@ -3320,8 +3317,8 @@ packages: peerDependencies: react: 18.3.1 - '@react-email/code-block@0.0.8': - resolution: {integrity: sha512-WbuAEpTnB262i9C3SGPmmErgZ4iU5KIpqLUjr7uBJijqldLqZc5x39e8wPWaRdF7NLcShmrc/+G7GJgI1bdC5w==} + '@react-email/code-block@0.0.9': + resolution: {integrity: sha512-Zrhc71VYrSC1fVXJuaViKoB/dBjxLw6nbE53Bm/eUuZPdnnZ1+ZUIh8jfaRKC5MzMjgnLGQTweGXVnfIrhyxtQ==} engines: {node: '>=18.0.0'} peerDependencies: react: 18.3.1 @@ -3338,8 +3335,8 @@ packages: peerDependencies: react: 18.3.1 - '@react-email/components@0.0.24': - resolution: {integrity: sha512-/DNmfTREaT59UFdkHoIK3BewJ214LfRxmduiil3m7POj+gougkItANu1+BMmgbUATxjf7jH1WoBxo9x/rhFEFw==} + '@react-email/components@0.0.25': + resolution: {integrity: sha512-lnfVVrThEcET5NPoeaXvrz9UxtWpGRcut2a07dLbyKgNbP7vj/cXTI5TuHtanCvhCddFpMDnElNRghDOfPzwUg==} engines: {node: '>=18.0.0'} peerDependencies: react: 18.3.1 @@ -3715,6 +3712,9 @@ packages: rollup: optional: true + '@rtsao/scc@1.1.0': + resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==} + '@selderee/plugin-htmlparser2@0.11.0': resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==} @@ -3913,13 +3913,6 @@ packages: '@tanstack/query-core@5.52.2': resolution: {integrity: sha512-9vvbFecK4A0nDnrc/ks41e3UHONF1DAnGz8Tgbxkl59QcvKWmc0ewhYuIKRh8NC4ja5LTHT9EH16KHbn2AIYWA==} - '@tanstack/react-query-next-experimental@5.53.1': - resolution: {integrity: sha512-EmvJSE6JH6NnE9wX8FzY5PmnaJnyELTAcS9mxOvGOZJttZmLS+E8l8cdQZQToTzniXzeHCoQjvpuABETfgi4ng==} - peerDependencies: - '@tanstack/react-query': ^5.53.1 - next: ^13 || ^14 || ^15 - react: 18.3.1 - '@tanstack/react-query@5.52.2': resolution: {integrity: sha512-d4OwmobpP+6+SvuAxW1RzAY95Pv87Gu+0GjtErzFOUXo+n0FGcwxKvzhswCsXKxsgnAr3bU2eJ2u+GXQAutkCQ==} peerDependencies: @@ -4077,8 +4070,8 @@ packages: '@types/mysql@2.15.22': resolution: {integrity: sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==} - '@types/node@22.5.1': - resolution: {integrity: sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==} + '@types/node@22.5.2': + resolution: {integrity: sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==} '@types/nodemailer@6.4.15': resolution: {integrity: sha512-0EBJxawVNjPkng1zm2vopRctuWVCxk34JcIlRuXSf54habUWdz1FB7wHDqOqvDa8Mtpt0Q3LTXQkAs2LNyK5jQ==} @@ -4128,8 +4121,8 @@ packages: '@types/ws@8.5.12': resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==} - '@typescript-eslint/eslint-plugin@8.3.0': - resolution: {integrity: sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA==} + '@typescript-eslint/eslint-plugin@8.4.0': + resolution: {integrity: sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -4139,8 +4132,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.3.0': - resolution: {integrity: sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==} + '@typescript-eslint/parser@8.4.0': + resolution: {integrity: sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -4149,12 +4142,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.3.0': - resolution: {integrity: sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==} + '@typescript-eslint/scope-manager@8.4.0': + resolution: {integrity: sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.3.0': - resolution: {integrity: sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg==} + '@typescript-eslint/type-utils@8.4.0': + resolution: {integrity: sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -4162,12 +4155,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.3.0': - resolution: {integrity: sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==} + '@typescript-eslint/types@8.4.0': + resolution: {integrity: sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.3.0': - resolution: {integrity: sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==} + '@typescript-eslint/typescript-estree@8.4.0': + resolution: {integrity: sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -4175,14 +4168,14 @@ packages: typescript: optional: true - '@typescript-eslint/utils@8.3.0': - resolution: {integrity: sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==} + '@typescript-eslint/utils@8.4.0': + resolution: {integrity: sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - '@typescript-eslint/visitor-keys@8.3.0': - resolution: {integrity: sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==} + '@typescript-eslint/visitor-keys@8.4.0': + resolution: {integrity: sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@ungap/structured-clone@1.2.0': @@ -5036,8 +5029,8 @@ packages: eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} - eslint-module-utils@2.8.1: - resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==} + eslint-module-utils@2.9.0: + resolution: {integrity: sha512-McVbYmwA3NEKwRQY5g4aWMdcZE5xZxV8i8l7CqJSrameuGSQJtSWaL/LxTEzSKKaCcOhlpDR8XEfYXWPrdo/ZQ==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -5057,8 +5050,8 @@ packages: eslint-import-resolver-webpack: optional: true - eslint-plugin-import@2.29.1: - resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} + eslint-plugin-import@2.30.0: + resolution: {integrity: sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -5073,8 +5066,8 @@ packages: peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - eslint-plugin-react@7.35.0: - resolution: {integrity: sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==} + eslint-plugin-react@7.35.1: + resolution: {integrity: sha512-B5ok2JgbaaWn/zXbKCGgKDNL2tsID3Pd/c/yvjcpsd9HQDwyYc/TQv3AZMmOvrJgCs3AnYNUHRCQEMMQAYJ7Yg==} engines: {node: '>=4'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7 @@ -5617,13 +5610,14 @@ packages: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} - is-core-module@2.13.1: - resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} - is-core-module@2.15.0: resolution: {integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==} engines: {node: '>= 0.4'} + is-core-module@2.15.1: + resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==} + engines: {node: '>= 0.4'} + is-data-view@1.0.1: resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} engines: {node: '>= 0.4'} @@ -5941,8 +5935,8 @@ packages: resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} engines: {node: '>=12'} - lucide-react@0.437.0: - resolution: {integrity: sha512-RXQq6tnm1FlXDUtOwLaoXET2TOEGpQULrQlPOjGHgIVsPhicHNat9sWF33OAe2UCLMFiWF1oL+FtAg43BqVY4Q==} + lucide-react@0.438.0: + resolution: {integrity: sha512-uq6yCB+IzVfgIPMK8ibkecXSWTTSOMs9UjUgZigfrDCVqgdwkpIgYg1fSYnf0XXF2AoSyCJZhoZXQwzoai7VGw==} peerDependencies: react: 18.3.1 @@ -6335,6 +6329,10 @@ packages: object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} + object-inspect@1.13.2: + resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==} + engines: {node: '>= 0.4'} + object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} @@ -6513,6 +6511,9 @@ packages: picocolors@1.0.1: resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + picocolors@1.1.0: + resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} @@ -6531,8 +6532,8 @@ packages: pino-std-serializers@7.0.0: resolution: {integrity: sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==} - pino@9.3.2: - resolution: {integrity: sha512-WtARBjgZ7LNEkrGWxMBN/jvlFiE17LTbBoH0konmBU684Kd0uIiDwBXlcTCW7iJnA6HfIKwUssS/2AC6cDEanw==} + pino@9.4.0: + resolution: {integrity: sha512-nbkQb5+9YPhQRz/BeQmrWpEknAaqjpAqRK8NwJpmrX/JHu7JuZC5G1CeAwJDJfGes4h+YihC6in3Q2nGb+Y09w==} hasBin: true pirates@4.0.6: @@ -6603,6 +6604,10 @@ packages: resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} engines: {node: ^10 || ^12 || >=14} + postcss@8.4.44: + resolution: {integrity: sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==} + engines: {node: ^10 || ^12 || >=14} + postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} engines: {node: '>=4'} @@ -7024,8 +7029,8 @@ packages: resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} engines: {node: '>= 0.4'} - safe-stable-stringify@2.4.3: - resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==} + safe-stable-stringify@2.5.0: + resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==} engines: {node: '>=10'} safer-buffer@2.1.2: @@ -7152,8 +7157,8 @@ packages: resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==} engines: {node: '>= 10.0.0', npm: '>= 3.0.0'} - sonic-boom@4.0.1: - resolution: {integrity: sha512-hTSD/6JMLyT4r9zeof6UtuBDpjJ9sO08/nmS5djaA9eozT9oOlNdpXSnzcgj4FTqpk3nkLrs61l4gip9r1HCrQ==} + sonic-boom@4.1.0: + resolution: {integrity: sha512-NGipjjRicyJJ03rPiZCJYjwlsuP2d1/5QUviozRXC7S3WdVWNK5e3Ojieb9CCyfhq2UC+3+SRd9nG3I2lPRvUw==} sonner@1.5.0: resolution: {integrity: sha512-FBjhG/gnnbN6FY0jaNnqZOMmB73R+5IiyYAw8yBj7L54ER7HB3fOSE5OFiQiE2iXWxeXKvg6fIP4LtVppHEdJA==} @@ -7687,8 +7692,8 @@ packages: which-boxed-primitive@1.0.2: resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} - which-builtin-type@1.1.3: - resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==} + which-builtin-type@1.1.4: + resolution: {integrity: sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==} engines: {node: '>= 0.4'} which-collection@1.0.2: @@ -10436,7 +10441,7 @@ snapshots: dependencies: react: 18.3.1 - '@react-email/code-block@0.0.8(react@18.3.1)': + '@react-email/code-block@0.0.9(react@18.3.1)': dependencies: prismjs: 1.29.0 react: 18.3.1 @@ -10449,11 +10454,11 @@ snapshots: dependencies: react: 18.3.1 - '@react-email/components@0.0.24(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@react-email/components@0.0.25(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@react-email/body': 0.0.10(react@18.3.1) '@react-email/button': 0.0.17(react@18.3.1) - '@react-email/code-block': 0.0.8(react@18.3.1) + '@react-email/code-block': 0.0.9(react@18.3.1) '@react-email/code-inline': 0.0.4(react@18.3.1) '@react-email/column': 0.0.12(react@18.3.1) '@react-email/container': 0.0.14(react@18.3.1) @@ -10919,6 +10924,8 @@ snapshots: optionalDependencies: rollup: 3.29.4 + '@rtsao/scc@1.1.0': {} + '@selderee/plugin-htmlparser2@0.11.0': dependencies: domhandler: 5.0.3 @@ -11217,12 +11224,6 @@ snapshots: '@tanstack/query-core@5.52.2': {} - '@tanstack/react-query-next-experimental@5.53.1(@tanstack/react-query@5.52.2(react@18.3.1))(next@14.2.7(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': - dependencies: - '@tanstack/react-query': 5.52.2(react@18.3.1) - next: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - '@tanstack/react-query@5.52.2(react@18.3.1)': dependencies: '@tanstack/query-core': 5.52.2 @@ -11273,7 +11274,7 @@ snapshots: '@tsconfig/node16@1.0.4': {} - '@turbo/gen@2.1.1(@types/node@22.5.1)(typescript@5.5.4)': + '@turbo/gen@2.1.1(@types/node@22.5.2)(typescript@5.5.4)': dependencies: '@turbo/workspaces': 2.1.1 commander: 10.0.1 @@ -11283,7 +11284,7 @@ snapshots: node-plop: 0.26.3 picocolors: 1.0.1 proxy-agent: 6.4.0 - ts-node: 10.9.2(@types/node@22.5.1)(typescript@5.5.4) + ts-node: 10.9.2(@types/node@22.5.2)(typescript@5.5.4) update-check: 1.5.4 validate-npm-package-name: 5.0.1 transitivePeerDependencies: @@ -11316,7 +11317,7 @@ snapshots: '@types/connect@3.4.36': dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 '@types/d3-array@3.2.1': {} @@ -11360,7 +11361,7 @@ snapshots: '@types/glob@7.2.0': dependencies: '@types/minimatch': 5.1.2 - '@types/node': 22.5.1 + '@types/node': 22.5.2 '@types/hast@3.0.4': dependencies: @@ -11405,15 +11406,15 @@ snapshots: '@types/mysql@2.15.22': dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 - '@types/node@22.5.1': + '@types/node@22.5.2': dependencies: undici-types: 6.19.8 '@types/nodemailer@6.4.15': dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 '@types/parse-json@4.0.2': {} @@ -11423,7 +11424,7 @@ snapshots: '@types/pg@8.6.1': dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 pg-protocol: 1.6.1 pg-types: 2.2.0 @@ -11448,7 +11449,7 @@ snapshots: '@types/through@0.0.33': dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 '@types/tinycolor2@1.4.6': {} @@ -11458,16 +11459,16 @@ snapshots: '@types/ws@8.5.12': dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 - '@typescript-eslint/eslint-plugin@8.3.0(@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/eslint-plugin@8.4.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.3.0(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/scope-manager': 8.3.0 - '@typescript-eslint/type-utils': 8.3.0(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/utils': 8.3.0(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/visitor-keys': 8.3.0 + '@typescript-eslint/parser': 8.4.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/scope-manager': 8.4.0 + '@typescript-eslint/type-utils': 8.4.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 8.4.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/visitor-keys': 8.4.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.2 @@ -11478,12 +11479,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4)': dependencies: - '@typescript-eslint/scope-manager': 8.3.0 - '@typescript-eslint/types': 8.3.0 - '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.5.4) - '@typescript-eslint/visitor-keys': 8.3.0 + '@typescript-eslint/scope-manager': 8.4.0 + '@typescript-eslint/types': 8.4.0 + '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.5.4) + '@typescript-eslint/visitor-keys': 8.4.0 debug: 4.3.6 eslint: 8.57.0 optionalDependencies: @@ -11491,15 +11492,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.3.0': + '@typescript-eslint/scope-manager@8.4.0': dependencies: - '@typescript-eslint/types': 8.3.0 - '@typescript-eslint/visitor-keys': 8.3.0 + '@typescript-eslint/types': 8.4.0 + '@typescript-eslint/visitor-keys': 8.4.0 - '@typescript-eslint/type-utils@8.3.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/type-utils@8.4.0(eslint@8.57.0)(typescript@5.5.4)': dependencies: - '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.5.4) - '@typescript-eslint/utils': 8.3.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.5.4) + '@typescript-eslint/utils': 8.4.0(eslint@8.57.0)(typescript@5.5.4) debug: 4.3.6 ts-api-utils: 1.3.0(typescript@5.5.4) optionalDependencies: @@ -11508,12 +11509,12 @@ snapshots: - eslint - supports-color - '@typescript-eslint/types@8.3.0': {} + '@typescript-eslint/types@8.4.0': {} - '@typescript-eslint/typescript-estree@8.3.0(typescript@5.5.4)': + '@typescript-eslint/typescript-estree@8.4.0(typescript@5.5.4)': dependencies: - '@typescript-eslint/types': 8.3.0 - '@typescript-eslint/visitor-keys': 8.3.0 + '@typescript-eslint/types': 8.4.0 + '@typescript-eslint/visitor-keys': 8.4.0 debug: 4.3.6 fast-glob: 3.3.2 is-glob: 4.0.3 @@ -11525,20 +11526,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.3.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/utils@8.4.0(eslint@8.57.0)(typescript@5.5.4)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@typescript-eslint/scope-manager': 8.3.0 - '@typescript-eslint/types': 8.3.0 - '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.5.4) + '@typescript-eslint/scope-manager': 8.4.0 + '@typescript-eslint/types': 8.4.0 + '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.5.4) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@8.3.0': + '@typescript-eslint/visitor-keys@8.4.0': dependencies: - '@typescript-eslint/types': 8.3.0 + '@typescript-eslint/types': 8.4.0 eslint-visitor-keys: 3.4.3 '@ungap/structured-clone@1.2.0': {} @@ -11830,6 +11831,16 @@ snapshots: postcss: 8.4.41 postcss-value-parser: 4.2.0 + autoprefixer@10.4.20(postcss@8.4.44): + dependencies: + browserslist: 4.23.3 + caniuse-lite: 1.0.30001649 + fraction.js: 4.3.7 + normalize-range: 0.1.2 + picocolors: 1.0.1 + postcss: 8.4.44 + postcss-value-parser: 4.2.0 + available-typed-arrays@1.0.7: dependencies: possible-typed-array-names: 1.0.0 @@ -12405,7 +12416,7 @@ snapshots: is-string: 1.0.7 is-typed-array: 1.1.13 is-weakref: 1.0.2 - object-inspect: 1.13.1 + object-inspect: 1.13.2 object-keys: 1.1.1 object.assign: 4.1.5 regexp.prototype.flags: 1.5.2 @@ -12496,23 +12507,24 @@ snapshots: eslint-import-resolver-node@0.3.9: dependencies: debug: 3.2.7 - is-core-module: 2.13.1 + is-core-module: 2.15.1 resolve: 1.22.8 transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): + eslint-module-utils@2.9.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 8.3.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 8.4.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-import@2.29.1(@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0): + eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0): dependencies: + '@rtsao/scc': 1.1.0 array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 array.prototype.flat: 1.3.2 @@ -12521,9 +12533,9 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@8.3.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) + eslint-module-utils: 2.9.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.2 - is-core-module: 2.13.1 + is-core-module: 2.15.1 is-glob: 4.0.3 minimatch: 3.1.2 object.fromentries: 2.0.8 @@ -12532,7 +12544,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 8.3.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 8.4.0(eslint@8.57.0)(typescript@5.5.4) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -12542,7 +12554,7 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-plugin-react@7.35.0(eslint@8.57.0): + eslint-plugin-react@7.35.1(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlast: 1.2.5 @@ -13207,11 +13219,11 @@ snapshots: is-callable@1.2.7: {} - is-core-module@2.13.1: + is-core-module@2.15.0: dependencies: hasown: 2.0.2 - is-core-module@2.15.0: + is-core-module@2.15.1: dependencies: hasown: 2.0.2 @@ -13347,7 +13359,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -13492,7 +13504,7 @@ snapshots: lru-cache@7.18.3: {} - lucide-react@0.437.0(react@18.3.1): + lucide-react@0.438.0(react@18.3.1): dependencies: react: 18.3.1 @@ -14120,6 +14132,8 @@ snapshots: object-inspect@1.13.1: {} + object-inspect@1.13.2: {} + object-keys@1.1.1: {} object.assign@4.1.5: @@ -14339,6 +14353,8 @@ snapshots: picocolors@1.0.1: {} + picocolors@1.1.0: {} + picomatch@2.3.1: {} pify@2.3.0: {} @@ -14352,7 +14368,7 @@ snapshots: pino-std-serializers@7.0.0: {} - pino@9.3.2: + pino@9.4.0: dependencies: atomic-sleep: 1.0.0 fast-redact: 3.5.0 @@ -14362,8 +14378,8 @@ snapshots: process-warning: 4.0.0 quick-format-unescaped: 4.0.4 real-require: 0.2.0 - safe-stable-stringify: 2.4.3 - sonic-boom: 4.0.1 + safe-stable-stringify: 2.5.0 + sonic-boom: 4.1.0 thread-stream: 3.1.0 pirates@4.0.6: {} @@ -14392,13 +14408,13 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.41 - postcss-load-config@4.0.2(postcss@8.4.41)(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)): + postcss-load-config@4.0.2(postcss@8.4.41)(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)): dependencies: lilconfig: 3.1.2 yaml: 2.5.0 optionalDependencies: postcss: 8.4.41 - ts-node: 10.9.2(@types/node@22.5.1)(typescript@5.5.4) + ts-node: 10.9.2(@types/node@22.5.2)(typescript@5.5.4) postcss-nested@6.2.0(postcss@8.4.41): dependencies: @@ -14424,6 +14440,12 @@ snapshots: picocolors: 1.0.1 source-map-js: 1.2.0 + postcss@8.4.44: + dependencies: + nanoid: 3.3.7 + picocolors: 1.1.0 + source-map-js: 1.2.0 + postgres-array@2.0.0: {} postgres-bytea@1.0.0: {} @@ -14527,7 +14549,7 @@ snapshots: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 22.5.1 + '@types/node': 22.5.2 long: 5.2.3 proxy-agent@6.4.0: @@ -14727,7 +14749,7 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.2.4 globalthis: 1.0.4 - which-builtin-type: 1.1.3 + which-builtin-type: 1.1.4 regenerator-runtime@0.14.1: {} @@ -14787,7 +14809,7 @@ snapshots: resolve@2.0.0-next.5: dependencies: - is-core-module: 2.15.0 + is-core-module: 2.15.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 @@ -14848,7 +14870,7 @@ snapshots: es-errors: 1.3.0 is-regex: 1.1.4 - safe-stable-stringify@2.4.3: {} + safe-stable-stringify@2.5.0: {} safer-buffer@2.1.2: {} @@ -14995,7 +15017,7 @@ snapshots: ip-address: 9.0.5 smart-buffer: 4.2.0 - sonic-boom@4.0.1: + sonic-boom@4.1.0: dependencies: atomic-sleep: 1.0.0 @@ -15110,7 +15132,7 @@ snapshots: stripe@16.9.0: dependencies: - '@types/node': 22.5.1 + '@types/node': 22.5.2 qs: 6.13.0 styled-jsx@5.1.1(@babel/core@7.25.2)(react@18.3.1): @@ -15171,11 +15193,11 @@ snapshots: tailwind-merge@2.5.2: {} - tailwindcss-animate@1.0.7(tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4))): + tailwindcss-animate@1.0.7(tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4))): dependencies: - tailwindcss: 3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)) + tailwindcss: 3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)) - tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)): + tailwindcss@3.4.10(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -15194,7 +15216,7 @@ snapshots: postcss: 8.4.41 postcss-import: 15.1.0(postcss@8.4.41) postcss-js: 4.0.1(postcss@8.4.41) - postcss-load-config: 4.0.2(postcss@8.4.41)(ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4)) + postcss-load-config: 4.0.2(postcss@8.4.41)(ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4)) postcss-nested: 6.2.0(postcss@8.4.41) postcss-selector-parser: 6.1.2 resolve: 1.22.8 @@ -15285,14 +15307,14 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-node@10.9.2(@types/node@22.5.1)(typescript@5.5.4): + ts-node@10.9.2(@types/node@22.5.2)(typescript@5.5.4): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 22.5.1 + '@types/node': 22.5.2 acorn: 8.12.1 acorn-walk: 8.3.3 arg: 4.1.3 @@ -15607,7 +15629,7 @@ snapshots: is-string: 1.0.7 is-symbol: 1.0.4 - which-builtin-type@1.1.3: + which-builtin-type@1.1.4: dependencies: function.prototype.name: 1.1.6 has-tostringtag: 1.0.2 diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json index 6666f7bc4..fee6e6488 100644 --- a/tooling/eslint/package.json +++ b/tooling/eslint/package.json @@ -16,12 +16,12 @@ "@next/eslint-plugin-next": "^14.2.7", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/eslint": "^8.56.10", - "@typescript-eslint/eslint-plugin": "^8.3.0", - "@typescript-eslint/parser": "^8.3.0", + "@typescript-eslint/eslint-plugin": "^8.4.0", + "@typescript-eslint/parser": "^8.4.0", "eslint-config-prettier": "^9.1.0", "eslint-config-turbo": "^2.1.1", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-react": "^7.35.0", + "eslint-plugin-import": "^2.30.0", + "eslint-plugin-react": "^7.35.1", "eslint-plugin-react-hooks": "^4.6.2" }, "devDependencies": { diff --git a/tooling/tailwind/package.json b/tooling/tailwind/package.json index 30b15d7af..fbed16efa 100644 --- a/tooling/tailwind/package.json +++ b/tooling/tailwind/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "autoprefixer": "^10.4.20", - "postcss": "8.4.41", + "postcss": "8.4.44", "tailwindcss": "3.4.10", "tailwindcss-animate": "^1.0.7" }, From fafcafc2213447d65c856e598e64d8e73faa04f2 Mon Sep 17 00:00:00 2001 From: Giancarlo Buomprisco Date: Tue, 3 Sep 2024 18:17:51 +0800 Subject: [PATCH 2/2] Updated UI package to work with the new Shadcn CLI (#59) Updated UI package to work with the new Shadcn CLI --- packages/ui/README.md | 8 +++----- components.json => packages/ui/components.json | 13 ++++++++----- packages/ui/package.json | 5 +++-- packages/ui/src/{ => lib}/utils/cn.ts | 0 packages/ui/src/{ => lib}/utils/index.ts | 0 .../ui/src/{ => lib}/utils/is-route-active.ts | 0 .../src/makerkit/bordered-navigation-menu.tsx | 2 +- packages/ui/src/makerkit/card-button.tsx | 2 +- packages/ui/src/makerkit/divider.tsx | 2 +- packages/ui/src/makerkit/empty-state.tsx | 2 +- .../ui/src/makerkit/image-upload-input.tsx | 2 +- packages/ui/src/makerkit/loading-overlay.tsx | 2 +- .../ui/src/makerkit/marketing/cta-button.tsx | 2 +- .../ui/src/makerkit/marketing/feature-card.tsx | 2 +- .../ui/src/makerkit/marketing/feature-grid.tsx | 2 +- .../makerkit/marketing/feature-showcase.tsx | 2 +- packages/ui/src/makerkit/marketing/footer.tsx | 2 +- .../marketing/gradient-secondary-text.tsx | 2 +- .../src/makerkit/marketing/gradient-text.tsx | 2 +- packages/ui/src/makerkit/marketing/header.tsx | 2 +- .../ui/src/makerkit/marketing/hero-title.tsx | 2 +- packages/ui/src/makerkit/marketing/hero.tsx | 2 +- .../marketing/newsletter-signup-container.tsx | 2 +- .../makerkit/marketing/newsletter-signup.tsx | 2 +- packages/ui/src/makerkit/marketing/pill.tsx | 2 +- .../src/makerkit/marketing/secondary-hero.tsx | 2 +- packages/ui/src/makerkit/mode-toggle.tsx | 2 +- packages/ui/src/makerkit/multi-step-form.tsx | 2 +- packages/ui/src/makerkit/page.tsx | 2 +- packages/ui/src/makerkit/profile-avatar.tsx | 2 +- packages/ui/src/makerkit/sidebar.tsx | 2 +- packages/ui/src/makerkit/spinner.tsx | 2 +- packages/ui/src/makerkit/stepper.tsx | 2 +- packages/ui/src/shadcn/accordion.tsx | 2 +- packages/ui/src/shadcn/alert-dialog.tsx | 2 +- packages/ui/src/shadcn/alert.tsx | 2 +- packages/ui/src/shadcn/avatar.tsx | 2 +- packages/ui/src/shadcn/badge.tsx | 2 +- packages/ui/src/shadcn/breadcrumb.tsx | 2 +- packages/ui/src/shadcn/button.tsx | 2 +- packages/ui/src/shadcn/calendar.tsx | 2 +- packages/ui/src/shadcn/card.tsx | 2 +- packages/ui/src/shadcn/chart.tsx | 2 +- packages/ui/src/shadcn/checkbox.tsx | 2 +- packages/ui/src/shadcn/command.tsx | 2 +- packages/ui/src/shadcn/dialog.tsx | 2 +- packages/ui/src/shadcn/dropdown-menu.tsx | 2 +- packages/ui/src/shadcn/form.tsx | 2 +- packages/ui/src/shadcn/heading.tsx | 2 +- packages/ui/src/shadcn/index.ts | 2 +- packages/ui/src/shadcn/input-otp.tsx | 2 +- packages/ui/src/shadcn/input.tsx | 2 +- packages/ui/src/shadcn/label.tsx | 2 +- packages/ui/src/shadcn/navigation-menu.tsx | 2 +- packages/ui/src/shadcn/popover.tsx | 2 +- packages/ui/src/shadcn/radio-group.tsx | 2 +- packages/ui/src/shadcn/scroll-area.tsx | 2 +- packages/ui/src/shadcn/select.tsx | 2 +- packages/ui/src/shadcn/separator.tsx | 2 +- packages/ui/src/shadcn/sheet.tsx | 2 +- packages/ui/src/shadcn/switch.tsx | 2 +- packages/ui/src/shadcn/table.tsx | 2 +- packages/ui/src/shadcn/tabs.tsx | 2 +- packages/ui/src/shadcn/textarea.tsx | 2 +- packages/ui/src/shadcn/tooltip.tsx | 2 +- packages/ui/tsconfig.json | 11 +++++++++-- pnpm-lock.yaml | 18 ++++++++++++++++++ 67 files changed, 100 insertions(+), 73 deletions(-) rename components.json => packages/ui/components.json (51%) rename packages/ui/src/{ => lib}/utils/cn.ts (100%) rename packages/ui/src/{ => lib}/utils/index.ts (100%) rename packages/ui/src/{ => lib}/utils/is-route-active.ts (100%) diff --git a/packages/ui/README.md b/packages/ui/README.md index deeb6840c..7a1e388bc 100644 --- a/packages/ui/README.md +++ b/packages/ui/README.md @@ -12,13 +12,11 @@ This package define two sets of components: To install a Shadcn UI component, you can use the following command in the root of the repository: ```bash -npx shadcn-ui@latest add --path=packages/ui/src/shadcn +npx shadcn@latest add -c packages/ui ``` For example, to install the `Button` component, you can use the following command: ```bash -npx shadcn-ui@latest add button --path=packages/ui/src/shadcn -``` - -We pass the `--path` flag to specify the path where the component should be installed. \ No newline at end of file +npx shadcn-ui@latest add button -c packages/ui +``` \ No newline at end of file diff --git a/components.json b/packages/ui/components.json similarity index 51% rename from components.json rename to packages/ui/components.json index b282fe339..7906bed9e 100644 --- a/components.json +++ b/packages/ui/components.json @@ -4,14 +4,17 @@ "rsc": true, "tsx": true, "tailwind": { - "config": "tailwind.config.js", - "css": "app/globals.css", + "config": "./tailwind.config.ts", + "css": "../../apps/web/styles/globals.css", "baseColor": "slate", "cssVariables": true, "prefix": "" }, "aliases": { - "components": "@kit/ui", - "utils": "@kit/ui/utils" + "components": "~components", + "utils": "~utils", + "lib": "~lib", + "hooks": "~hooks", + "ui": "~ui" } -} \ No newline at end of file +} diff --git a/packages/ui/package.json b/packages/ui/package.json index 514df2908..4a3fbde81 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -34,7 +34,8 @@ "lucide-react": "^0.438.0", "react-top-loading-bar": "2.3.1", "recharts": "^2.12.7", - "tailwind-merge": "^2.5.2" + "tailwind-merge": "^2.5.2", + "vaul": "^0.9.1" }, "devDependencies": { "@kit/eslint-config": "workspace:*", @@ -103,7 +104,7 @@ "./switch": "./src/shadcn/switch.tsx", "./breadcrumb": "./src/shadcn/breadcrumb.tsx", "./chart": "./src/shadcn/chart.tsx", - "./utils": "./src/utils/index.ts", + "./utils": "./src/lib/utils/index.ts", "./if": "./src/makerkit/if.tsx", "./trans": "./src/makerkit/trans.tsx", "./divider": "./src/makerkit/divider.tsx", diff --git a/packages/ui/src/utils/cn.ts b/packages/ui/src/lib/utils/cn.ts similarity index 100% rename from packages/ui/src/utils/cn.ts rename to packages/ui/src/lib/utils/cn.ts diff --git a/packages/ui/src/utils/index.ts b/packages/ui/src/lib/utils/index.ts similarity index 100% rename from packages/ui/src/utils/index.ts rename to packages/ui/src/lib/utils/index.ts diff --git a/packages/ui/src/utils/is-route-active.ts b/packages/ui/src/lib/utils/is-route-active.ts similarity index 100% rename from packages/ui/src/utils/is-route-active.ts rename to packages/ui/src/lib/utils/is-route-active.ts diff --git a/packages/ui/src/makerkit/bordered-navigation-menu.tsx b/packages/ui/src/makerkit/bordered-navigation-menu.tsx index b6ea29014..4c6b5646a 100644 --- a/packages/ui/src/makerkit/bordered-navigation-menu.tsx +++ b/packages/ui/src/makerkit/bordered-navigation-menu.tsx @@ -3,13 +3,13 @@ import Link from 'next/link'; import { usePathname } from 'next/navigation'; +import { cn, isRouteActive } from '../lib/utils'; import { Button } from '../shadcn/button'; import { NavigationMenu, NavigationMenuItem, NavigationMenuList, } from '../shadcn/navigation-menu'; -import { cn, isRouteActive } from '../utils'; import { Trans } from './trans'; export function BorderedNavigationMenu(props: React.PropsWithChildren) { diff --git a/packages/ui/src/makerkit/card-button.tsx b/packages/ui/src/makerkit/card-button.tsx index 6df8872b8..9a5189531 100644 --- a/packages/ui/src/makerkit/card-button.tsx +++ b/packages/ui/src/makerkit/card-button.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { Slot, Slottable } from '@radix-ui/react-slot'; import { ChevronRight } from 'lucide-react'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; export const CardButton = React.forwardRef< HTMLButtonElement, diff --git a/packages/ui/src/makerkit/divider.tsx b/packages/ui/src/makerkit/divider.tsx index 9ffe1b54d..3c338dfdd 100644 --- a/packages/ui/src/makerkit/divider.tsx +++ b/packages/ui/src/makerkit/divider.tsx @@ -1,4 +1,4 @@ -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; export function Divider(props: { className?: string }) { return
; diff --git a/packages/ui/src/makerkit/empty-state.tsx b/packages/ui/src/makerkit/empty-state.tsx index dba3bf134..10234a4aa 100644 --- a/packages/ui/src/makerkit/empty-state.tsx +++ b/packages/ui/src/makerkit/empty-state.tsx @@ -1,7 +1,7 @@ import React from 'react'; +import { cn } from '../lib/utils'; import { Button } from '../shadcn/button'; -import { cn } from '../utils'; const EmptyStateHeading = React.forwardRef< HTMLHeadingElement, diff --git a/packages/ui/src/makerkit/image-upload-input.tsx b/packages/ui/src/makerkit/image-upload-input.tsx index 2da63b32b..edca89f40 100644 --- a/packages/ui/src/makerkit/image-upload-input.tsx +++ b/packages/ui/src/makerkit/image-upload-input.tsx @@ -7,9 +7,9 @@ import Image from 'next/image'; import { UploadCloud, X } from 'lucide-react'; +import { cn } from '../lib/utils'; import { Button } from '../shadcn/button'; import { Label } from '../shadcn/label'; -import { cn } from '../utils'; import { If } from './if'; type Props = Omit, 'value'> & { diff --git a/packages/ui/src/makerkit/loading-overlay.tsx b/packages/ui/src/makerkit/loading-overlay.tsx index 4974f0a92..ac1356fce 100644 --- a/packages/ui/src/makerkit/loading-overlay.tsx +++ b/packages/ui/src/makerkit/loading-overlay.tsx @@ -1,6 +1,6 @@ import type { PropsWithChildren } from 'react'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; import { Spinner } from './spinner'; export function LoadingOverlay({ diff --git a/packages/ui/src/makerkit/marketing/cta-button.tsx b/packages/ui/src/makerkit/marketing/cta-button.tsx index c5c704312..e8323a4f1 100644 --- a/packages/ui/src/makerkit/marketing/cta-button.tsx +++ b/packages/ui/src/makerkit/marketing/cta-button.tsx @@ -1,7 +1,7 @@ import { forwardRef } from 'react'; +import { cn } from '../../lib/utils'; import { Button } from '../../shadcn/button'; -import { cn } from '../../utils'; export const CtaButton = forwardRef< HTMLButtonElement, diff --git a/packages/ui/src/makerkit/marketing/feature-card.tsx b/packages/ui/src/makerkit/marketing/feature-card.tsx index 66d16a4c7..095a93fb6 100644 --- a/packages/ui/src/makerkit/marketing/feature-card.tsx +++ b/packages/ui/src/makerkit/marketing/feature-card.tsx @@ -1,12 +1,12 @@ import React, { forwardRef } from 'react'; +import { cn } from '../../lib/utils'; import { CardContent, CardDescription, CardHeader, CardTitle, } from '../../shadcn/card'; -import { cn } from '../../utils'; interface FeatureCardProps extends React.HTMLAttributes { label: string; diff --git a/packages/ui/src/makerkit/marketing/feature-grid.tsx b/packages/ui/src/makerkit/marketing/feature-grid.tsx index c7947271b..f5fda36e6 100644 --- a/packages/ui/src/makerkit/marketing/feature-grid.tsx +++ b/packages/ui/src/makerkit/marketing/feature-grid.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; export const FeatureGrid = forwardRef< HTMLDivElement, diff --git a/packages/ui/src/makerkit/marketing/feature-showcase.tsx b/packages/ui/src/makerkit/marketing/feature-showcase.tsx index 33a2405ab..485162ddd 100644 --- a/packages/ui/src/makerkit/marketing/feature-showcase.tsx +++ b/packages/ui/src/makerkit/marketing/feature-showcase.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; interface FeatureShowcaseProps extends React.HTMLAttributes { heading: React.ReactNode; diff --git a/packages/ui/src/makerkit/marketing/footer.tsx b/packages/ui/src/makerkit/marketing/footer.tsx index 7dcde1740..abae76206 100644 --- a/packages/ui/src/makerkit/marketing/footer.tsx +++ b/packages/ui/src/makerkit/marketing/footer.tsx @@ -1,6 +1,6 @@ import { forwardRef } from 'react'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; interface FooterSection { heading: React.ReactNode; diff --git a/packages/ui/src/makerkit/marketing/gradient-secondary-text.tsx b/packages/ui/src/makerkit/marketing/gradient-secondary-text.tsx index 46dc26cd4..96709e3e6 100644 --- a/packages/ui/src/makerkit/marketing/gradient-secondary-text.tsx +++ b/packages/ui/src/makerkit/marketing/gradient-secondary-text.tsx @@ -2,7 +2,7 @@ import { forwardRef } from 'react'; import { Slot, Slottable } from '@radix-ui/react-slot'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; export const GradientSecondaryText = forwardRef< HTMLSpanElement, diff --git a/packages/ui/src/makerkit/marketing/gradient-text.tsx b/packages/ui/src/makerkit/marketing/gradient-text.tsx index 1707040fa..73f139c53 100644 --- a/packages/ui/src/makerkit/marketing/gradient-text.tsx +++ b/packages/ui/src/makerkit/marketing/gradient-text.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; export const GradientText = forwardRef< HTMLSpanElement, diff --git a/packages/ui/src/makerkit/marketing/header.tsx b/packages/ui/src/makerkit/marketing/header.tsx index e970790d8..8f0562ec6 100644 --- a/packages/ui/src/makerkit/marketing/header.tsx +++ b/packages/ui/src/makerkit/marketing/header.tsx @@ -1,6 +1,6 @@ import { forwardRef } from 'react'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; interface HeaderProps extends React.HTMLAttributes { logo?: React.ReactNode; diff --git a/packages/ui/src/makerkit/marketing/hero-title.tsx b/packages/ui/src/makerkit/marketing/hero-title.tsx index 94352d699..b7fcb8109 100644 --- a/packages/ui/src/makerkit/marketing/hero-title.tsx +++ b/packages/ui/src/makerkit/marketing/hero-title.tsx @@ -2,7 +2,7 @@ import { forwardRef } from 'react'; import { Slot, Slottable } from '@radix-ui/react-slot'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; export const HeroTitle = forwardRef< HTMLHeadingElement, diff --git a/packages/ui/src/makerkit/marketing/hero.tsx b/packages/ui/src/makerkit/marketing/hero.tsx index 8564f6f9e..2c6eeee86 100644 --- a/packages/ui/src/makerkit/marketing/hero.tsx +++ b/packages/ui/src/makerkit/marketing/hero.tsx @@ -1,7 +1,7 @@ import React from 'react'; +import { cn } from '../../lib/utils'; import { Heading } from '../../shadcn/heading'; -import { cn } from '../../utils'; import { HeroTitle } from './hero-title'; interface HeroProps { diff --git a/packages/ui/src/makerkit/marketing/newsletter-signup-container.tsx b/packages/ui/src/makerkit/marketing/newsletter-signup-container.tsx index 5bb565c4a..864b3d091 100644 --- a/packages/ui/src/makerkit/marketing/newsletter-signup-container.tsx +++ b/packages/ui/src/makerkit/marketing/newsletter-signup-container.tsx @@ -2,9 +2,9 @@ import { useCallback, useState } from 'react'; +import { cn } from '../../lib/utils'; import { Alert, AlertDescription, AlertTitle } from '../../shadcn/alert'; import { Heading } from '../../shadcn/heading'; -import { cn } from '../../utils'; import { Spinner } from '../spinner'; import { NewsletterSignup } from './newsletter-signup'; diff --git a/packages/ui/src/makerkit/marketing/newsletter-signup.tsx b/packages/ui/src/makerkit/marketing/newsletter-signup.tsx index 9791eb8a1..87c02ab68 100644 --- a/packages/ui/src/makerkit/marketing/newsletter-signup.tsx +++ b/packages/ui/src/makerkit/marketing/newsletter-signup.tsx @@ -4,6 +4,7 @@ import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; import { z } from 'zod'; +import { cn } from '../../lib/utils'; import { Button } from '../../shadcn/button'; import { Form, @@ -13,7 +14,6 @@ import { FormMessage, } from '../../shadcn/form'; import { Input } from '../../shadcn/input'; -import { cn } from '../../utils'; const NewsletterFormSchema = z.object({ email: z.string().email('Please enter a valid email address'), diff --git a/packages/ui/src/makerkit/marketing/pill.tsx b/packages/ui/src/makerkit/marketing/pill.tsx index 2a3e7d718..3da959fe7 100644 --- a/packages/ui/src/makerkit/marketing/pill.tsx +++ b/packages/ui/src/makerkit/marketing/pill.tsx @@ -2,7 +2,7 @@ import { forwardRef } from 'react'; import { Slot, Slottable } from '@radix-ui/react-slot'; -import { cn } from '../../utils'; +import { cn } from '../../lib/utils'; import { GradientSecondaryText } from './gradient-secondary-text'; export const Pill = forwardRef< diff --git a/packages/ui/src/makerkit/marketing/secondary-hero.tsx b/packages/ui/src/makerkit/marketing/secondary-hero.tsx index abb95c6e9..3192bcca4 100644 --- a/packages/ui/src/makerkit/marketing/secondary-hero.tsx +++ b/packages/ui/src/makerkit/marketing/secondary-hero.tsx @@ -1,7 +1,7 @@ import { forwardRef } from 'react'; +import { cn } from '../../lib/utils'; import { Heading } from '../../shadcn/heading'; -import { cn } from '../../utils'; interface SecondaryHeroProps extends React.HTMLAttributes { pill?: React.ReactNode; diff --git a/packages/ui/src/makerkit/mode-toggle.tsx b/packages/ui/src/makerkit/mode-toggle.tsx index 755b29a07..9f9b95f0a 100644 --- a/packages/ui/src/makerkit/mode-toggle.tsx +++ b/packages/ui/src/makerkit/mode-toggle.tsx @@ -5,6 +5,7 @@ import { useMemo } from 'react'; import { Computer, Moon, Sun } from 'lucide-react'; import { useTheme } from 'next-themes'; +import { cn } from '../lib/utils'; import { Button } from '../shadcn/button'; import { DropdownMenu, @@ -16,7 +17,6 @@ import { DropdownMenuSubTrigger, DropdownMenuTrigger, } from '../shadcn/dropdown-menu'; -import { cn } from '../utils'; import { Trans } from './trans'; const MODES = ['light', 'dark', 'system']; diff --git a/packages/ui/src/makerkit/multi-step-form.tsx b/packages/ui/src/makerkit/multi-step-form.tsx index 4a0b56c62..3d84c3ae1 100644 --- a/packages/ui/src/makerkit/multi-step-form.tsx +++ b/packages/ui/src/makerkit/multi-step-form.tsx @@ -16,7 +16,7 @@ import { useMutation } from '@tanstack/react-query'; import { Path, UseFormReturn } from 'react-hook-form'; import { z } from 'zod'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; interface MultiStepFormProps { schema: T; diff --git a/packages/ui/src/makerkit/page.tsx b/packages/ui/src/makerkit/page.tsx index 5d7015333..fd5a28075 100644 --- a/packages/ui/src/makerkit/page.tsx +++ b/packages/ui/src/makerkit/page.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; export type PageLayoutStyle = 'sidebar' | 'header' | 'custom'; diff --git a/packages/ui/src/makerkit/profile-avatar.tsx b/packages/ui/src/makerkit/profile-avatar.tsx index b21b50f51..c304b874a 100644 --- a/packages/ui/src/makerkit/profile-avatar.tsx +++ b/packages/ui/src/makerkit/profile-avatar.tsx @@ -1,5 +1,5 @@ +import { cn } from '../lib/utils'; import { Avatar, AvatarFallback, AvatarImage } from '../shadcn/avatar'; -import { cn } from '../utils'; type SessionProps = { displayName: string | null; diff --git a/packages/ui/src/makerkit/sidebar.tsx b/packages/ui/src/makerkit/sidebar.tsx index 4c2ae66b5..e8c76a71f 100644 --- a/packages/ui/src/makerkit/sidebar.tsx +++ b/packages/ui/src/makerkit/sidebar.tsx @@ -9,6 +9,7 @@ import { cva } from 'class-variance-authority'; import { ChevronDown } from 'lucide-react'; import { z } from 'zod'; +import { cn, isRouteActive } from '../lib/utils'; import { Button } from '../shadcn/button'; import { Tooltip, @@ -16,7 +17,6 @@ import { TooltipProvider, TooltipTrigger, } from '../shadcn/tooltip'; -import { cn, isRouteActive } from '../utils'; import { SidebarContext } from './context/sidebar.context'; import { If } from './if'; import type { NavigationConfigSchema } from './navigation-config.schema'; diff --git a/packages/ui/src/makerkit/spinner.tsx b/packages/ui/src/makerkit/spinner.tsx index ee1839bfc..8d16c0b2f 100644 --- a/packages/ui/src/makerkit/spinner.tsx +++ b/packages/ui/src/makerkit/spinner.tsx @@ -1,4 +1,4 @@ -import { cn } from '../utils'; +import { cn } from '../lib/utils'; export function Spinner( props: React.PropsWithChildren<{ diff --git a/packages/ui/src/makerkit/stepper.tsx b/packages/ui/src/makerkit/stepper.tsx index 0c86082db..da2360218 100644 --- a/packages/ui/src/makerkit/stepper.tsx +++ b/packages/ui/src/makerkit/stepper.tsx @@ -4,7 +4,7 @@ import { Fragment, useCallback } from 'react'; import { cva } from 'class-variance-authority'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; import { If } from './if'; import { Trans } from './trans'; diff --git a/packages/ui/src/shadcn/accordion.tsx b/packages/ui/src/shadcn/accordion.tsx index d02ba5761..593a67834 100644 --- a/packages/ui/src/shadcn/accordion.tsx +++ b/packages/ui/src/shadcn/accordion.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import * as AccordionPrimitive from '@radix-ui/react-accordion'; import { ChevronDownIcon } from '@radix-ui/react-icons'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; const Accordion = AccordionPrimitive.Root; diff --git a/packages/ui/src/shadcn/alert-dialog.tsx b/packages/ui/src/shadcn/alert-dialog.tsx index 2f7804bec..9e8f7426e 100644 --- a/packages/ui/src/shadcn/alert-dialog.tsx +++ b/packages/ui/src/shadcn/alert-dialog.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; import { buttonVariants } from './button'; const AlertDialog = AlertDialogPrimitive.Root; diff --git a/packages/ui/src/shadcn/alert.tsx b/packages/ui/src/shadcn/alert.tsx index 5ab680f25..8666f5a5e 100644 --- a/packages/ui/src/shadcn/alert.tsx +++ b/packages/ui/src/shadcn/alert.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { type VariantProps, cva } from 'class-variance-authority'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; const alertVariants = cva( 'relative w-full bg-gradient-to-r rounded-lg border px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7', diff --git a/packages/ui/src/shadcn/avatar.tsx b/packages/ui/src/shadcn/avatar.tsx index dd486fabf..9793aa8b4 100644 --- a/packages/ui/src/shadcn/avatar.tsx +++ b/packages/ui/src/shadcn/avatar.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as AvatarPrimitive from '@radix-ui/react-avatar'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Avatar = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/badge.tsx b/packages/ui/src/shadcn/badge.tsx index a2d542b29..8a72a6492 100644 --- a/packages/ui/src/shadcn/badge.tsx +++ b/packages/ui/src/shadcn/badge.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { type VariantProps, cva } from 'class-variance-authority'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const badgeVariants = cva( 'inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2', diff --git a/packages/ui/src/shadcn/breadcrumb.tsx b/packages/ui/src/shadcn/breadcrumb.tsx index 12770d075..33df9a229 100644 --- a/packages/ui/src/shadcn/breadcrumb.tsx +++ b/packages/ui/src/shadcn/breadcrumb.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { ChevronRightIcon, DotsHorizontalIcon } from '@radix-ui/react-icons'; import { Slot } from '@radix-ui/react-slot'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; const Breadcrumb = React.forwardRef< HTMLElement, diff --git a/packages/ui/src/shadcn/button.tsx b/packages/ui/src/shadcn/button.tsx index 744edd466..7b3a30e07 100644 --- a/packages/ui/src/shadcn/button.tsx +++ b/packages/ui/src/shadcn/button.tsx @@ -4,7 +4,7 @@ import { Slot } from '@radix-ui/react-slot'; import { cva } from 'class-variance-authority'; import type { VariantProps } from 'class-variance-authority'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const buttonVariants = cva( 'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50', diff --git a/packages/ui/src/shadcn/calendar.tsx b/packages/ui/src/shadcn/calendar.tsx index 9430ec3de..f5da65e5b 100644 --- a/packages/ui/src/shadcn/calendar.tsx +++ b/packages/ui/src/shadcn/calendar.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import { ChevronLeft, ChevronRight } from 'lucide-react'; import { DayPicker } from 'react-day-picker'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; import { buttonVariants } from './button'; export type { DateRange } from 'react-day-picker'; diff --git a/packages/ui/src/shadcn/card.tsx b/packages/ui/src/shadcn/card.tsx index 8513daa48..3b88cc12d 100644 --- a/packages/ui/src/shadcn/card.tsx +++ b/packages/ui/src/shadcn/card.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Card = React.forwardRef< HTMLDivElement, diff --git a/packages/ui/src/shadcn/chart.tsx b/packages/ui/src/shadcn/chart.tsx index d3c010d85..409d7d232 100644 --- a/packages/ui/src/shadcn/chart.tsx +++ b/packages/ui/src/shadcn/chart.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as RechartsPrimitive from 'recharts'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; // Format: { THEME_NAME: CSS_SELECTOR } const THEMES = { light: '', dark: '.dark' } as const; diff --git a/packages/ui/src/shadcn/checkbox.tsx b/packages/ui/src/shadcn/checkbox.tsx index 97482b635..f5b70f0da 100644 --- a/packages/ui/src/shadcn/checkbox.tsx +++ b/packages/ui/src/shadcn/checkbox.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import * as CheckboxPrimitive from '@radix-ui/react-checkbox'; import { CheckIcon } from '@radix-ui/react-icons'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Checkbox = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/command.tsx b/packages/ui/src/shadcn/command.tsx index e89cae4df..07ce16eab 100644 --- a/packages/ui/src/shadcn/command.tsx +++ b/packages/ui/src/shadcn/command.tsx @@ -6,7 +6,7 @@ import { type DialogProps } from '@radix-ui/react-dialog'; import { MagnifyingGlassIcon } from '@radix-ui/react-icons'; import { Command as CommandPrimitive } from 'cmdk'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; import { Dialog, DialogContent } from './dialog'; const Command = React.forwardRef< diff --git a/packages/ui/src/shadcn/dialog.tsx b/packages/ui/src/shadcn/dialog.tsx index 313468c87..1c0ac7219 100644 --- a/packages/ui/src/shadcn/dialog.tsx +++ b/packages/ui/src/shadcn/dialog.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import * as DialogPrimitive from '@radix-ui/react-dialog'; import { Cross2Icon } from '@radix-ui/react-icons'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Dialog = DialogPrimitive.Root; diff --git a/packages/ui/src/shadcn/dropdown-menu.tsx b/packages/ui/src/shadcn/dropdown-menu.tsx index afbfb7710..9521ff48b 100644 --- a/packages/ui/src/shadcn/dropdown-menu.tsx +++ b/packages/ui/src/shadcn/dropdown-menu.tsx @@ -9,7 +9,7 @@ import { DotFilledIcon, } from '@radix-ui/react-icons'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const DropdownMenu = DropdownMenuPrimitive.Root; diff --git a/packages/ui/src/shadcn/form.tsx b/packages/ui/src/shadcn/form.tsx index 9e74f1c7c..6f103c614 100644 --- a/packages/ui/src/shadcn/form.tsx +++ b/packages/ui/src/shadcn/form.tsx @@ -7,8 +7,8 @@ import { Slot } from '@radix-ui/react-slot'; import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form'; import { Controller, FormProvider, useFormContext } from 'react-hook-form'; +import { cn } from '../lib/utils'; import { Trans } from '../makerkit/trans'; -import { cn } from '../utils'; import { Label } from './label'; const Form = FormProvider; diff --git a/packages/ui/src/shadcn/heading.tsx b/packages/ui/src/shadcn/heading.tsx index ab75453e8..534ae3b78 100644 --- a/packages/ui/src/shadcn/heading.tsx +++ b/packages/ui/src/shadcn/heading.tsx @@ -1,4 +1,4 @@ -import { cn } from '../utils'; +import { cn } from '../lib/utils'; type Level = 1 | 2 | 3 | 4 | 5 | 6; diff --git a/packages/ui/src/shadcn/index.ts b/packages/ui/src/shadcn/index.ts index 4c35088cf..f88d26aaf 100644 --- a/packages/ui/src/shadcn/index.ts +++ b/packages/ui/src/shadcn/index.ts @@ -1 +1 @@ -export { cn } from '../utils/cn'; +export { cn } from '../lib/utils'; diff --git a/packages/ui/src/shadcn/input-otp.tsx b/packages/ui/src/shadcn/input-otp.tsx index a626efdc9..ee2479bd5 100644 --- a/packages/ui/src/shadcn/input-otp.tsx +++ b/packages/ui/src/shadcn/input-otp.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import { DashIcon } from '@radix-ui/react-icons'; import { OTPInput, OTPInputContext } from 'input-otp'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; const InputOTP = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/input.tsx b/packages/ui/src/shadcn/input.tsx index 8879b09e1..1bbba669f 100644 --- a/packages/ui/src/shadcn/input.tsx +++ b/packages/ui/src/shadcn/input.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; export type InputProps = React.InputHTMLAttributes; diff --git a/packages/ui/src/shadcn/label.tsx b/packages/ui/src/shadcn/label.tsx index 1aa238d96..4dff81ca2 100644 --- a/packages/ui/src/shadcn/label.tsx +++ b/packages/ui/src/shadcn/label.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import * as LabelPrimitive from '@radix-ui/react-label'; import { type VariantProps, cva } from 'class-variance-authority'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const labelVariants = cva( 'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70', diff --git a/packages/ui/src/shadcn/navigation-menu.tsx b/packages/ui/src/shadcn/navigation-menu.tsx index 4718259e7..4fe37806b 100644 --- a/packages/ui/src/shadcn/navigation-menu.tsx +++ b/packages/ui/src/shadcn/navigation-menu.tsx @@ -6,7 +6,7 @@ import { ChevronDownIcon } from '@radix-ui/react-icons'; import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu'; import { cva } from 'class-variance-authority'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const NavigationMenu = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/popover.tsx b/packages/ui/src/shadcn/popover.tsx index 1e60e0b62..3cebc5423 100644 --- a/packages/ui/src/shadcn/popover.tsx +++ b/packages/ui/src/shadcn/popover.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as PopoverPrimitive from '@radix-ui/react-popover'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Popover = PopoverPrimitive.Root; diff --git a/packages/ui/src/shadcn/radio-group.tsx b/packages/ui/src/shadcn/radio-group.tsx index 631164857..37e42bc97 100644 --- a/packages/ui/src/shadcn/radio-group.tsx +++ b/packages/ui/src/shadcn/radio-group.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import { CheckIcon } from '@radix-ui/react-icons'; import * as RadioGroupPrimitive from '@radix-ui/react-radio-group'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const RadioGroup = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/scroll-area.tsx b/packages/ui/src/shadcn/scroll-area.tsx index 3dfec4af8..24ef95d04 100644 --- a/packages/ui/src/shadcn/scroll-area.tsx +++ b/packages/ui/src/shadcn/scroll-area.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const ScrollArea = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/select.tsx b/packages/ui/src/shadcn/select.tsx index 33277551f..3091f2b3e 100644 --- a/packages/ui/src/shadcn/select.tsx +++ b/packages/ui/src/shadcn/select.tsx @@ -10,7 +10,7 @@ import { } from '@radix-ui/react-icons'; import * as SelectPrimitive from '@radix-ui/react-select'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Select = SelectPrimitive.Root; diff --git a/packages/ui/src/shadcn/separator.tsx b/packages/ui/src/shadcn/separator.tsx index 4a584571d..f8cb5a611 100644 --- a/packages/ui/src/shadcn/separator.tsx +++ b/packages/ui/src/shadcn/separator.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as SeparatorPrimitive from '@radix-ui/react-separator'; -import { cn } from '../utils'; +import { cn } from '../lib/utils'; const Separator = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/sheet.tsx b/packages/ui/src/shadcn/sheet.tsx index f3b6941fa..9cde8b7bb 100644 --- a/packages/ui/src/shadcn/sheet.tsx +++ b/packages/ui/src/shadcn/sheet.tsx @@ -7,7 +7,7 @@ import { cva } from 'class-variance-authority'; import type { VariantProps } from 'class-variance-authority'; import { X } from 'lucide-react'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Sheet = SheetPrimitive.Root; diff --git a/packages/ui/src/shadcn/switch.tsx b/packages/ui/src/shadcn/switch.tsx index 163bf5e50..208b57bcc 100644 --- a/packages/ui/src/shadcn/switch.tsx +++ b/packages/ui/src/shadcn/switch.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as SwitchPrimitives from '@radix-ui/react-switch'; -import { cn } from '@kit/ui/utils'; +import { cn } from '../lib/utils'; const Switch = React.forwardRef< React.ElementRef, diff --git a/packages/ui/src/shadcn/table.tsx b/packages/ui/src/shadcn/table.tsx index ff4b8f96f..f69830652 100644 --- a/packages/ui/src/shadcn/table.tsx +++ b/packages/ui/src/shadcn/table.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Table = React.forwardRef< HTMLTableElement, diff --git a/packages/ui/src/shadcn/tabs.tsx b/packages/ui/src/shadcn/tabs.tsx index f26f82d04..04d4c3ccf 100644 --- a/packages/ui/src/shadcn/tabs.tsx +++ b/packages/ui/src/shadcn/tabs.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as TabsPrimitive from '@radix-ui/react-tabs'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const Tabs = TabsPrimitive.Root; diff --git a/packages/ui/src/shadcn/textarea.tsx b/packages/ui/src/shadcn/textarea.tsx index fbc84457b..1031fd26f 100644 --- a/packages/ui/src/shadcn/textarea.tsx +++ b/packages/ui/src/shadcn/textarea.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; export type TextareaProps = React.TextareaHTMLAttributes; diff --git a/packages/ui/src/shadcn/tooltip.tsx b/packages/ui/src/shadcn/tooltip.tsx index 3f8981609..7d74163ad 100644 --- a/packages/ui/src/shadcn/tooltip.tsx +++ b/packages/ui/src/shadcn/tooltip.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import * as TooltipPrimitive from '@radix-ui/react-tooltip'; -import { cn } from '../utils/cn'; +import { cn } from '../lib/utils'; const TooltipProvider = TooltipPrimitive.Provider; diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index c4697e934..3f909c1ed 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -1,8 +1,15 @@ { "extends": "@kit/tsconfig/base.json", "compilerOptions": { - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" + "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json", + "paths": { + "~/components": ["./src/shadcn/*"], + "~/utils": ["./src/lib/utils"], + "~/lib/*": ["./src/lib/*"], + "~/hooks": ["./src/hooks"], + "~/ui": ["./src/shadcn/*"] + } }, "include": ["*.ts", "src"], "exclude": ["node_modules"] -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ac05daca0..c1e1c1414 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1257,6 +1257,9 @@ importers: tailwind-merge: specifier: ^2.5.2 version: 2.5.2 + vaul: + specifier: ^0.9.1 + version: 0.9.1(@types/react-dom@18.3.0)(@types/react@18.3.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@kit/eslint-config': specifier: workspace:* @@ -7631,6 +7634,12 @@ packages: resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + vaul@0.9.1: + resolution: {integrity: sha512-fAhd7i4RNMinx+WEm6pF3nOl78DFkAazcN04ElLPFF9BMCNGbY/kou8UMhIcicm0rJCNePJP0Yyza60gGOD0Jw==} + peerDependencies: + react: 18.3.1 + react-dom: 18.3.1 + vercel-email@0.0.6: resolution: {integrity: sha512-lpELZ8/B6qyLMUOzmvZiU5evo1Hv5jfSpI/rrzny5UYfOAUKFYycraXNT+fT/cC6ewUKQVJDg8/v3LwyX3cCzA==} @@ -15520,6 +15529,15 @@ snapshots: validate-npm-package-name@5.0.1: {} + vaul@0.9.1(@types/react-dom@18.3.0)(@types/react@18.3.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@radix-ui/react-dialog': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + vercel-email@0.0.6: {} vfile-message@4.0.2: