@meistrari/tela-build 1.50.2 → 1.50.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meistrari/tela-build",
-  "version": "1.50.2",
+  "version": "1.50.4",
   "type": "module",
   "files": [
     "app.config.ts",

package/plugins/__tests__/avatar-runtime-config.client.test.ts

@@ -0,0 +1,119 @@
+/**
+ * @vitest-environment happy-dom
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+type RuntimeConfig = {
+    app?: Record<string, unknown>
+    public?: Record<string, unknown>
+}
+
+type NuxtWindow = typeof window & {
+    __NUXT__?: {
+        config?: {
+            app?: Record<string, unknown>
+            public?: Record<string, unknown>
+            [key: string]: unknown
+        }
+    }
+}
+
+const runtimeConfig = vi.hoisted((): { current: RuntimeConfig } => ({
+    current: {
+        app: {
+            baseURL: '/',
+            buildAssetsDir: '/_nuxt/',
+            cdnURL: 'https://cdn.example.com/',
+        },
+        public: {
+            avatarAllowedOrigins: 'https://assets.example.com',
+        },
+    },
+}))
+
+vi.mock('nuxt/app', () => ({
+    defineNuxtPlugin: (plugin: () => void) => plugin,
+    useRuntimeConfig: () => runtimeConfig.current,
+}))
+
+// The mocked defineNuxtPlugin returns the setup function unchanged, so the
+// default export is a no-arg callable at runtime even though its static type
+// is Nuxt's Plugin (which expects a nuxtApp argument).
+const { default: mirrorAvatarRuntimeConfig } = await import('../avatar-runtime-config.client') as unknown as { default: () => void }
+
+function getWindow(): NuxtWindow {
+    return window
+}
+
+describe('avatar runtime config plugin', () => {
+    beforeEach(() => {
+        delete getWindow().__NUXT__
+        runtimeConfig.current = {
+            app: {
+                baseURL: '/',
+                buildAssetsDir: '/_nuxt/',
+                cdnURL: 'https://cdn.example.com/',
+            },
+            public: {
+                avatarAllowedOrigins: 'https://assets.example.com',
+            },
+        }
+    })
+
+    it('mirrors public and app runtime config when creating the legacy global', () => {
+        mirrorAvatarRuntimeConfig()
+
+        expect(getWindow().__NUXT__?.config).toEqual({
+            app: runtimeConfig.current.app,
+            public: runtimeConfig.current.public,
+        })
+    })
+
+    it('adds missing app config when public config already exists', () => {
+        getWindow().__NUXT__ = {
+            config: {
+                public: {
+                    avatarAllowedOrigins: 'https://existing.example.com',
+                },
+                otherConfig: 'kept',
+            },
+        }
+
+        mirrorAvatarRuntimeConfig()
+
+        expect(getWindow().__NUXT__?.config).toEqual({
+            app: runtimeConfig.current.app,
+            public: {
+                avatarAllowedOrigins: 'https://existing.example.com',
+            },
+            otherConfig: 'kept',
+        })
+    })
+
+    it('fills missing fields in partial app and public config', () => {
+        getWindow().__NUXT__ = {
+            config: {
+                app: {
+                    baseURL: '/custom/',
+                },
+                public: {
+                    theme: 'dark',
+                },
+            },
+        }
+
+        mirrorAvatarRuntimeConfig()
+
+        expect(getWindow().__NUXT__?.config).toEqual({
+            app: {
+                baseURL: '/custom/',
+                buildAssetsDir: '/_nuxt/',
+                cdnURL: 'https://cdn.example.com/',
+            },
+            public: {
+                avatarAllowedOrigins: 'https://assets.example.com',
+                theme: 'dark',
+            },
+        })
+    })
+})

package/plugins/avatar-runtime-config.client.ts

@@ -1,5 +1,32 @@
 import { defineNuxtPlugin, useRuntimeConfig } from 'nuxt/app'
 
+type RuntimeConfig = {
+    app?: Record<string, unknown>
+    public?: Record<string, unknown>
+}
+
+type NuxtConfig = {
+    app?: Record<string, unknown>
+    public?: Record<string, unknown>
+    [key: string]: unknown
+}
+
+type NuxtWindow = typeof window & {
+    __NUXT__?: {
+        config?: NuxtConfig
+    }
+}
+
+function mergeConfigSection(runtimeSection?: Record<string, unknown>, existingSection?: Record<string, unknown>) {
+    if (!runtimeSection && !existingSection)
+        return
+
+    return {
+        ...runtimeSection,
+        ...existingSection,
+    }
+}
+
 /**
  * tela-build's avatar sanitizer (`sanitizeAvatarImageUrl`) reads its host
  * allowlist from the legacy `window.__NUXT__.config.public` global, which Nuxt 4
@@ -7,21 +34,23 @@ import { defineNuxtPlugin, useRuntimeConfig } from 'nuxt/app'
  * hosts (Google/MS/GitHub/Gravatar), so avatars served from `avatarAllowedOrigins`
  * (e.g. vault asset hosts) fall back to initials.
  *
- * This is a fallback/polyfill, not a replacement: when the global is already
- * populated (Nuxt 3) we leave it untouched, otherwise we mirror the public
- * runtime config onto it so the sanitizer can resolve the configured hosts.
+ * This is a fallback/polyfill, not a replacement: it fills missing legacy
+ * config fields while preserving values already populated by Nuxt.
  */
 export default defineNuxtPlugin(() => {
-    const globalWithNuxt = window as typeof window & {
-        __NUXT__?: { config?: { public?: Record<string, unknown> } }
-    }
+    const globalWithNuxt: NuxtWindow = window
+    const runtimeConfig = useRuntimeConfig() as RuntimeConfig
+    const existingConfig = globalWithNuxt.__NUXT__?.config
+    const appConfig = mergeConfigSection(runtimeConfig.app, existingConfig?.app)
+    const publicConfig = mergeConfigSection(runtimeConfig.public, existingConfig?.public)
 
-    if (globalWithNuxt.__NUXT__?.config?.public)
+    if (!appConfig && !publicConfig)
         return
 
-    const { public: publicConfig } = useRuntimeConfig()
-
     globalWithNuxt.__NUXT__ ??= {}
-    globalWithNuxt.__NUXT__.config ??= {}
-    globalWithNuxt.__NUXT__.config.public = publicConfig
+    globalWithNuxt.__NUXT__.config = {
+        ...existingConfig,
+        ...(appConfig ? { app: appConfig } : {}),
+        ...(publicConfig ? { public: publicConfig } : {}),
+    }
 })