diff --git a/.gitignore b/.gitignore index 310de5a7..fd267733 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.log* *.cpuprofile node_modules/ +*.tsbuildinfo dist/ dist-* diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index dabb71f1..c7e40049 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -6,8 +6,23 @@ "baseUrl": "./", "paths": { "@/*": ["./src/*"] - } + }, + "rootDir": "src" }, "include": ["src"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + }, + { + "path": "../sdk/tsconfig.json" + }, + { + "path": "../client/tsconfig.json" + } + ] } diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index 1c2c474c..3014a180 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -4,11 +4,19 @@ "baseUrl": "./", "jsx": "react-jsx", "isolatedModules": true, - "declaration": false, + "declaration": true, "declarationMap": false, "composite": true, "outDir": "dist" }, "include": ["src", "config"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + }, + { + "path": "../components/tsconfig.json" + } + ] } diff --git a/packages/components/src/components/BundleDiff/DiffContainer/modules.tsx b/packages/components/src/components/BundleDiff/DiffContainer/modules.tsx index e99be340..99992b19 100644 --- a/packages/components/src/components/BundleDiff/DiffContainer/modules.tsx +++ b/packages/components/src/components/BundleDiff/DiffContainer/modules.tsx @@ -310,25 +310,28 @@ export const Modules: React.FC = ({ data={[ { baseline: - baseline.moduleCodeMap[r.baseline?.id]?.source, + baseline.moduleCodeMap[r.baseline?.id as number] + ?.source, current: - current.moduleCodeMap[r.current?.id]?.source, + current.moduleCodeMap[r.current?.id as number] + ?.source, group: 'Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id] + baseline.moduleCodeMap[r.baseline?.id as number] ?.transformed, current: - current.moduleCodeMap[r.current?.id]?.transformed, + current.moduleCodeMap[r.current?.id as number] + ?.transformed, group: 'Transformed Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id] + baseline.moduleCodeMap[r.baseline?.id as number] ?.parsedSource, current: - current.moduleCodeMap[r.current?.id] + current.moduleCodeMap[r.current?.id as number] ?.parsedSource, group: 'Parsed Source', }, @@ -341,18 +344,22 @@ export const Modules: React.FC = ({ data={[ { baseline: - current.moduleCodeMap[r.current?.id]?.source, + current.moduleCodeMap[r.current?.id as number] + ?.source, current: - current.moduleCodeMap[r.current?.id]?.transformed, + current.moduleCodeMap[r.current?.id as number] + ?.transformed, baselineTitle: 'Current Source', currentTitle: 'Current Transformed Source', group: 'Transformed Source', }, { baseline: - current.moduleCodeMap[r.current?.id]?.source, + current.moduleCodeMap[r.current?.id as number] + ?.source, current: - current.moduleCodeMap[r.current?.id]?.parsedSource, + current.moduleCodeMap[r.current?.id as number] + ?.parsedSource, baselineTitle: 'Current Source', currentTitle: 'Current Parsed Source', group: 'Parsed Source', diff --git a/packages/components/src/components/BundleDiff/DiffContainer/row.tsx b/packages/components/src/components/BundleDiff/DiffContainer/row.tsx index c09a6d3a..3f629e16 100644 --- a/packages/components/src/components/BundleDiff/DiffContainer/row.tsx +++ b/packages/components/src/components/BundleDiff/DiffContainer/row.tsx @@ -394,22 +394,29 @@ export const ModuleRowForAsset: React.FC< file={r.path} data={[ { - baseline: baseline.moduleCodeMap[r.baseline?.id]?.source, - current: current.moduleCodeMap[r.current?.id]?.source, + baseline: + baseline.moduleCodeMap[r.baseline?.id as number] + ?.source, + current: + current.moduleCodeMap[r.current?.id as number]?.source, group: 'Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id]?.transformed, + baseline.moduleCodeMap[r.baseline?.id as number] + ?.transformed, current: - current.moduleCodeMap[r.current?.id]?.transformed, + current.moduleCodeMap[r.current?.id as number] + ?.transformed, group: 'Transformed Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id]?.parsedSource, + baseline.moduleCodeMap[r.baseline?.id as number] + ?.parsedSource, current: - current.moduleCodeMap[r.current?.id]?.parsedSource, + current.moduleCodeMap[r.current?.id as number] + ?.parsedSource, group: 'Parsed Source', }, ]} diff --git a/packages/components/src/pages/BundleSize/components/asset.tsx b/packages/components/src/pages/BundleSize/components/asset.tsx index c6e5c52c..01a5ab10 100644 --- a/packages/components/src/pages/BundleSize/components/asset.tsx +++ b/packages/components/src/pages/BundleSize/components/asset.tsx @@ -182,7 +182,7 @@ export const ModuleCodeViewer: React.FC<{ data: SDK.ModuleData }> = ({ height={window.innerHeight / 1.5} value={ tab - ? source[tab] + ? source[tab as keyof SDK.ModuleSource] : source['parsedSource'] ? source['parsedSource'] : source['source'] diff --git a/packages/components/src/pages/Resources/BundleDiff/DiffContainer/modules.tsx b/packages/components/src/pages/Resources/BundleDiff/DiffContainer/modules.tsx index b5735e8f..5a74338e 100644 --- a/packages/components/src/pages/Resources/BundleDiff/DiffContainer/modules.tsx +++ b/packages/components/src/pages/Resources/BundleDiff/DiffContainer/modules.tsx @@ -310,25 +310,28 @@ export const Modules: React.FC = ({ data={[ { baseline: - baseline.moduleCodeMap[r.baseline?.id]?.source, + baseline.moduleCodeMap[r.baseline?.id as number] + ?.source, current: - current.moduleCodeMap[r.current?.id]?.source, + current.moduleCodeMap[r.current?.id as number] + ?.source, group: 'Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id] + baseline.moduleCodeMap[r.baseline?.id as number] ?.transformed, current: - current.moduleCodeMap[r.current?.id]?.transformed, + current.moduleCodeMap[r.current?.id as number] + ?.transformed, group: 'Transformed Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id] + baseline.moduleCodeMap[r.baseline?.id as number] ?.parsedSource, current: - current.moduleCodeMap[r.current?.id] + current.moduleCodeMap[r.current?.id as number] ?.parsedSource, group: 'Parsed Source', }, @@ -341,18 +344,18 @@ export const Modules: React.FC = ({ data={[ { baseline: - current.moduleCodeMap[r.current?.id]?.source, + current.moduleCodeMap[r.current!.id]?.source, current: - current.moduleCodeMap[r.current?.id]?.transformed, + current.moduleCodeMap[r.current!.id]?.transformed, baselineTitle: 'Current Source', currentTitle: 'Current Transformed Source', group: 'Transformed Source', }, { baseline: - current.moduleCodeMap[r.current?.id]?.source, + current.moduleCodeMap[r.current!.id]?.source, current: - current.moduleCodeMap[r.current?.id]?.parsedSource, + current.moduleCodeMap[r.current!.id]?.parsedSource, baselineTitle: 'Current Source', currentTitle: 'Current Parsed Source', group: 'Parsed Source', diff --git a/packages/components/src/pages/Resources/BundleDiff/DiffContainer/row.tsx b/packages/components/src/pages/Resources/BundleDiff/DiffContainer/row.tsx index 46b8abfa..79016412 100644 --- a/packages/components/src/pages/Resources/BundleDiff/DiffContainer/row.tsx +++ b/packages/components/src/pages/Resources/BundleDiff/DiffContainer/row.tsx @@ -411,22 +411,29 @@ export const ModuleRowForAsset: React.FC< file={r.path} data={[ { - baseline: baseline.moduleCodeMap[r.baseline?.id]?.source, - current: current.moduleCodeMap[r.current?.id]?.source, + baseline: + baseline.moduleCodeMap[r.baseline?.id as number] + ?.source, + current: + current.moduleCodeMap[r.current?.id as number]?.source, group: 'Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id]?.transformed, + baseline.moduleCodeMap[r.baseline?.id as number] + ?.transformed, current: - current.moduleCodeMap[r.current?.id]?.transformed, + current.moduleCodeMap[r.current?.id as number] + ?.transformed, group: 'Transformed Source', }, { baseline: - baseline.moduleCodeMap[r.baseline?.id]?.parsedSource, + baseline.moduleCodeMap[r.baseline?.id as number] + ?.parsedSource, current: - current.moduleCodeMap[r.current?.id]?.parsedSource, + current.moduleCodeMap[r.current?.id as number] + ?.parsedSource, group: 'Parsed Source', }, ]} diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index eed8603b..dc59de7c 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -14,5 +14,16 @@ } }, "include": ["src"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + }, + { + "path": "../graph/tsconfig.json" + } + ] } diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index dabb71f1..e6934968 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -6,8 +6,23 @@ "baseUrl": "./", "paths": { "@/*": ["./src/*"] - } + }, + "rootDir": "src" }, "include": ["src"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + }, + { + "path": "../graph/tsconfig.json" + }, + { + "path": "../sdk/tsconfig.json" + } + ] } diff --git a/packages/document/tsconfig.json b/packages/document/tsconfig.json index bde9ef19..fd310f65 100644 --- a/packages/document/tsconfig.json +++ b/packages/document/tsconfig.json @@ -18,5 +18,10 @@ "checkMdx": true }, "include": ["src", "theme", "i18n.json"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + } + ] } diff --git a/packages/graph/tsconfig.json b/packages/graph/tsconfig.json index 83162af6..5c714370 100644 --- a/packages/graph/tsconfig.json +++ b/packages/graph/tsconfig.json @@ -7,8 +7,17 @@ "baseUrl": "./", "paths": { "@/*": ["./src/*"] - } + }, + "rootDir": "src" }, "include": ["src"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + } + ] } diff --git a/packages/rspack-plugin/tsconfig.json b/packages/rspack-plugin/tsconfig.json index 25468ada..1604216d 100644 --- a/packages/rspack-plugin/tsconfig.json +++ b/packages/rspack-plugin/tsconfig.json @@ -5,5 +5,22 @@ "outDir": "./dist" }, "include": ["src", "tests"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../core/tsconfig.json" + }, + { + "path": "../graph/tsconfig.json" + }, + { + "path": "../sdk/tsconfig.json" + }, + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + } + ] } diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json index dabb71f1..28eeee7b 100644 --- a/packages/sdk/tsconfig.json +++ b/packages/sdk/tsconfig.json @@ -6,8 +6,23 @@ "baseUrl": "./", "paths": { "@/*": ["./src/*"] - } + }, + "rootDir": "src" }, "include": ["src"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + }, + { + "path": "../graph/tsconfig.json" + }, + { + "path": "../client/tsconfig.json" + } + ] } diff --git a/packages/types/src/sdk/server/apis/index.ts b/packages/types/src/sdk/server/apis/index.ts index b92f1aa3..397f70a6 100644 --- a/packages/types/src/sdk/server/apis/index.ts +++ b/packages/types/src/sdk/server/apis/index.ts @@ -11,7 +11,7 @@ import { PluginAPIResponse, PluginAPIRequestBody } from './plugin'; import { GraphAPIResponse, GraphAPIRequestBody } from './graph'; import { AlertsAPIResponse, AlertsAPIRequestBody } from './alerts'; import { RsdoctorManifestMappingKeys } from '../../../manifest'; -import { SDK } from '@/index'; +import { SDK } from '../../../index'; export * from './pagination'; @@ -121,8 +121,8 @@ export interface ResponseTypes }; [API.GetModuleCodeByModuleId]: SDK.ModuleSource; [API.GetModuleCodeByModuleIds]: SDK.ModuleCodeData; - [API.GetAllModuleGraph]: SDK.ModuleGraphData; - [API.GetAllChunkGraph]: SDK.ChunkGraphData; + [API.GetAllModuleGraph]: SDK.ModuleData[]; + [API.GetAllChunkGraph]: SDK.ChunkData[]; } export interface RequestBodyTypes diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index 134d5a13..76ce9928 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -3,9 +3,9 @@ "compilerOptions": { "module": "Node16", "moduleResolution": "Node16", - "declaration": true, "outDir": "./dist", "baseUrl": "./", + "rootDir": "src", "paths": { "@/*": ["./src/*"] } diff --git a/packages/utils/src/common/data/index.ts b/packages/utils/src/common/data/index.ts index 15c5f85a..cea383e6 100644 --- a/packages/utils/src/common/data/index.ts +++ b/packages/utils/src/common/data/index.ts @@ -236,7 +236,9 @@ export class APIDataLoader { const _moduleCodeData = {} as R; if (moduleCodeMap) { moduleIds.forEach((id: number) => { - _moduleCodeData[id] = moduleCodeMap[id] as R; + (_moduleCodeData as Record)[id] = moduleCodeMap[ + id + ] as R; }); return _moduleCodeData as R; } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 9cf8930c..8171f1d6 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -2,8 +2,14 @@ "extends": "@rsdoctor/tsconfig/base", "compilerOptions": { "outDir": "dist", - "baseUrl": "." + "baseUrl": ".", + "rootDir": "src" }, "include": ["src"], - "exclude": ["**/node_modules"] + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../types/tsconfig.json" + } + ] } diff --git a/packages/webpack-plugin/tsconfig.json b/packages/webpack-plugin/tsconfig.json index 25468ada..db2d753b 100644 --- a/packages/webpack-plugin/tsconfig.json +++ b/packages/webpack-plugin/tsconfig.json @@ -2,8 +2,26 @@ "extends": "@rsdoctor/tsconfig/base", "compilerOptions": { "baseUrl": ".", - "outDir": "./dist" + "outDir": "./dist", + "rootDir": "src" }, - "include": ["src", "tests"], - "exclude": ["**/node_modules"] + "include": ["src"], + "exclude": ["**/node_modules"], + "references": [ + { + "path": "../core/tsconfig.json" + }, + { + "path": "../graph/tsconfig.json" + }, + { + "path": "../sdk/tsconfig.json" + }, + { + "path": "../types/tsconfig.json" + }, + { + "path": "../utils/tsconfig.json" + } + ] } diff --git a/scripts/tsconfig/base.json b/scripts/tsconfig/base.json index c5290728..59cbbc42 100644 --- a/scripts/tsconfig/base.json +++ b/scripts/tsconfig/base.json @@ -14,7 +14,8 @@ "noUnusedParameters": true, "jsx": "preserve", "resolveJsonModule": true, - "moduleResolution": "Bundler" + "moduleResolution": "Bundler", + "composite": true }, "$schema": "https://json.schemastore.org/tsconfig", "display": "Base"