waibu-mpa 2.18.2 → 2.20.0

package/extend/waibuMpa/route/logo/@id.js

@@ -1,5 +1,4 @@
 async function resolveFile (req) {
-  const { getPlugin, getPluginDataDir } = this.app.bajo
   const { camelCase } = this.app.lib._
   const { fastGlob } = this.app.lib
   const id = camelCase(req.params.id)
@@ -7,7 +6,7 @@ async function resolveFile (req) {
   let files
   if (req.query.type) type = `-${req.query.type}`
   if (id !== 'main') {
-    const plugin = getPlugin(id)
+    const plugin = this.app.getPlugin(id)
     files = await fastGlob(`${plugin.dir.pkg}/logo${type}.*`)
     if (files.length > 0) return files[0]
     throw this.error('_notFound')
@@ -16,7 +15,7 @@ async function resolveFile (req) {
   files = await fastGlob(`${this.app.main.dir.pkg}/logo${type}.*`)
   // 2. site attachment
   if (files.length > 0) return files[0]
-  let dir = getPluginDataDir('dobo')
+  let dir = this.app.getPluginDataDir('dobo')
   files = await fastGlob(`${dir}/attachment/SumbaSite/${req.site.id}/file/logo${type}.*`)
   if (files.length > 0) return files[0]
   // 3. theme

package/index.js

@@ -199,9 +199,8 @@ async function factory (pkgName) {
     }
 
     getPluginTitle = (name, req) => {
-      const { getPlugin } = this.app.bajo
       const { get } = this.app.lib._
-      const plugin = getPlugin(name, true)
+      const plugin = this.app.getPlugin(name, true)
       if (!plugin) return
       const text = get(plugin, 'config.waibuMpa.title', plugin.ns)
       return this.t(text, { lang: req.lang })
@@ -216,7 +215,7 @@ async function factory (pkgName) {
     getResource (name) {
       const subNses = ['layout', 'template', 'partial']
       const { ns, path, subNs, subSubNs, qs } = this.app.bajo.breakNsPath(name)
-      const plugin = this.app.bajo.getPlugin(ns)
+      const plugin = this.app.getPlugin(ns)
       const dir = `${plugin.dir.pkg}/extend/waibuMpa`
       if (!subNses.includes(subNs)) throw this.error('unknownResource%s', name)
       const fullPath = subSubNs ? `${dir}/${subSubNs}/${subNs}${path}` : `${dir}/${subNs}${path}`

package/lib/build-routes.js

@@ -72,14 +72,11 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
 
 async function addRoutes ({ appPrefix, prefix, mods, appCtx, cfg }) {
   const { importModule } = this.app.bajo
-  const isRouteDisabled = await importModule('waibu:/lib/webapp-scope/is-route-disabled.js')
+  const { isRouteDisabled } = this.app.waibu
   const reroutedPath = await importModule('waibu:/lib/webapp-scope/rerouted-path.js')
   for (const mod of mods) {
-    const fullPath = `/${appPrefix}${mod.url}`
-    if (await isRouteDisabled.call(this, fullPath, mod.method, cfg.disabled)) {
-      this.log.warn('routeDisabled%s%s', `${prefix}${fullPath}`, mod.method)
-      continue
-    }
+    const fullPath = appPrefix === '' ? mod.url : `/${appPrefix}${mod.url}`
+    if (isRouteDisabled(`${prefix === '' ? '' : `/${prefix}`}${fullPath}`)) continue
     const rpath = await reroutedPath.call(this, fullPath, cfg.rerouted)
     if (rpath) {
       this.log.warn('rerouted%s%s', `${prefix}${fullPath}`, `${prefix}${rpath}`)
@@ -128,22 +125,19 @@ async function buildRoutes (prefix) {
     subRoutes = groupBy(subRoutes, 'ns')
     for (const k in subRoutes) {
       const items = subRoutes[k]
-      if (items.length === 0) continue
-      const { sns, ns } = items[0]
-      const appCtx = appCtxs[ns]
-      if (!appCtx) throw this.error('cantHaveSubroutesWithoutContext%s', ns)
-      let appPrefix = getPluginPrefix(sns)
-      if (sns === me.ns || (sns === me.app.mainNs && cfg.mountMainAsRoot)) appPrefix = ''
-      await runHook(`${me.ns}.${k}:beforeBuildSubRoutes`, appCtx, appPrefix)
+      const appCtx = appCtxs[k]
+      if (!appCtx) throw this.error('cantHaveSubroutesWithoutContext%s', k)
       for (const item of items) {
-        const { file, sns, ns, dir } = item
-        const scope = this.app[ns]
-        const pathPrefix = `waibuMpa/extend/${ns}/route/`
-        const urlPrefix = getPluginPrefix(sns)
-        const mods = await build.call(scope, { appCtx, files: [file], pathPrefix, dir, ns, cfg, parent: me.ns, urlPrefix, subRoute: sns })
+        let appPrefix = getPluginPrefix(k)
+        if (item.sns === me.ns || (item.sns === me.app.mainNs && cfg.mountMainAsRoot)) appPrefix = ''
+        await runHook(`${me.ns}.${k}:beforeBuildSubRoutes`, appCtx, appPrefix)
+        const scope = this.app[item.sns]
+        const pathPrefix = `waibuMpa/extend/${item.ns}/route/`
+        const urlPrefix = getPluginPrefix(item.sns)
+        const mods = await build.call(scope, { appCtx, files: [item.file], pathPrefix, dir: item.dir, ns: item.ns, cfg, parent: me.ns, urlPrefix, subRoute: item.sns })
         await addRoutes.call(me, { appPrefix, prefix, mods, appCtx, cfg })
+        await runHook(`${me.ns}.${k}:afterBuildSubRoutes`, appCtx, appPrefix)
       }
-      await runHook(`${me.ns}.${k}:afterBuildSubRoutes`, appCtx, appPrefix)
     }
   }
 

package/lib/class/widget/page-end.js

@@ -11,7 +11,7 @@ async function pageEndFactory () {
     }
 
     build = async () => {
-      const { get } = this.app.lib._
+      const { get, isEmpty } = this.app.lib._
       const { groupAttrs } = this.app.waibuMpa
       const { widget, locals, req } = this.component
 
@@ -23,7 +23,7 @@ async function pageEndFactory () {
       let tc = ''
       if (!this.params.attr.noToastContainer && widget.toastStack && widget.toast) {
         const toasts = []
-        if (get(locals, 'error')) {
+        if (get(locals, 'error') && !isEmpty(get(locals, '_meta.flash'))) {
           const details = get(locals.error, 'details', [])
           const attr = {
             border: 'side:all width:0',

package/lib/class/widget.js

@@ -14,7 +14,7 @@ async function widgetFactory () {
       super(component.plugin)
       const names = kebabCase(this.constructor.name).split('-')
       const alias = names.length > 1 ? names[0] : 'wbs'
-      let plugin = this.app.bajo.getPlugin(alias, true)
+      let plugin = this.app.getPlugin(alias, true)
       if (!plugin) plugin = this.app.waibuBootstrap
       this.plugin = plugin
       this.app = plugin.app

package/lib/favicon.js

@@ -1,14 +1,14 @@
 async function handleFavicon () {
   if (!this.config.favicon) return
-  const { getPluginFile, importModule, getPluginDataDir } = this.app.bajo
+  const { importModule } = this.app.bajo
   const { fs } = this.app.lib
   const handleDownload = await importModule('waibu:/lib/handle-download.js')
   const me = this
   this.webAppCtx.get('/favicon.:ext', async function (req, reply) {
     // 1. main favicon
-    let file = getPluginFile(`main:/favicon.${req.params.ext}`)
+    let file = me.app.getPluginFile(`main:/favicon.${req.params.ext}`)
     if (!fs.existsSync(file)) {
-      const dir = getPluginDataDir('dobo')
+      const dir = me.app.getPluginDataDir('dobo')
       // 2. site attachment
       file = `${dir}/attachment/SumbaSite/${req.site.id}/file/favicon.${req.params.ext}`
     }
@@ -18,7 +18,7 @@ async function handleFavicon () {
       file = `${theme.plugin.dir.pkg}/extend/waibuStatic/asset/favicon.${req.params.ext}`
     }
     // 4. Default
-    if (!fs.existsSync(file)) file = getPluginFile('waibu:/favicon.png')
+    if (!fs.existsSync(file)) file = me.app.getPluginFile('waibu:/favicon.png')
     reply.header('cache-control', 'max-age=86400')
     return await handleDownload.call(me, file, req, reply)
   })

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-06-12
+
+- [2.20.0] Necessary updates to ```bajo@2.18.0``` specs
+
+## 2026-06-10
+
+- [2.19.0] Remove route redirects because now directly handled by ```waibu```
+- [2.19.0] Bug fix in ```page-end``` widget
+
 ## 2026-06-05
 
 - [2.18.2] Bug fix in ```error-handler.js```