diff --git a/apps/cm/package.json b/apps/cm/package.json index 4efede196..cd6d5d253 100644 --- a/apps/cm/package.json +++ b/apps/cm/package.json @@ -25,7 +25,7 @@ "@radix-ui/react-label": "^2.1.2", "@radix-ui/react-slot": "^1.1.2", "@radix-ui/react-tooltip": "^1.1.8", - "@tanstack/react-query": "^5.67.1", + "@tanstack/react-query": "^5.75.5", "@tanstack/react-query-devtools": "^5.75.5", "@tanstack/react-table": "^8.21.2", "@tinymce/tinymce-react": "^5.1.1", @@ -47,17 +47,17 @@ "zustand": "^5.0.3" }, "devDependencies": { - "@eslint/eslintrc": "^3", + "@eslint/eslintrc": "^3.0.0", "@types/js-cookie": "^3.0.6", "@types/node": "^22.13.1", "@types/webpack": "^5.28.5", - "eslint": "^9", - "eslint-config-next": "15.1.7", - "postcss": "^8", + "eslint": "^9.0.0", + "eslint-config-next": "15.4.0", + "postcss": "^8.4.49", "prettier": "^3.4.2", "prettier-plugin-tailwindcss": "^0.6.11", "steiger": "^0.5.5", - "tailwindcss": "^3.4.1", - "typescript": "^5" + "tailwindcss": "^3.4.14", + "typescript": "^5.7.2" } -} +} \ No newline at end of file diff --git a/apps/cs/src/shared/lib/match-query-status.ts b/apps/cs/src/shared/lib/match-query-status.ts index 0e5f45829..408b03388 100644 --- a/apps/cs/src/shared/lib/match-query-status.ts +++ b/apps/cs/src/shared/lib/match-query-status.ts @@ -1,3 +1,4 @@ +import type React from "react"; import { type UseQueryResult } from "@tanstack/react-query"; import type { PageableList } from "../model"; @@ -9,24 +10,24 @@ import type { PageableList } from "../model"; export function matchQueryStatus( query: UseQueryResult>, options: { - Loading?: JSX.Element; - Errored?: JSX.Element | ((error: unknown) => JSX.Element); - Empty?: JSX.Element; + Loading?: React.ReactElement; + Errored?: React.ReactElement | ((error: unknown) => React.ReactElement); + Empty?: React.ReactElement; Success: ( data: UseQueryResult> & { data: NonNullable["data"]>; }, - ) => JSX.Element; + ) => React.ReactElement; }, -): JSX.Element; +): React.ReactElement; export function matchQueryStatus( query: UseQueryResult>, options: { - Loading?: JSX.Element; - Errored?: JSX.Element | ((error: unknown) => JSX.Element); - Success: (data: UseQueryResult>) => JSX.Element; + Loading?: React.ReactElement; + Errored?: React.ReactElement | ((error: unknown) => React.ReactElement); + Success: (data: UseQueryResult>) => React.ReactElement; }, -): JSX.Element; +): React.ReactElement; export function matchQueryStatus( query: UseQueryResult>, { @@ -35,12 +36,12 @@ export function matchQueryStatus( Empty, Success, }: { - Loading?: JSX.Element; - Errored?: JSX.Element | ((error: unknown) => JSX.Element); - Empty?: JSX.Element; - Success: (data: UseQueryResult>) => JSX.Element; + Loading?: React.ReactElement; + Errored?: React.ReactElement | ((error: unknown) => React.ReactElement); + Empty?: React.ReactElement; + Success: (data: UseQueryResult>) => React.ReactElement; }, -): JSX.Element { +): React.ReactElement { if (query.isLoading && Loading) { return Loading; } diff --git a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx index 2883413c2..f0a6f2f80 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/form.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/form.tsx @@ -77,7 +77,7 @@ interface SdmRegFormProps { type FieldComponent = ( field: ControllerRenderProps, -) => JSX.Element; +) => React.ReactElement; export function SdmRegForm({ form, diff --git a/packages/common/business_components/types/mdx.d.ts b/packages/common/business_components/types/mdx.d.ts index b27cae537..d33eb4308 100644 --- a/packages/common/business_components/types/mdx.d.ts +++ b/packages/common/business_components/types/mdx.d.ts @@ -1,4 +1,5 @@ declare module "*.mdx" { - let MDXComponent: (props: unknown) => JSX.Element; + import type React from "react"; + let MDXComponent: (props: unknown) => React.ReactElement; export default MDXComponent; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2af51f2b9..9b0953bda 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -94,7 +94,7 @@ importers: specifier: ^1.1.8 version: 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.7))(@types/react@19.2.7)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@tanstack/react-query': - specifier: ^5.67.1 + specifier: ^5.75.5 version: 5.90.12(react@19.2.1) '@tanstack/react-query-devtools': specifier: ^5.75.5 @@ -155,7 +155,7 @@ importers: version: 5.0.9(@types/react@19.2.7)(immer@10.2.0)(react@19.2.1) devDependencies: '@eslint/eslintrc': - specifier: ^3 + specifier: ^3.0.0 version: 3.3.3 '@types/js-cookie': specifier: ^3.0.6 @@ -167,13 +167,13 @@ importers: specifier: ^5.28.5 version: 5.28.5 eslint: - specifier: ^9 + specifier: ^9.0.0 version: 9.39.1(jiti@1.21.7) eslint-config-next: - specifier: 15.1.7 - version: 15.1.7(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3) + specifier: 15.4.0 + version: 15.4.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3) postcss: - specifier: ^8 + specifier: ^8.4.49 version: 8.5.6 prettier: specifier: ^3.4.2 @@ -185,10 +185,10 @@ importers: specifier: ^0.5.5 version: 0.5.11(typescript@5.9.3) tailwindcss: - specifier: ^3.4.1 + specifier: ^3.4.14 version: 3.4.19 typescript: - specifier: ^5 + specifier: ^5.7.2 version: 5.9.3 apps/common/features: @@ -10092,26 +10092,6 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-config-next@15.1.7(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3): - dependencies: - '@next/eslint-plugin-next': 15.1.7 - '@rushstack/eslint-patch': 1.15.0 - '@typescript-eslint/eslint-plugin': 8.49.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3) - '@typescript-eslint/parser': 8.49.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3) - eslint: 9.39.1(jiti@1.21.7) - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@1.21.7)) - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.1(jiti@1.21.7)) - eslint-plugin-jsx-a11y: 6.10.2(eslint@9.39.1(jiti@1.21.7)) - eslint-plugin-react: 7.37.5(eslint@9.39.1(jiti@1.21.7)) - eslint-plugin-react-hooks: 5.2.0(eslint@9.39.1(jiti@1.21.7)) - optionalDependencies: - typescript: 5.9.3 - transitivePeerDependencies: - - eslint-import-resolver-webpack - - eslint-plugin-import-x - - supports-color - eslint-config-next@15.1.7(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3): dependencies: '@next/eslint-plugin-next': 15.1.7 @@ -10132,6 +10112,26 @@ snapshots: - eslint-plugin-import-x - supports-color + eslint-config-next@15.4.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3): + dependencies: + '@next/eslint-plugin-next': 15.4.0 + '@rushstack/eslint-patch': 1.15.0 + '@typescript-eslint/eslint-plugin': 8.49.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3) + '@typescript-eslint/parser': 8.49.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3) + eslint: 9.39.1(jiti@1.21.7) + eslint-import-resolver-node: 0.3.9 + eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@1.21.7)) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.1(jiti@1.21.7)) + eslint-plugin-jsx-a11y: 6.10.2(eslint@9.39.1(jiti@1.21.7)) + eslint-plugin-react: 7.37.5(eslint@9.39.1(jiti@1.21.7)) + eslint-plugin-react-hooks: 5.2.0(eslint@9.39.1(jiti@1.21.7)) + optionalDependencies: + typescript: 5.9.3 + transitivePeerDependencies: + - eslint-import-resolver-webpack + - eslint-plugin-import-x + - supports-color + eslint-config-next@15.4.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3): dependencies: '@next/eslint-plugin-next': 15.4.0