Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/fix-unresolvable-typings-imports.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@dextinity/admin": patch
"@dextinity/cms-api": patch
---

Fix unresolvable imports in the published type declarations

Some declaration files imported other modules through the package's `baseUrl` (e.g., `helpers/ThemedComponentBaseProps` or `src/warnings/dto/warning-data`), which can't be resolved in consuming projects, causing these types to become `any`.
6 changes: 6 additions & 0 deletions .changeset/update-typescript-6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@dextinity/admin-generator": patch
"@dextinity/api-generator": patch
---

Update TypeScript to v6
2 changes: 1 addition & 1 deletion demo/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"npm-run-all2": "^8.0.4",
"prettier": "^3.6.2",
"rimraf": "^6.1.2",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"vite": "^7.3.1",
"vite-plugin-compression2": "^2.5.3",
"vite-plugin-html": "^3.2.2"
Expand Down
8 changes: 5 additions & 3 deletions demo/admin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"baseUrl": "./",
"esModuleInterop": true,
"inlineSources": true,
"jsx": "react-jsx",
Expand All @@ -10,14 +9,17 @@
"moduleResolution": "bundler",
"noEmit": true,
"noImplicitAny": true,
"noUncheckedSideEffectImports": false,
"paths": {
"@src/*": ["src/*"]
"@src/*": ["./src/*"]
},
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": false,
"strictNullChecks": true,
"target": "ESNext"
"target": "ESNext",
"types": ["*"]
},
"include": ["src/**/*"],
"ts-node": {
Expand Down
4 changes: 2 additions & 2 deletions demo/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
"rimraf": "^6.1.2",
"storybook": "^10.3.5",
"ts-node": "^10.9.2",
"tsconfig-paths": "^3.15.0",
"typescript": "^5.9.3",
"tsconfig-paths": "^4.2.0",
"typescript": "^6.0.3",
"vite-tsconfig-paths": "^6.0.4",
"vitest": "^4.1.8"
},
Expand Down
3 changes: 2 additions & 1 deletion demo/api/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"compilerOptions": {
"inlineSources": true,
"sourceRoot": "/dist"
"sourceRoot": "/dist",
"tsBuildInfoFile": "./dist/tsconfig.build.tsbuildinfo"
},
"exclude": ["**/*.stories.tsx", "**/*.stories.ts"],
"extends": "./tsconfig.json",
Expand Down
7 changes: 5 additions & 2 deletions demo/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"compilerOptions": {
"baseUrl": "./",
"emitDecoratorMetadata": true,
"esModuleInterop": true,
"experimentalDecorators": true,
Expand All @@ -9,18 +8,22 @@
"lib": ["ES2023"],
"module": "nodenext",
"moduleResolution": "nodenext",
"noUncheckedSideEffectImports": false,
"outDir": "./dist",
"paths": {
"@src/*": ["src/*"]
"@src/*": ["./src/*"]
},
"removeComments": true,
"resolveJsonModule": true,
"rootDir": "./src",
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"strictNullChecks": true,
"strictPropertyInitialization": false,
"target": "ES2023",
"tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo",
"types": ["*"],
"useDefineForClassFields": false
}
}
3 changes: 2 additions & 1 deletion demo/api/tsconfig.lint.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"compilerOptions": {
"incremental": false,
"noEmit": true
"noEmit": true,
"rootDir": "./"
},
"extends": "./tsconfig.json"
}
2 changes: 1 addition & 1 deletion demo/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"stylelint": "^16.24.0",
"stylelint-config-standard-scss": "^16.0.0",
"typed-scss-modules": "^8.1.1",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"vite-tsconfig-paths": "^6.0.4",
"vitest": "^4.1.8"
},
Expand Down
10 changes: 6 additions & 4 deletions demo/site/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"compilerOptions": {
"allowJs": true,
"baseUrl": "./",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"incremental": true,
Expand All @@ -11,8 +10,9 @@
"module": "esnext",
"moduleResolution": "bundler",
"noEmit": true,
"noUncheckedSideEffectImports": false,
"paths": {
"@src/*": ["src/*"]
"@src/*": ["./src/*"]
},
"plugins": [
{
Expand All @@ -22,13 +22,15 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"strict": true,
"target": "es5"
"target": "ES2017",
"types": ["*"]
},
"exclude": ["node_modules"],
"include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts"],
"ts-node": {
"compilerOptions": {
"module": "commonjs"
}
},
"ignoreDiagnostics": [5011]
}
}
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"npm-run-all2": "^8.0.4",
"prettier": "^3.6.2",
"ts-node": "^10.9.2",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"engines": {
"node": ">=18.0"
Expand Down
5 changes: 4 additions & 1 deletion docs/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"compilerOptions": {
"baseUrl": "."
"baseUrl": null,
"noUncheckedSideEffectImports": false,
"strict": false,
"types": ["*"]
},
"extends": "@docusaurus/tsconfig"
}
3 changes: 2 additions & 1 deletion docs/tsconfig.ts-node.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"compilerOptions": {
"esModuleInterop": true,
"module": "CommonJS",
"moduleResolution": "node"
"moduleResolution": "bundler",
"rootDir": "."
},
"extends": "./tsconfig.json",
"ts-node": {
Expand Down
1 change: 1 addition & 0 deletions knip.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://unpkg.com/knip@5/schema.json",
"ignoreUnresolved": ["^\\*$"],
"workspaces": {
".": {
"entry": ["dev-pm.config.ts"],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"open-cli": "^8.0.0",
"prettier": "^3.6.2",
"rimraf": "^6.1.2",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"packageManager": "pnpm@12.4.2",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/admin-color-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react-final-form": "^6.5.9",
"react-intl": "^12.1.2",
"rimraf": "^6.1.2",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"peerDependencies": {
"@mui/material": "^7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/admin-date-time/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"react-final-form": "^6.5.9",
"react-intl": "^12.1.2",
"rimraf": "^6.1.2",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"peerDependencies": {
"@mui/material": "^7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/admin-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"jiti": "^2.7.0",
"object-path": "^0.11.8",
"pluralize": "^8.0.0",
"typescript": "5.9.3"
"typescript": "6.0.3"
},
"devDependencies": {
"@apollo/client": "^3.14.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/admin-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"react-dom": "^19.2.6",
"rimraf": "^6.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"peerDependencies": {
"@mui/material": "^7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/admin-rte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"react-final-form": "^6.5.9",
"react-intl": "^12.1.2",
"rimraf": "^6.1.2",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"vitest": "^4.1.8"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"rimraf": "^6.1.2",
"storybook": "^10.3.5",
"storybook-addon-tag-badges": "^3.1.0",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"vite": "^7.3.1",
"vite-tsconfig-paths": "^6.0.4",
"vitest": "^4.1.8"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { type ComponentsOverrides, TablePagination, type TablePaginationProps, type Theme, type Typography, useThemeProps } from "@mui/material";
import { gridPageCountSelector, gridPaginationSelector, useGridApiContext, useGridRootProps, useGridSelector } from "@mui/x-data-grid";
import type { ThemedComponentBaseProps } from "helpers/ThemedComponentBaseProps";
import { type ChangeEvent, type FunctionComponent, useCallback } from "react";
import { FormattedMessage } from "react-intl";

import type { ThemedComponentBaseProps } from "../../helpers/ThemedComponentBaseProps";
import { PageInformation, Root } from "./DataGridPagination.styles";
import { DataGridPaginationActions } from "./paginationActions/DataGridPaginationActions";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
useThemeProps,
} from "@mui/material";
import { gridPageCountSelector, gridPaginationSelector, useGridApiContext, useGridSelector } from "@mui/x-data-grid";
import type { ThemedComponentBaseProps } from "helpers/ThemedComponentBaseProps";
import type { FunctionComponent, PropsWithChildren, ReactNode } from "react";
import { FormattedMessage } from "react-intl";

import type { ThemedComponentBaseProps } from "../../../helpers/ThemedComponentBaseProps";
import { PageOf, PreviousNext, Root } from "./DataGridPaginationActions.styles";

export type DataGridPaginationActionsClassKey = "root" | "pageOf" | "previousNext";
Expand Down
3 changes: 1 addition & 2 deletions packages/admin/admin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"compilerOptions": {
"baseUrl": "src",
"outDir": "lib",
"paths": {
"test-utils": ["./utils/test-utils"]
"test-utils": ["./src/utils/test-utils"]
},
"rootDir": ".",
"typeRoots": ["node_modules/@types", "node_modules/@testing-library"]
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/brevo-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"react-intl": "^12.1.2",
"react-router": "^5.3.4",
"react-router-dom": "^5.3.4",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"peerDependencies": {
"@apollo/client": "^3.7.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/cms-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"react-router-dom": "^5.3.4",
"storybook": "^10.3.5",
"storybook-addon-tag-badges": "^3.1.0",
"typescript": "5.9.3",
"typescript": "6.0.3",
"vite": "^7.3.1",
"vite-tsconfig-paths": "^6.0.3",
"vitest": "^4.1.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const Basic = () => {
blocks: {
variant: {
title: "Variant",
block: createCompositeBlockSelectField({
block: createCompositeBlockSelectField<"primary" | "secondary" | "tertiary">({
defaultValue: "primary",
options: [
{ value: "primary", label: "Primary" },
Expand Down Expand Up @@ -46,7 +46,7 @@ export const WithIcon = () => {
blocks: {
density: {
title: "Density",
block: createCompositeBlockSelectField({
block: createCompositeBlockSelectField<"compact" | "standard" | "comfortable">({
defaultValue: "compact",
options: [
{
Expand Down
3 changes: 1 addition & 2 deletions packages/admin/cms-admin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"compilerOptions": {
"baseUrl": "src",
"outDir": "lib",
"paths": {
"test-utils": ["./testing/test-utils"]
"test-utils": ["./src/testing/test-utils"]
},
"rootDir": "src",
"strict": true
Expand Down
2 changes: 1 addition & 1 deletion packages/api/api-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"pluralize": "^8.0.0",
"ts-morph": "^25.0.1",
"ts-node": "^10.9.2",
"typescript": "^5.9.3"
"typescript": "^6.0.3"
},
"devDependencies": {
"@dextinity/eslint-config": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/brevo-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"rimraf": "^3.0.2",
"rxjs": "^7.8.2",
"ts-node": "^10.9.2",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"unplugin-swc": "^1.5.9",
"vitest": "^4.1.8"
},
Expand Down
3 changes: 3 additions & 0 deletions packages/api/brevo-api/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"compilerOptions": {
"tsBuildInfoFile": "./lib/tsconfig.build.tsbuildinfo"
},
"exclude": ["node_modules", "lib", "**/*.test.tsx", "**/*.test.ts", "**/*.spec.tsx", "**/*.spec.ts", "**/__tests__"],
"extends": "./tsconfig.json"
}
8 changes: 6 additions & 2 deletions packages/api/brevo-api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
{
"compilerOptions": {
"baseUrl": "./",
"declarationMap": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"incremental": true,
"lib": ["ES2023"],
"outDir": "./lib",
"paths": {
"src/*": ["./src/*"]
},
"removeComments": true,
"rootDir": "./src",
"sourceMap": true,
"strict": true,
"strictNullChecks": true,
"strictPropertyInitialization": false,
"target": "ES2023"
"target": "ES2023",
"tsBuildInfoFile": "./lib/tsconfig.tsbuildinfo"
},
"exclude": ["node_modules", "lib"],
"extends": "../tsconfig.base.json",
Expand Down
Loading
Loading