From 512e815fd37a319bde5e26038f0e2efbc43cfd0a Mon Sep 17 00:00:00 2001 From: Eugen Istoc Date: Sun, 4 Feb 2024 10:32:22 -0500 Subject: [PATCH] Add @bull-board/ui dependency and enable management UI in playground --- package.json | 1 + playground/nuxt.config.ts | 1 + playground/package.json | 3 ++- pnpm-lock.yaml | 3 +++ src/module.ts | 3 +++ src/runtime/server/routes/ui-handler.ts | 4 +++- 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 27299da..e6bccd9 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "dependencies": { "@bull-board/api": "^5.14.0", "@bull-board/h3": "^5.14.0", + "@bull-board/ui": "^5.14.0", "@nuxt/kit": "^3.10.0", "bullmq": "^5.1.8", "colorette": "^2.0.20", diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts index a15efb3..c86d975 100644 --- a/playground/nuxt.config.ts +++ b/playground/nuxt.config.ts @@ -1,6 +1,7 @@ export default defineNuxtConfig({ modules: ["../src/module"], concierge: { + managementUI: true, redis: { host: "localhost", }, diff --git a/playground/package.json b/playground/package.json index 0f4554c..4cf23f4 100644 --- a/playground/package.json +++ b/playground/package.json @@ -5,7 +5,8 @@ "scripts": { "dev": "nuxi dev", "build": "nuxi build", - "generate": "nuxi generate" + "generate": "nuxi generate", + "preview": "nuxi preview" }, "devDependencies": { "nuxt": "latest" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9539372..6e935b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: '@bull-board/h3': specifier: ^5.14.0 version: 5.14.0 + '@bull-board/ui': + specifier: ^5.14.0 + version: 5.14.0 '@nuxt/kit': specifier: ^3.10.0 version: 3.10.0(rollup@3.29.4) diff --git a/src/module.ts b/src/module.ts index 0c1a69a..6dc8ef5 100644 --- a/src/module.ts +++ b/src/module.ts @@ -89,6 +89,9 @@ export default defineNuxtModule({ ); } + // Transpile BullBoard api because its not ESM + nuxt.options.build.transpile.push("@bull-board/api"); + nuxt.options.runtimeConfig.concierge = defu( nuxt.options.runtimeConfig.concierge, options diff --git a/src/runtime/server/routes/ui-handler.ts b/src/runtime/server/routes/ui-handler.ts index ada0ab7..1b5e64b 100644 --- a/src/runtime/server/routes/ui-handler.ts +++ b/src/runtime/server/routes/ui-handler.ts @@ -4,7 +4,6 @@ import { BullMQAdapter } from "@bull-board/api/bullMQAdapter"; import { H3Adapter } from "@bull-board/h3"; import { useRuntimeConfig } from "#imports"; import { $useConcierge } from "#concierge"; - import { consola } from "consola"; const { @@ -14,10 +13,13 @@ const { const serverAdapter = new H3Adapter(); serverAdapter.setBasePath("/_concierge"); +const root = import.meta.dev ? "../" : "../../"; + const bullboard = createBullBoard({ queues: [], serverAdapter, options: { + uiBasePath: `${root}node_modules/@bull-board/ui`, uiConfig: ui, }, });