Skip to content

Commit 36604f1

Browse files
authored
fix(utils/yaml): Remove jinja2 block delimiters from YAML (#26682)
1 parent 5440aab commit 36604f1

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

lib/util/yaml.spec.ts

+7
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,19 @@ describe('util/yaml', () => {
102102
codeBlock`
103103
myObject:
104104
aString: {{value}}
105+
{% if test.enabled %}
106+
myNestedObject:
107+
aNestedString: {{value}}
108+
{% endif %}
105109
`,
106110
{ removeTemplates: true },
107111
),
108112
).toEqual({
109113
myObject: {
110114
aString: null,
115+
myNestedObject: {
116+
aNestedString: null,
117+
},
111118
},
112119
});
113120
});

lib/util/yaml.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ function massageContent(content: string, options?: YamlOptions): string {
3737
if (options?.removeTemplates) {
3838
return content
3939
.replace(regEx(/{{`.+?`}}/gs), '')
40-
.replace(regEx(/{{.+?}}/g), '');
40+
.replace(regEx(/{{.+?}}/g), '')
41+
.replace(regEx(/{%`.+?`%}/gs), '')
42+
.replace(regEx(/{%.+?%}/g), '');
4143
}
4244

4345
return content;

0 commit comments

Comments
 (0)