bajo-template 2.3.1 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -30,23 +30,23 @@ function resolveResource (type, item = '', opts = {}, fallbackHandler) {
30
30
  const exts = uniq([`.${fallbackLang}${ext}`, ext])
31
31
  if (opts.lang) exts.unshift(`.${opts.lang}${ext}`)
32
32
 
33
- const extension = subSubNs ? `extend/${subSubNs}/` : ''
33
+ const extension = subSubNs ? `${subSubNs}/` : ''
34
34
  let file
35
35
  // check main override: theme specific
36
36
  if (opts.theme) {
37
- const check = `${this.app.main.dir.pkg}/extend/${this.ns}/extend/${opts.theme}/${ns}/${type}/`
37
+ const check = `${this.app.main.dir.pkg}/extend/${this.ns}/${opts.theme}/${ns}/${type}/`
38
38
  file = filecheck.call(this, { dir, base, exts, check })
39
39
  }
40
40
  // check main override: common
41
41
  if (!file) {
42
- const check = `${this.app.main.dir.pkg}/extend/${this.ns}/extend/${ns}/${type}`
42
+ const check = `${this.app.main.dir.pkg}/extend/${this.ns}/${ns}/${type}`
43
43
  file = filecheck.call(this, { dir, base, exts, check })
44
44
  }
45
45
  // check override: theme specific
46
46
  if (opts.theme && !file) {
47
47
  const theme = find(this.app.waibuMpa.themes, { name: opts.theme })
48
48
  if (theme) {
49
- const check = `${theme.plugin.dir.pkg}/extend/${this.ns}/extend/${opts.theme}/${ns}/${extension}${type}`
49
+ const check = `${theme.plugin.dir.pkg}/extend/${this.ns}/${opts.theme}/${ns}/${extension}${type}`
50
50
  file = filecheck.call(this, { dir, base, exts, check })
51
51
  }
52
52
  }
@@ -54,7 +54,7 @@ function resolveResource (type, item = '', opts = {}, fallbackHandler) {
54
54
  if (opts.theme && !file) {
55
55
  const theme = find(this.app.waibuMpa.themes, { name: opts.theme })
56
56
  if (theme) {
57
- const check = `${theme.plugin.dir.pkg}/extend/${this.ns}/extend/_common/${ns}/${extension}${type}`
57
+ const check = `${theme.plugin.dir.pkg}/extend/${this.ns}/_common/${ns}/${extension}${type}`
58
58
  file = filecheck.call(this, { dir, base, exts, check })
59
59
  }
60
60
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bajo-template",
3
- "version": "2.3.1",
3
+ "version": "2.4.0",
4
4
  "description": "Template Renderer for Bajo Framework",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/wiki/CHANGES.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changes
2
2
 
3
+ ## 2026-02-15
4
+
5
+ - [2.4.0] Template folder reposition
6
+
3
7
  ## 2026-02-09
4
8
 
5
9
  - [2.3.0] Template folder reposition