Skip to content

Commit 7cf10c7

Browse files
committed
fix: support relative include with {%- -%} syntax
1 parent 0111968 commit 7cf10c7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/templates.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { resolve, dirname } from "path"
22
import { readdir, readFile, lstat } from "fs/promises"
33

4-
const reInclude = new RegExp('{%\\s+include\\s+("|\')(\\./\\S+?)\\1\\s+%}', 'g')
4+
const reInclude = new RegExp('{%-?\\s+include\\s+("|\')(\\./\\S+?)\\1\\s+-?%}', 'g')
55

66

77
/**
@@ -33,7 +33,7 @@ export async function resolveTemplates (folder) {
3333
const found = content.match(reInclude)
3434
if (found) {
3535
found.forEach(str => {
36-
const name = str.replace(/^{%\s+include\s+("|')/, '').replace(/("|')\s+%}$/, '')
36+
const name = str.replace(/^{%-?\s+include\s+("|')/, '').replace(/("|')\s+-?%}$/, '')
3737
content = content.replace(str, resolveIncludes(resolve(dirname(filepath), name)))
3838
})
3939
}

test/fixtures/templates-4/b/b.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ b
22

33
{% include "./c/c.j2" %}
44

5-
{% include "./_d.j2" %}
5+
{%- include "./_d.j2" -%}

0 commit comments

Comments
 (0)