From 51e8de6da55f9f359da9d5e74bbb272a1b13ced4 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 15 Nov 2023 15:14:52 +0100 Subject: [PATCH 1/7] feat: disable devtools in test mode --- packages/devtools/src/module.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/devtools/src/module.ts b/packages/devtools/src/module.ts index 90148a7255..aca8e85f95 100644 --- a/packages/devtools/src/module.ts +++ b/packages/devtools/src/module.ts @@ -12,6 +12,10 @@ export default defineNuxtModule({ }, defaults: defaultOptions, setup(options, nuxt) { + // Disbale in test mode + if (process.env.VITEST || process.env.TEST) + return + if (typeof options === 'boolean') options = { enabled: options } From 3c0e28277f5858953a80b86a67335efa553ee380 Mon Sep 17 00:00:00 2001 From: Arash <38922203+arashsheyda@users.noreply.github.com> Date: Thu, 16 Nov 2023 20:29:08 -0700 Subject: [PATCH 2/7] docs: add `nuxt-mongoose` to examples (#516) --- docs/content/2.module/0.guide.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/content/2.module/0.guide.md b/docs/content/2.module/0.guide.md index b23825db63..4723747a26 100644 --- a/docs/content/2.module/0.guide.md +++ b/docs/content/2.module/0.guide.md @@ -188,3 +188,4 @@ Here are a few examples of how to integrate Nuxt DevTools in modules: - [UnoCSS Inspector](https://github.com/unocss/unocss/blob/25021a751494e99e85cfd82cca3855cdf78f6a12/packages/nuxt/src/index.ts#L81-L94) - [Nuxt Vitest runner](https://github.com/danielroe/nuxt-vitest/blob/7bac68d96f27dea6c30c198b7caaaf0b495574ab/packages/nuxt-vitest/src/module.ts#L139-L181) - [Nuxt OG Image Playground](https://github.com/harlan-zw/nuxt-og-image/blob/main/src/module.ts#L136) +- [Nuxt Mongoose](https://github.com/arashsheyda/nuxt-mongoose/blob/main/src/devtools.ts) From e604124512c967cabd1ea623ef1c87e54a585192 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Sat, 18 Nov 2023 10:16:01 +0100 Subject: [PATCH 3/7] fix: tolerant parse error for local options, close #518 --- packages/devtools/src/utils/local-options.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/devtools/src/utils/local-options.ts b/packages/devtools/src/utils/local-options.ts index bde9bc3ae0..490ec64273 100644 --- a/packages/devtools/src/utils/local-options.ts +++ b/packages/devtools/src/utils/local-options.ts @@ -14,11 +14,18 @@ export async function readLocalOptions(defaults: T, options: LocalOptionSearc const { filePath } = getOptionsFilepath(options) if (existsSync(filePath)) { - const options = { - ...defaults, - ...JSON.parse(await fs.readFile(filePath, 'utf-8')).settings || {}, + try { + const options = { + ...defaults, + ...JSON.parse(await fs.readFile(filePath, 'utf-8')).settings || {}, + } + return options + } + catch (e) { + console.error(`[DevTools] failed to parse local options file: ${filePath}, fallback to defaults`) + console.error(e) + return { ...defaults } } - return options } else { return { ...defaults } From 269734087ad45046828459c658ec737f6aad7c88 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Mon, 20 Nov 2023 14:16:04 +0100 Subject: [PATCH 4/7] fix: support user `baseURL`, close #506 --- .../client/components/BuildAnalyzeDetails.vue | 4 ++- packages/devtools/client/composables/rpc.ts | 18 +++++----- packages/devtools/client/nuxt.config.ts | 15 ++++++-- packages/devtools/src/constant.ts | 6 ---- packages/devtools/src/module-main.ts | 36 ++++++++++++++++--- .../src/runtime/plugins/view/client.ts | 5 +-- packages/devtools/src/server-rpc/general.ts | 3 +- 7 files changed, 62 insertions(+), 25 deletions(-) diff --git a/packages/devtools/client/components/BuildAnalyzeDetails.vue b/packages/devtools/client/components/BuildAnalyzeDetails.vue index 12241edcd5..16d8eb8e5f 100644 --- a/packages/devtools/client/components/BuildAnalyzeDetails.vue +++ b/packages/devtools/client/components/BuildAnalyzeDetails.vue @@ -1,13 +1,15 @@