From 09492f79f29c0b5dd7a642f76f55aa3d305c0a69 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Wed, 19 Feb 2025 20:47:46 +0800 Subject: [PATCH 01/10] fix(vite): exclude `@nuxt/ui` from vite pre-optimization (#3352) Co-authored-by: Benjamin Canac --- src/plugins/plugins.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/plugins/plugins.ts b/src/plugins/plugins.ts index 245c886f..629e2e24 100644 --- a/src/plugins/plugins.ts +++ b/src/plugins/plugins.ts @@ -51,6 +51,18 @@ ${plugins.map(p => ` app.use(${genSafeVariableName(p)})`).join('\n')} } } ` + }, + // Argument Vite specific configuration + vite: { + config() { + return { + // Opt-out Nuxt UI from Vite's pre-bundling, + // as we need Vite's pipeline to resolve imports like `#imports` + optimizeDeps: { + exclude: ['@nuxt/ui'] + } + } + } } } satisfies UnpluginOptions } From d33a83e147b009ebe1e52b7d677d364d18f24333 Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Wed, 19 Feb 2025 15:19:36 +0100 Subject: [PATCH 02/10] fix(Modal/Slideover): fixed header height Resolves #3333 --- src/theme/modal.ts | 2 +- src/theme/slideover.ts | 2 +- .../__snapshots__/Modal-vue.spec.ts.snap | 34 ++++++++--------- .../__snapshots__/Modal.spec.ts.snap | 34 ++++++++--------- .../__snapshots__/Slideover-vue.spec.ts.snap | 38 +++++++++---------- .../__snapshots__/Slideover.spec.ts.snap | 38 +++++++++---------- 6 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/theme/modal.ts b/src/theme/modal.ts index e9c98e83..7705b710 100644 --- a/src/theme/modal.ts +++ b/src/theme/modal.ts @@ -2,7 +2,7 @@ export default { slots: { overlay: 'fixed inset-0 bg-(--ui-bg-elevated)/75', content: 'fixed bg-(--ui-bg) divide-y divide-(--ui-border) flex flex-col focus:outline-none', - header: 'px-4 py-5 sm:px-6', + header: 'flex items-center gap-1.5 p-4 sm:px-6 min-h-16', body: 'flex-1 overflow-y-auto p-4 sm:p-6', footer: 'flex items-center gap-1.5 p-4 sm:px-6', title: 'text-(--ui-text-highlighted) font-semibold', diff --git a/src/theme/slideover.ts b/src/theme/slideover.ts index e9d77f56..adffe8ac 100644 --- a/src/theme/slideover.ts +++ b/src/theme/slideover.ts @@ -2,7 +2,7 @@ export default { slots: { overlay: 'fixed inset-0 bg-(--ui-bg-elevated)/75', content: 'fixed bg-(--ui-bg) divide-y divide-(--ui-border) sm:ring ring-(--ui-border) sm:shadow-lg flex flex-col focus:outline-none', - header: 'px-4 py-5 sm:px-6', + header: 'flex items-center gap-1.5 p-4 sm:px-6 min-h-16', body: 'flex-1 overflow-y-auto p-4 sm:p-6', footer: 'flex items-center gap-1.5 p-4 sm:px-6', title: 'text-(--ui-text-highlighted) font-semibold', diff --git a/test/components/__snapshots__/Modal-vue.spec.ts.snap b/test/components/__snapshots__/Modal-vue.spec.ts.snap index 71a108f4..c856ce51 100644 --- a/test/components/__snapshots__/Modal-vue.spec.ts.snap +++ b/test/components/__snapshots__/Modal-vue.spec.ts.snap @@ -8,7 +8,7 @@ exports[`Modal > renders with body slot correctly 1`] = `