fix(utils/yaml): Remove jinja2 block delimiters from YAML (renovatebo…

…t#26682)
scm-manager · Jan 24, 2024 · c96df4f · c96df4f
1 parent ac41910
commit c96df4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/util/yaml.spec.ts b/lib/util/yaml.spec.ts
@@ -102,12 +102,19 @@ describe('util/yaml', () => {
           codeBlock`
       myObject:
         aString: {{value}}
+        {% if test.enabled %}
+        myNestedObject:
+          aNestedString: {{value}}
+        {% endif %}
       `,
           { removeTemplates: true },
         ),
       ).toEqual({
         myObject: {
           aString: null,
+          myNestedObject: {
+            aNestedString: null,
+          },
         },
       });
     });

diff --git a/lib/util/yaml.ts b/lib/util/yaml.ts
@@ -37,7 +37,9 @@ function massageContent(content: string, options?: YamlOptions): string {
   if (options?.removeTemplates) {
     return content
       .replace(regEx(/{{`.+?`}}/gs), '')
-      .replace(regEx(/{{.+?}}/g), '');
+      .replace(regEx(/{{.+?}}/g), '')
+      .replace(regEx(/{%`.+?`%}/gs), '')
+      .replace(regEx(/{%.+?%}/g), '');
   }
 
   return content;