fix(yaml): less aggressive jinja2 stripping #33190
Conversation
| @@ -143,7 +143,7 @@ export function dump(obj: any, opts?: DumpOptions): string { | |||
| function massageContent(content: string, options?: YamlOptions): string { | |||
| if (options?.removeTemplates) { | |||
| return content | |||
| .replace(regEx(/\s+{{.+?}}:.+/gs), '') | |||
| .replace(regEx(/\n\s*{{.+?}}:\s*\n/gs), '') | |||
There was a problem hiding this comment.
| .replace(regEx(/\n\s*{{.+?}}:\s*\n/gs), '') | |
| .replace(regEx(/^\s*{{.+?}}:\s*\n/gs), '') |
otherwise you'll remove one new line to much
There was a problem hiding this comment.
Will that ^ match "start of line" or "start of file"?
There was a problem hiding this comment.
If I open the regexr link and use that regex, it no longer matches the template. The documentation for ^ mentions:
Matches the beginning of the string, or the beginning of a line if the multiline flag (m) is enabled.
So, to answer the question above, it matches the "start of file" when the multiline flag is disabled (by default).
Enabling the multiline flag makes the regex work as expected (regexr link):
| .replace(regEx(/\n\s*{{.+?}}:\s*\n/gs), '') | |
| .replace(regEx(/^\s*{{.+?}}:\s*\n/gms), '') |
There was a problem hiding this comment.
single line flag is also required, so . doesn't match newline
There was a problem hiding this comment.
If you don't want . to match newlines, you should remove the dotall flag:
| .replace(regEx(/\n\s*{{.+?}}:\s*\n/gs), '') | |
| .replace(regEx(/^\s*{{.+?}}:\s*\n/gm), '') |
There was a problem hiding this comment.
I think we're stuck again? @viceice please propose a fully working change
Changes
Context
#32967
https://regexr.com/89otc
Documentation (please check one with an [x])
How I've tested my work (please select one)
I have verified these changes via: