waibu-mpa 2.1.3 → 2.1.5

package/extend/bajoTemplate/template/wmpa.js

@@ -8,6 +8,8 @@ class Wmpa {
     this.prefixMain = '<%= prefix.main %>'
     this.accessTokenUrl = '<%= accessTokenUrl %>'
     this.renderUrl = '<%= renderUrl %>'
+    this.theme = '<%= _meta.theme.name %>'
+    this.iconset = '<%= _meta.iconset.name %>'
     this.apiPrefix = '<%= api.prefix %>'
     this.apiExt = '<%= api.ext %>'
     this.apiHeaderKey = '<%= api.headerKey %>'
@@ -101,14 +103,22 @@ class Wmpa {
   fetchRender = async (body, qs = {}) => {
     if (_.isArray(body)) body = body.join('\n')
     let url = this.renderUrl + '?'
-    _.forOwn(qs, (v, k) => {
+    _.forOwn(_.omit(qs, ['theme', 'iconset']), (v, k) => {
       url += '&' + k + '=' + v
     })
-    const resp = await fetch(url, {
+    const opts = {
       method: 'POST',
-      headers: { 'Content-Type': 'text/plain', 'Waibu-Referer': window.location.href },
+      headers: {
+        'Content-Type': 'text/plain',
+        'X-Referer': window.location.href,
+        'X-Theme': this.theme,
+        'X-Iconset': this.iconset
+      },
       body
-    })
+    }
+    if (qs.theme) opts.headers['X-Theme'] = qs.theme
+    if (qs.iconset) opts.headers['X-Iconset'] = qs.iconset
+    const resp = await fetch(url, opts)
     if (!resp.ok) throw new Error('Response status: ' + resp.status)
     return await resp.text()
   }

package/extend/waibuMpa/route/component/render.js

@@ -1,11 +1,11 @@
 const component = {
   method: 'POST',
   handler: async function (req, reply) {
-    req.referer = req.headers['waibu-referer']
+    req.referer = req.headers['x-referer']
     const { ext = '.html' } = req.body
     reply.header('Content-Type', `text/html; charset=${this.config.page.charset}`)
     reply.header('Content-Language', req.lang)
-    const opts = { req, reply, partial: true, ext, theme: req.params.theme ?? req.query.theme, iconset: req.params.iconset ?? req.query.iconset }
+    const opts = { req, reply, partial: true, ext, theme: req.headers['x-theme'], iconset: req.headers['x-iconset'] }
     return this.renderString(req.body, req.query, opts)
   }
 }

package/index.js

@@ -628,6 +628,18 @@ async function factory (pkgName) {
       })
       return attrs.join(' ')
     }
+
+    getTheme = (name, nameOnly) => {
+      const theme = this.themes.find(item => item.name === name)
+      if (!theme) return theme
+      return nameOnly ? theme.name : theme
+    }
+
+    getIconset = (name, nameOnly) => {
+      const iconset = this.iconsets.find(item => item.name === name)
+      if (!iconset) return iconset
+      return nameOnly ? iconset.name : iconset
+    }
   }
 
   return WaibuMpa

package/lib/build-page/inject-elements.js

@@ -9,7 +9,6 @@ async function injectElements (options) {
   const { runHook } = this.app.bajo
   const { get, isString, isFunction, isEmpty } = this.app.lib._
   $('html').attr('lang', req.lang)
-  if (req.darkMode) $('body').attr('data-bs-theme', 'dark')
   const rsc = {}
   for (const tag of reply.ctags ?? []) {
     let Builder = get(cmp, `widget.${tag}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-mpa",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "MPA support for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,8 +1,13 @@
 # Changes
 
+## 2026-01-18
+
+- [2.1.5] Dark mode should only be handle by a hook
+
 ## 2026-01-17
 
 - [2.1.3] Bug fix on ```getAppTitle()```
+- [2.1.4] Add capability to set custom theme & iconset through headers
 
 ## 2026-01-13