From 7fafd71e888df58e9838b2126f9af5b9c3393560 Mon Sep 17 00:00:00 2001 From: d064310 Date: Fri, 14 Feb 2025 17:23:24 +0100 Subject: [PATCH] chore(core): fix deps and build --- apps/aurora-portal/src/server/routers.ts | 16 ++++++++++------ packages/config/package.json | 3 +++ pnpm-lock.yaml | 4 ++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/apps/aurora-portal/src/server/routers.ts b/apps/aurora-portal/src/server/routers.ts index 4423497..9adeb4b 100644 --- a/apps/aurora-portal/src/server/routers.ts +++ b/apps/aurora-portal/src/server/routers.ts @@ -5,12 +5,16 @@ import { auroraRouter, mergeRouters } from "./trpc" const coreRouter = mergeRouters(auroraRouter(identityRouters), auroraRouter(computeRouters)) -const extensionRouters = Object.fromEntries( - Object.entries(serverExtensions).map(([key, value]) => [key, value.appRouter]) -) as { - [K in keyof typeof serverExtensions]: (typeof serverExtensions)[K]["appRouter"] -} +export let appRouter = coreRouter -export const appRouter = mergeRouters(coreRouter, auroraRouter(extensionRouters)) +if (serverExtensions !== undefined && Object.keys(serverExtensions).length > 0) { + const extensionRouters = Object.fromEntries( + // @ts-expect-error Object entries + Object.entries(serverExtensions).map(([key, value]) => [key, value.appRouter]) + ) as { + [K in keyof typeof serverExtensions]: (typeof serverExtensions)[K]["appRouter"] + } + appRouter = mergeRouters(coreRouter, auroraRouter(extensionRouters)) +} export type AuroraRouter = typeof appRouter diff --git a/packages/config/package.json b/packages/config/package.json index 6f922fb..eb7f3fa 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -13,5 +13,8 @@ "globals": "^15.8.0", "typescript": "^5.5.4", "typescript-eslint": "^8.13.0" + }, + "dependencies": { + "@eslint/js": "^9.17.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 99de750..be53692 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -320,6 +320,10 @@ importers: version: 2.1.9(@types/node@22.13.2)(jsdom@24.1.3) packages/config: + dependencies: + '@eslint/js': + specifier: ^9.17.0 + version: 9.20.0 devDependencies: '@types/eslint__js': specifier: ^8.42.3