diff --git a/package.json b/package.json index 0f6f2903b..ff49789b7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "turbo": "^2.9.3", "typedoc": "^0.28.17", "typedoc-plugin-markdown": "^4.11.0", - "typescript": "^5.9.3" + "typescript": "^6.0.2" }, "engines": { "node": ">=20.19.0" diff --git a/packages/bot/package.json b/packages/bot/package.json index 7d71ef827..892d8d2cc 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -44,6 +44,6 @@ "sinon": "^21.0.3", "ts-node": "^10.9.2", "tsconfig": "*", - "typescript": "^5.9.3" + "typescript": "^6.0.2" } } diff --git a/packages/discordeno/package.json b/packages/discordeno/package.json index c5c6d4b7d..bf7cbe771 100644 --- a/packages/discordeno/package.json +++ b/packages/discordeno/package.json @@ -42,6 +42,6 @@ "mocha": "^11.7.5", "ts-node": "^10.9.2", "tsconfig": "*", - "typescript": "^5.9.3" + "typescript": "^6.0.2" } } diff --git a/packages/gateway/package.json b/packages/gateway/package.json index 554f062dc..4d9e617d8 100644 --- a/packages/gateway/package.json +++ b/packages/gateway/package.json @@ -47,6 +47,6 @@ "sinon": "^21.0.3", "ts-node": "^10.9.2", "tsconfig": "*", - "typescript": "^5.9.3" + "typescript": "^6.0.2" } } diff --git a/packages/rest/package.json b/packages/rest/package.json index 382c44b3e..79952069e 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -45,6 +45,6 @@ "sinon": "^21.0.3", "ts-node": "^10.9.2", "tsconfig": "*", - "typescript": "^5.9.3" + "typescript": "^6.0.2" } } diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json index 2777b0999..875f5c0d8 100644 --- a/packages/tsconfig/base.json +++ b/packages/tsconfig/base.json @@ -22,7 +22,8 @@ "skipDefaultLibCheck": true, "strict": true, "incremental": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["node"] }, "include": ["${configDir}/src"], "ts-node": { diff --git a/packages/types/package.json b/packages/types/package.json index 5ee441190..401fabac0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -33,6 +33,6 @@ "mocha": "^11.7.5", "ts-node": "^10.9.2", "tsconfig": "*", - "typescript": "^5.9.3" + "typescript": "^6.0.2" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index a675e719d..d6d93239d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -40,6 +40,6 @@ "sinon": "^21.0.3", "ts-node": "^10.9.2", "tsconfig": "*", - "typescript": "^5.9.3" + "typescript": "^6.0.2" } } diff --git a/website/package.json b/website/package.json index 556a7f19f..242c16728 100644 --- a/website/package.json +++ b/website/package.json @@ -37,7 +37,7 @@ "@docusaurus/types": "^3.9.2", "@types/react": "^19.2.14", "turbo": "^2.8.21", - "typescript": "5.9.3", + "typescript": "6.0.2", "webpack": "5.105.4" }, "resolutions": { diff --git a/website/src/components/architecture/BaseFlowChart.tsx b/website/src/components/architecture/BaseFlowChart.tsx index 668f13fb0..e55eec2d8 100644 --- a/website/src/components/architecture/BaseFlowChart.tsx +++ b/website/src/components/architecture/BaseFlowChart.tsx @@ -33,7 +33,7 @@ export default function BaseFlowChart({ initialNodes = [], initialEdges = [] }: nodes={nodes} edges={edges} defaultEdgeOptions={{ focusable: false, animated: true }} - colorMode={color.isDarkTheme ? 'dark' : 'light'} + colorMode={color.colorMode === 'dark' ? 'dark' : 'light'} nodeTypes={{ baseLineNode: () => (
diff --git a/website/src/components/architecture/FlowChart3.tsx b/website/src/components/architecture/FlowChart3.tsx index ee53aaf10..c50cebf02 100644 --- a/website/src/components/architecture/FlowChart3.tsx +++ b/website/src/components/architecture/FlowChart3.tsx @@ -31,8 +31,8 @@ const handlers: Record< }; export default function FlowChart() { - const transformers = []; - const events = []; + const transformers: string[] = []; + const events: string[] = []; const initialNodes: Node[] = [ { id: 'baseNode-gateway', @@ -274,7 +274,7 @@ export default function FlowChart() { const [edges, setEdges] = useEdgesState(initialEdges); const [userClick, setUserClick] = useState(false); - const nodeMouseHandler = (_: React.MouseEvent, node: Node, userTrigger = true) => { + const nodeMouseHandler = (_: React.MouseEvent | null, node: Node, userTrigger = true) => { if (userTrigger) setUserClick(true); if (node.id.split('-')[0] === 'baseNode') { edges.forEach((e) => { @@ -287,6 +287,7 @@ export default function FlowChart() { } if (handlerKeys.find((h) => handlers[h].event === node.id)) { const handlerName = handlerKeys.find((h) => handlers[h].event === node.id); + if (!handlerName) return; const handler = handlers[handlerName]; edges.forEach((e) => { if (e.id.startsWith('baseLine')) return; @@ -401,11 +402,11 @@ export default function FlowChart() { const randomIndex = Math.round((handlerKeys.length - 1) * Math.random()); if (!userClick) { nodeMouseHandler( - undefined, + null, { id: handlerKeys[randomIndex], - data: undefined, - position: undefined, + data: undefined!, + position: undefined!, }, false, ); @@ -439,7 +440,7 @@ export default function FlowChart() { { const server: Node[] = [ { id: `s${id + 1}`, + type: 'default', data: { label: `Server ${id + 1}` }, position: { x: x - 42.5, y: 100 }, }, @@ -54,8 +56,8 @@ const genServer = (x: number, id: number) => { label: `Shard ${id * 500 + (i === 3 ? 49 : i) * 10}-${id * 500 + (i === 3 ? 49 : i) * 10 + 9}`, }, position: { x: x - 112.5 + 75 * i, y: 300 }, - type: 'output', ...defaultNodeOptions, + type: 'output', ...{ style: { ...defaultNodeOptions.style, @@ -78,9 +80,9 @@ const nodes = [ position: { x: -42.5, y: 0 }, type: 'input', }, - ...genServer(-300, 0), + ...genServer(-310, 0), ...genServer(0, 1), - ...genServer(300, 9), + ...genServer(310, 9), { id: 'baseLineNodeText-6', type: 'baseLineNodeText', diff --git a/website/src/components/home/reviews/index.tsx b/website/src/components/home/reviews/index.tsx index d70b9d62d..1c64e778e 100644 --- a/website/src/components/home/reviews/index.tsx +++ b/website/src/components/home/reviews/index.tsx @@ -171,11 +171,13 @@ export default function DiscordenoReviews() { fill="currentColor" /> - {review.memory_improvement - ? (review.memory_improvement.from / 1000).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + - 'GB' + - ` (${DiscordLibraries[review.previous_library]})` - : DiscordLibraries[review.previous_library]} + {review.previous_library + ? review.memory_improvement + ? (review.memory_improvement.from / 1000).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + + 'GB' + + ` (${DiscordLibraries[review.previous_library]})` + : DiscordLibraries[review.previous_library] + : undefined}
→
{review.memory_improvement ? (review.memory_improvement.to / 1000).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') + 'GB' diff --git a/website/tsconfig.json b/website/tsconfig.json index bf08767ce..dd987dc43 100644 --- a/website/tsconfig.json +++ b/website/tsconfig.json @@ -2,8 +2,11 @@ // This file is not used in compilation. It is here just for a nice editor experience. "extends": "@docusaurus/tsconfig", "compilerOptions": { - "baseUrl": ".", - "downlevelIteration": true + // When @docusaurus/tsconfig is updated for TS 6, we can remove this and just extend the base config. + "baseUrl": null, + "paths": { + "@site/*": ["./*"] + } }, "exclude": ["node_modules", ".docusarus", "build"] } diff --git a/website/yarn.lock b/website/yarn.lock index 3e2bbec92..e24b387e8 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -13524,23 +13524,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.9.3": - version: 5.9.3 - resolution: "typescript@npm:5.9.3" +"typescript@npm:6.0.2": + version: 6.0.2 + resolution: "typescript@npm:6.0.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/6bd7552ce39f97e711db5aa048f6f9995b53f1c52f7d8667c1abdc1700c68a76a308f579cd309ce6b53646deb4e9a1be7c813a93baaf0a28ccd536a30270e1c5 + checksum: 10c0/4b860b0bf87cc0fee0f66d8ef2640b5a8a8a8c74d1129adb82e389e5f97124383823c47946bef8a73ede371461143a3aa8544399d2133c7b2e4f07e81860af7f languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.9.3#optional!builtin": - version: 5.9.3 - resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin::version=5.9.3&hash=5786d5" +"typescript@patch:typescript@npm%3A6.0.2#optional!builtin": + version: 6.0.2 + resolution: "typescript@patch:typescript@npm%3A6.0.2#optional!builtin::version=6.0.2&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/ad09fdf7a756814dce65bc60c1657b40d44451346858eea230e10f2e95a289d9183b6e32e5c11e95acc0ccc214b4f36289dcad4bf1886b0adb84d711d336a430 + checksum: 10c0/49f0b84fc6ca55653e77752b8a61beabc09ee3dae5d965c31596225aa6ef213c5727b1d2e895b900416dc603854ba0872ac4a812c2a4ed6793a601f9c675de02 languageName: node linkType: hard @@ -14118,7 +14118,7 @@ __metadata: react: "npm:^19.2.4" react-dom: "npm:^19.2.4" turbo: "npm:^2.8.21" - typescript: "npm:5.9.3" + typescript: "npm:6.0.2" webpack: "npm:5.105.4" languageName: unknown linkType: soft diff --git a/yarn.lock b/yarn.lock index 40c608ff5..9a034f9ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -133,7 +133,7 @@ __metadata: sinon: "npm:^21.0.3" ts-node: "npm:^10.9.2" tsconfig: "npm:*" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" languageName: unknown linkType: soft @@ -158,7 +158,7 @@ __metadata: sinon: "npm:^21.0.3" ts-node: "npm:^10.9.2" tsconfig: "npm:*" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" ws: "npm:^8.20.0" dependenciesMeta: fzstd: @@ -188,7 +188,7 @@ __metadata: sinon: "npm:^21.0.3" ts-node: "npm:^10.9.2" tsconfig: "npm:*" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" languageName: unknown linkType: soft @@ -205,7 +205,7 @@ __metadata: mocha: "npm:^11.7.5" ts-node: "npm:^10.9.2" tsconfig: "npm:*" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" languageName: unknown linkType: soft @@ -227,7 +227,7 @@ __metadata: sinon: "npm:^21.0.3" ts-node: "npm:^10.9.2" tsconfig: "npm:*" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" languageName: unknown linkType: soft @@ -1517,7 +1517,7 @@ __metadata: turbo: "npm:^2.9.3" typedoc: "npm:^0.28.17" typedoc-plugin-markdown: "npm:^4.11.0" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" languageName: unknown linkType: soft @@ -1541,7 +1541,7 @@ __metadata: mocha: "npm:^11.7.5" ts-node: "npm:^10.9.2" tsconfig: "npm:*" - typescript: "npm:^5.9.3" + typescript: "npm:^6.0.2" languageName: unknown linkType: soft @@ -3045,23 +3045,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.9.3": - version: 5.9.3 - resolution: "typescript@npm:5.9.3" +"typescript@npm:^6.0.2": + version: 6.0.2 + resolution: "typescript@npm:6.0.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/6bd7552ce39f97e711db5aa048f6f9995b53f1c52f7d8667c1abdc1700c68a76a308f579cd309ce6b53646deb4e9a1be7c813a93baaf0a28ccd536a30270e1c5 + checksum: 10c0/4b860b0bf87cc0fee0f66d8ef2640b5a8a8a8c74d1129adb82e389e5f97124383823c47946bef8a73ede371461143a3aa8544399d2133c7b2e4f07e81860af7f languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^5.9.3#optional!builtin": - version: 5.9.3 - resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin::version=5.9.3&hash=5786d5" +"typescript@patch:typescript@npm%3A^6.0.2#optional!builtin": + version: 6.0.2 + resolution: "typescript@patch:typescript@npm%3A6.0.2#optional!builtin::version=6.0.2&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/ad09fdf7a756814dce65bc60c1657b40d44451346858eea230e10f2e95a289d9183b6e32e5c11e95acc0ccc214b4f36289dcad4bf1886b0adb84d711d336a430 + checksum: 10c0/49f0b84fc6ca55653e77752b8a61beabc09ee3dae5d965c31596225aa6ef213c5727b1d2e895b900416dc603854ba0872ac4a812c2a4ed6793a601f9c675de02 languageName: node linkType: hard