File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed
Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -130,12 +130,12 @@ module.exports = function postHTMLExpressions (options) {
130130 let before = escapeRegexpString ( options . delimiters [ 0 ] )
131131 let after = escapeRegexpString ( options . delimiters [ 1 ] )
132132
133- const delimitersRegexp = new RegExp ( `(?<!@)${ before } (.+?)${ after } ` , 'g ' )
133+ const delimitersRegexp = new RegExp ( `(?<!@{? )${ before } (.+?)${ after } ` , 'gim ' )
134134
135135 before = escapeRegexpString ( options . unescapeDelimiters [ 0 ] )
136136 after = escapeRegexpString ( options . unescapeDelimiters [ 1 ] )
137137
138- const unescapeDelimitersRegexp = new RegExp ( `(?<!@)${ before } (.+?)${ after } ` , 'g ' )
138+ const unescapeDelimitersRegexp = new RegExp ( `(?<!@{? )${ before } (.+?)${ after } ` , 'gim ' )
139139
140140 // make array of delimiters
141141 const delimiters = [
@@ -154,8 +154,8 @@ module.exports = function postHTMLExpressions (options) {
154154 delimitersSettings [ 1 ] = delimiters [ 0 ]
155155 }
156156
157- delimitersReplace = new RegExp ( `@${ escapeRegexpString ( delimitersSettings [ 1 ] . text [ 0 ] ) } ` , 'g ' )
158- unescapeDelimitersReplace = new RegExp ( `@${ escapeRegexpString ( delimitersSettings [ 0 ] . text [ 0 ] ) } ` , 'g ' )
157+ delimitersReplace = new RegExp ( `@${ escapeRegexpString ( delimitersSettings [ 1 ] . text [ 0 ] ) } ` , 'gim ' )
158+ unescapeDelimitersReplace = new RegExp ( `@${ escapeRegexpString ( delimitersSettings [ 0 ] . text [ 0 ] ) } ` , 'gim ' )
159159
160160 // kick off the parsing
161161 return function ( tree ) {
Original file line number Diff line number Diff line change 11{{ foo }}
2- < p data-username ="{{ user.name }} " data-user-id ="user-{{ user.id }}-bar-{{ foo }} ">
2+ < p data-username ="{{ user.name }} " data-user-id ="user-{{ user.id }}-bar-{{ bar }} ">
33 Here's one {{ variable }} and here's {{ another }}. And some bar.
44</ p >
55
6- ignored: {{ foo }}
7- ignoredUnescaped: {{{ foo }}}
6+ ignored: {{ leaveAsIs }}
7+ ignoredUnescaped: {{{ leaveAsIs }}}
88rendered: bar
Original file line number Diff line number Diff line change 11@{{ foo }}
2- < p data-username ="@{{ user.name }} " data-user-id ="user-@{{ user.id }}-{{ foo }}-@{{ foo }} ">
2+ < p data-username ="@{{ user.name }} " data-user-id ="user-@{{ user.id }}-{{ foo }}-@{{ bar }} ">
33 Here's one @{{ variable }} and here's @{{ another }}. And some {{ foo }}.
44</ p >
55
6- ignored: @{{ foo }}
7- ignoredUnescaped: @{{{ foo }}}
6+ ignored: @{{ leaveAsIs }}
7+ ignoredUnescaped: @{{{ leaveAsIs }}}
88rendered: {{ foo }}
You can’t perform that action at this time.
0 commit comments