From 07021d664c7f72dd53c3e8a6f77f1abf9dd9da3a Mon Sep 17 00:00:00 2001 From: Baptiste Leproux Date: Mon, 8 Jun 2026 16:52:58 +0200 Subject: [PATCH] fix(deps): remove useless peers and fix comp resolving --- layer/modules/assistant/index.ts | 13 +++---- .../runtime/components/AssistantComark.ts | 3 +- layer/package.json | 27 +++---------- pnpm-lock.yaml | 38 +++++-------------- 4 files changed, 22 insertions(+), 59 deletions(-) diff --git a/layer/modules/assistant/index.ts b/layer/modules/assistant/index.ts index e052f58d0..beaa76709 100644 --- a/layer/modules/assistant/index.ts +++ b/layer/modules/assistant/index.ts @@ -33,9 +33,6 @@ export default defineNuxtModule({ meta: { name: 'assistant', }, - moduleDependencies: { - '@comark/nuxt': {}, - }, setup(_options, nuxt) { const legacyOptions = nuxt.options.assistant if (legacyOptions && Object.keys(legacyOptions).length > 0) { @@ -77,6 +74,11 @@ export default defineNuxtModule({ }), ) + addComponent({ + name: 'AssistantComark', + filePath: resolve('./runtime/components/AssistantComark'), + }) + if (!hasAiGatewayAuth) { nuxt.hook('modules:done', () => { log.warn('AI assistant disabled: neither `AI_GATEWAY_API_KEY` nor `VERCEL_OIDC_TOKEN` found') @@ -89,11 +91,6 @@ export default defineNuxtModule({ model: options.model, } - addComponent({ - name: 'AssistantComark', - filePath: resolve('./runtime/components/AssistantComark'), - }) - const routePath = options.apiPath!.replace(/^\//, '') addServerHandler({ route: `/${routePath}`, diff --git a/layer/modules/assistant/runtime/components/AssistantComark.ts b/layer/modules/assistant/runtime/components/AssistantComark.ts index eefba10aa..115ad6938 100644 --- a/layer/modules/assistant/runtime/components/AssistantComark.ts +++ b/layer/modules/assistant/runtime/components/AssistantComark.ts @@ -1,4 +1,5 @@ -import highlight from '@comark/nuxt/plugins/highlight' +import { defineComarkComponent } from '@comark/vue' +import highlight from '@comark/vue/plugins/highlight' export default defineComarkComponent({ name: 'AssistantComark', diff --git a/layer/package.json b/layer/package.json index 01fd6d92f..6ccbc07fc 100644 --- a/layer/package.json +++ b/layer/package.json @@ -23,6 +23,10 @@ "README.md" ], "dependencies": { + "@ai-sdk/gateway": "^3.0.120", + "@ai-sdk/mcp": "^1.0.43", + "@ai-sdk/vue": "^3.0.191", + "@comark/vue": "^0.4.0", "@iconify-json/lucide": "^1.2.111", "@iconify-json/simple-icons": "^1.2.85", "@iconify-json/vscode-icons": "^1.2.53", @@ -41,6 +45,7 @@ "@shikijs/themes": "^4.2.0", "@takumi-rs/core": "^1.6.0", "@vueuse/core": "^14.3.0", + "ai": "^6.0.191", "defu": "^6.1.7", "exsolve": "^1.0.8", "git-url-parse": "^16.1.0", @@ -57,29 +62,7 @@ "zod-to-json-schema": "^3.25.2" }, "peerDependencies": { - "@ai-sdk/gateway": "^3.0.120", - "@ai-sdk/mcp": "^1.0.43", - "@ai-sdk/vue": "^3.0.191", - "@comark/nuxt": "^0.3.1", - "ai": "^6.0.191", "better-sqlite3": "12.x", "nuxt": "4.x" - }, - "peerDependenciesMeta": { - "@ai-sdk/gateway": { - "optional": true - }, - "@ai-sdk/mcp": { - "optional": true - }, - "@ai-sdk/vue": { - "optional": true - }, - "@comark/nuxt": { - "optional": true - }, - "ai": { - "optional": true - } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d6ed55ef..427a6e1e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -118,9 +118,9 @@ importers: '@ai-sdk/vue': specifier: ^3.0.191 version: 3.0.191(vue@3.5.35(typescript@6.0.3))(zod@4.4.3) - '@comark/nuxt': - specifier: ^0.3.1 - version: 0.3.1(magicast@0.5.3)(nuxt@4.4.6(@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7))(@parcel/watcher@2.5.6)(@types/node@25.9.1)(@vue/compiler-sfc@3.5.35)(better-sqlite3@12.10.0)(db0@0.3.4(better-sqlite3@12.10.0))(eslint@10.4.1(jiti@2.7.0))(ioredis@5.10.1)(lightningcss@1.32.0)(magicast@0.5.3)(meow@13.2.0)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.4))(rollup@4.60.4)(terser@5.48.0)(tsx@4.22.4)(typescript@6.0.3)(vite@7.3.3(@types/node@25.9.1)(jiti@2.7.0)(lightningcss@1.32.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0))(vue-tsc@3.3.3(typescript@6.0.3))(yaml@2.9.0))(shiki@4.1.0)(vue@3.5.35(typescript@6.0.3)) + '@comark/vue': + specifier: ^0.4.0 + version: 0.4.0(shiki@4.1.0)(vue@3.5.35(typescript@6.0.3)) '@iconify-json/lucide': specifier: ^1.2.111 version: 1.2.111 @@ -454,13 +454,8 @@ packages: '@colordx/core@5.4.3': resolution: {integrity: sha512-kIxYSfA5T8HXjav55UaaH/o/cKivF6jCCGIb8eqtcsfI46wsvlSiT8jMDyrl779qLec3c2c2oHBZo4oAhvbjrQ==} - '@comark/nuxt@0.3.1': - resolution: {integrity: sha512-by3ZbtKosOR9tOpHQxG2DthN/5IlQJMWbdCkja4h/cVWaa39izNMF27kiNg94hA1Uv7nMuctWhTObp/nzW7mcg==} - peerDependencies: - nuxt: ^4.0.0 - - '@comark/vue@0.3.1': - resolution: {integrity: sha512-23fueUVe1tVuRV7M5PsGCcaFqL0cEZJfHRqdx5Ha5kW1F1J2O81B6LFibdh24vASqhjsHuoclrUrjeanq+gfqQ==} + '@comark/vue@0.4.0': + resolution: {integrity: sha512-1o4BBBzVIcxCsPOfWUzcYqdnSSI+bCyldxzlrbATc5U+s40Hm+ls7UppYAHPyOqUQPpMZy2vbvD4ESe+PD5lgg==} peerDependencies: beautiful-mermaid: ^1.1.3 katex: ^0.16.45 @@ -4895,8 +4890,8 @@ packages: colortranslator@5.0.0: resolution: {integrity: sha512-Z3UPUKasUVDFCDYAjP2fmlVRf1jFHJv1izAmPjiOa0OCIw1W7iC8PZ2GsoDa8uZv+mKyWopxxStT9q05+27h7w==} - comark@0.3.2: - resolution: {integrity: sha512-wZ16V3PPItX49EScg6yDswqQ24bsMAhujZUGIf1dBKMmZjqGBa4HmXDe+WZNeqNQSOd8v4AJJT1NKyrvgdf3dA==} + comark@0.4.0: + resolution: {integrity: sha512-s+wZc9FDgxJDxS3oLhDhthuc8EFggd7oEQaGKEFSw/UbECEwM3qMgW/T3dk6eoNTuy+PNSAyPQtjyKZJfudlbA==} peerDependencies: beautiful-mermaid: ^1.1.3 katex: ^0.16.45 @@ -9277,22 +9272,9 @@ snapshots: '@colordx/core@5.4.3': {} - '@comark/nuxt@0.3.1(magicast@0.5.3)(nuxt@4.4.6(@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7))(@parcel/watcher@2.5.6)(@types/node@25.9.1)(@vue/compiler-sfc@3.5.35)(better-sqlite3@12.10.0)(db0@0.3.4(better-sqlite3@12.10.0))(eslint@10.4.1(jiti@2.7.0))(ioredis@5.10.1)(lightningcss@1.32.0)(magicast@0.5.3)(meow@13.2.0)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.4))(rollup@4.60.4)(terser@5.48.0)(tsx@4.22.4)(typescript@6.0.3)(vite@7.3.3(@types/node@25.9.1)(jiti@2.7.0)(lightningcss@1.32.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0))(vue-tsc@3.3.3(typescript@6.0.3))(yaml@2.9.0))(shiki@4.1.0)(vue@3.5.35(typescript@6.0.3))': - dependencies: - '@comark/vue': 0.3.1(shiki@4.1.0)(vue@3.5.35(typescript@6.0.3)) - '@nuxt/kit': 4.4.7(magicast@0.5.3) - comark: 0.3.2(shiki@4.1.0) - nuxt: 4.4.6(@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7))(@parcel/watcher@2.5.6)(@types/node@25.9.1)(@vue/compiler-sfc@3.5.35)(better-sqlite3@12.10.0)(db0@0.3.4(better-sqlite3@12.10.0))(eslint@10.4.1(jiti@2.7.0))(ioredis@5.10.1)(lightningcss@1.32.0)(magicast@0.5.3)(meow@13.2.0)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.4))(rollup@4.60.4)(terser@5.48.0)(tsx@4.22.4)(typescript@6.0.3)(vite@7.3.3(@types/node@25.9.1)(jiti@2.7.0)(lightningcss@1.32.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0))(vue-tsc@3.3.3(typescript@6.0.3))(yaml@2.9.0) - transitivePeerDependencies: - - beautiful-mermaid - - katex - - magicast - - shiki - - vue - - '@comark/vue@0.3.1(shiki@4.1.0)(vue@3.5.35(typescript@6.0.3))': + '@comark/vue@0.4.0(shiki@4.1.0)(vue@3.5.35(typescript@6.0.3))': dependencies: - comark: 0.3.2(shiki@4.1.0) + comark: 0.4.0(shiki@4.1.0) vue: 3.5.35(typescript@6.0.3) optionalDependencies: shiki: 4.1.0 @@ -13784,7 +13766,7 @@ snapshots: colortranslator@5.0.0: {} - comark@0.3.2(shiki@4.1.0): + comark@0.4.0(shiki@4.1.0): dependencies: entities: 8.0.0 htmlparser2: 12.0.0