diff --git a/package.json b/package.json index a4fe98d2b..53c165dd1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "sideEffects": false, "engines": { - "node": ">=v18.17.1" + "node": ">=v18.18.0" }, "author": { "url": "https://makerkit.dev", diff --git a/packages/supabase/src/database.types.ts b/packages/supabase/src/database.types.ts index 1f7aaa5b2..328e008dc 100644 --- a/packages/supabase/src/database.types.ts +++ b/packages/supabase/src/database.types.ts @@ -8,12 +8,8 @@ export type Json = export type Database = { graphql_public: { - Tables: { - [_ in never]: never; - }; - Views: { - [_ in never]: never; - }; + Tables: Record; + Views: Record; Functions: { graphql: { Args: { @@ -25,12 +21,8 @@ export type Database = { Returns: Json; }; }; - Enums: { - [_ in never]: never; - }; - CompositeTypes: { - [_ in never]: never; - }; + Enums: Record; + CompositeTypes: Record; }; public: { Tables: { @@ -1168,9 +1160,7 @@ export type Database = { ]; }; }; - Views: { - [_ in never]: never; - }; + Views: Record; Functions: { can_insert_object: { Args: { @@ -1258,12 +1248,8 @@ export type Database = { }[]; }; }; - Enums: { - [_ in never]: never; - }; - CompositeTypes: { - [_ in never]: never; - }; + Enums: Record; + CompositeTypes: Record; }; }; diff --git a/packages/ui/src/shadcn/chart.tsx b/packages/ui/src/shadcn/chart.tsx index 792686253..cb0fe6490 100644 --- a/packages/ui/src/shadcn/chart.tsx +++ b/packages/ui/src/shadcn/chart.tsx @@ -9,15 +9,13 @@ import { cn } from '../lib/utils'; // Format: { THEME_NAME: CSS_SELECTOR } const THEMES = { light: '', dark: '.dark' } as const; -export type ChartConfig = { - [k in string]: { +export type ChartConfig = Record } - ); -}; + )>; type ChartContextProps = { config: ChartConfig; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f37622352..ceb1a36ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1450,8 +1450,8 @@ importers: specifier: ^8.56.10 version: 8.56.10 '@typescript-eslint/eslint-plugin': - specifier: ^8.11.0 - version: 8.11.0(@typescript-eslint/parser@8.12.1(eslint@8.57.0)(typescript@5.6.3))(eslint@8.57.0)(typescript@5.6.3) + specifier: ^8.12.1 + version: 8.12.1(@typescript-eslint/parser@8.12.1(eslint@8.57.0)(typescript@5.6.3))(eslint@8.57.0)(typescript@5.6.3) '@typescript-eslint/parser': specifier: ^8.12.1 version: 8.12.1(eslint@8.57.0)(typescript@5.6.3) @@ -1735,6 +1735,12 @@ packages: peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + '@eslint-community/eslint-utils@4.4.1': + resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + '@eslint-community/regexpp@4.11.1': resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} @@ -4283,8 +4289,8 @@ packages: '@types/yargs@13.0.12': resolution: {integrity: sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==} - '@typescript-eslint/eslint-plugin@8.11.0': - resolution: {integrity: sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==} + '@typescript-eslint/eslint-plugin@8.12.1': + resolution: {integrity: sha512-gNg/inLRcPoBsKKIe4Vv38SVSOhk4BKWNO0T56sVff33gRqtTpOsrhHtiOKD1lmIOmCtZMPaW2x/h2FlM+sCEg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -4304,16 +4310,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.11.0': - resolution: {integrity: sha512-Uholz7tWhXmA4r6epo+vaeV7yjdKy5QFCERMjs1kMVsLRKIrSdM6o21W2He9ftp5PP6aWOVpD5zvrvuHZC0bMQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/scope-manager@8.12.1': resolution: {integrity: sha512-bma6sD1iViTt+y9MAwDlBdPTMCqoH/BNdcQk4rKhIZWv3eM0xHmzeSrPJA663PAqFqfpOmtdugycpr0E1mZDVA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.11.0': - resolution: {integrity: sha512-ItiMfJS6pQU0NIKAaybBKkuVzo6IdnAhPFZA/2Mba/uBjuPQPet/8+zh5GtLHwmuFRShZx+8lhIs7/QeDHflOg==} + '@typescript-eslint/type-utils@8.12.1': + resolution: {integrity: sha512-zJzrvbDVjIzVKV2TGHcjembEhws8RWXJhmqfO9hS2gRXBN0gDwGhRPEdJ6AZglzfJ+YA1q09EWpSLSXjBJpIMQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -4321,23 +4323,10 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.11.0': - resolution: {integrity: sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/types@8.12.1': resolution: {integrity: sha512-anMS4es5lxBe4UVcDXOkcDb3csnm5BvaNIbOFfvy/pJEohorsggdVB8MFbl5EZiEuBnZZ0ei1z7W5b6FdFiV1Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.11.0': - resolution: {integrity: sha512-yHC3s1z1RCHoCz5t06gf7jH24rr3vns08XXhfEqzYpd6Hll3z/3g23JRi0jM8A47UFKNc3u/y5KIMx8Ynbjohg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - '@typescript-eslint/typescript-estree@8.12.1': resolution: {integrity: sha512-k/o9khHOckPeDXilFTIPsP9iAYhhdMh3OsOL3i2072PNpFqhqzRHx472/0DeC8H/WZee3bZG0z2ddGRSPgeOKw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -4347,16 +4336,12 @@ packages: typescript: optional: true - '@typescript-eslint/utils@8.11.0': - resolution: {integrity: sha512-CYiX6WZcbXNJV7UNB4PLDIBtSdRmRI/nb0FMyqHPTQD1rMjA0foPLaPUV39C/MxkTd/QKSeX+Gb34PPsDVC35g==} + '@typescript-eslint/utils@8.12.1': + resolution: {integrity: sha512-sDv9yFHrhKe1WN8EYuzfhKCh/sFRupe9P+m/lZ5YgVvPoCUGHNN50IO4llSu7JAbftUM/QcCh+GeCortXPrBYQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - '@typescript-eslint/visitor-keys@8.11.0': - resolution: {integrity: sha512-EaewX6lxSjRJnc+99+dqzTeoDZUfyrA52d2/HRrkI830kgovWsmIiTfmr0NZorzqic7ga+1bS60lRBUgR3n/Bw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/visitor-keys@8.12.1': resolution: {integrity: sha512-2RwdwnNGuOQKdGjuhujQHUqBZhEuodg2sLVPvOfWktvA9sOXOVqARjOyHSyhN2LiJGKxV6c8oOcmOtRcAnEeFw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -8115,6 +8100,11 @@ snapshots: eslint: 8.57.0 eslint-visitor-keys: 3.4.3 + '@eslint-community/eslint-utils@4.4.1(eslint@8.57.0)': + dependencies: + eslint: 8.57.0 + eslint-visitor-keys: 3.4.3 + '@eslint-community/regexpp@4.11.1': {} '@eslint/eslintrc@2.1.4': @@ -11451,14 +11441,14 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.12.1(eslint@8.57.0)(typescript@5.6.3))(eslint@8.57.0)(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.12.1(@typescript-eslint/parser@8.12.1(eslint@8.57.0)(typescript@5.6.3))(eslint@8.57.0)(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.11.1 '@typescript-eslint/parser': 8.12.1(eslint@8.57.0)(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.11.0 - '@typescript-eslint/type-utils': 8.11.0(eslint@8.57.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.11.0(eslint@8.57.0)(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.11.0 + '@typescript-eslint/scope-manager': 8.12.1 + '@typescript-eslint/type-utils': 8.12.1(eslint@8.57.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.1(eslint@8.57.0)(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.12.1 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.2 @@ -11482,20 +11472,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.11.0': - dependencies: - '@typescript-eslint/types': 8.11.0 - '@typescript-eslint/visitor-keys': 8.11.0 - '@typescript-eslint/scope-manager@8.12.1': dependencies: '@typescript-eslint/types': 8.12.1 '@typescript-eslint/visitor-keys': 8.12.1 - '@typescript-eslint/type-utils@8.11.0(eslint@8.57.0)(typescript@5.6.3)': + '@typescript-eslint/type-utils@8.12.1(eslint@8.57.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) - '@typescript-eslint/utils': 8.11.0(eslint@8.57.0)(typescript@5.6.3) + '@typescript-eslint/typescript-estree': 8.12.1(typescript@5.6.3) + '@typescript-eslint/utils': 8.12.1(eslint@8.57.0)(typescript@5.6.3) debug: 4.3.7 ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: @@ -11504,25 +11489,8 @@ snapshots: - eslint - supports-color - '@typescript-eslint/types@8.11.0': {} - '@typescript-eslint/types@8.12.1': {} - '@typescript-eslint/typescript-estree@8.11.0(typescript@5.6.3)': - dependencies: - '@typescript-eslint/types': 8.11.0 - '@typescript-eslint/visitor-keys': 8.11.0 - debug: 4.3.7 - fast-glob: 3.3.2 - is-glob: 4.0.3 - minimatch: 9.0.5 - semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/typescript-estree@8.12.1(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 8.12.1 @@ -11538,22 +11506,17 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.11.0(eslint@8.57.0)(typescript@5.6.3)': + '@typescript-eslint/utils@8.12.1(eslint@8.57.0)(typescript@5.6.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@typescript-eslint/scope-manager': 8.11.0 - '@typescript-eslint/types': 8.11.0 - '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) + '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.0) + '@typescript-eslint/scope-manager': 8.12.1 + '@typescript-eslint/types': 8.12.1 + '@typescript-eslint/typescript-estree': 8.12.1(typescript@5.6.3) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@8.11.0': - dependencies: - '@typescript-eslint/types': 8.11.0 - eslint-visitor-keys: 3.4.3 - '@typescript-eslint/visitor-keys@8.12.1': dependencies: '@typescript-eslint/types': 8.12.1 diff --git a/tooling/eslint/base.js b/tooling/eslint/base.js index 0c9283c80..fb3f56484 100644 --- a/tooling/eslint/base.js +++ b/tooling/eslint/base.js @@ -51,6 +51,7 @@ const config = { '**/*.config.js', '**/*.config.cjs', '**/node_modules', + 'database.types.ts', '.next', 'dist', 'pnpm-lock.yaml', diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json index 4e760ce12..6771ef826 100644 --- a/tooling/eslint/package.json +++ b/tooling/eslint/package.json @@ -15,7 +15,7 @@ "dependencies": { "@next/eslint-plugin-next": "15.0.1", "@types/eslint": "^8.56.10", - "@typescript-eslint/eslint-plugin": "^8.11.0", + "@typescript-eslint/eslint-plugin": "^8.12.1", "@typescript-eslint/parser": "^8.12.1", "eslint-config-prettier": "^9.1.0", "eslint-config-turbo": "^2.2.3",