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) {
130
130
let before = escapeRegexpString ( options . delimiters [ 0 ] )
131
131
let after = escapeRegexpString ( options . delimiters [ 1 ] )
132
132
133
- const delimitersRegexp = new RegExp ( `(?<!@)${ before } (.+?)${ after } ` , 'g ' )
133
+ const delimitersRegexp = new RegExp ( `(?<!@{? )${ before } (.+?)${ after } ` , 'gim ' )
134
134
135
135
before = escapeRegexpString ( options . unescapeDelimiters [ 0 ] )
136
136
after = escapeRegexpString ( options . unescapeDelimiters [ 1 ] )
137
137
138
- const unescapeDelimitersRegexp = new RegExp ( `(?<!@)${ before } (.+?)${ after } ` , 'g ' )
138
+ const unescapeDelimitersRegexp = new RegExp ( `(?<!@{? )${ before } (.+?)${ after } ` , 'gim ' )
139
139
140
140
// make array of delimiters
141
141
const delimiters = [
@@ -154,8 +154,8 @@ module.exports = function postHTMLExpressions (options) {
154
154
delimitersSettings [ 1 ] = delimiters [ 0 ]
155
155
}
156
156
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 ' )
159
159
160
160
// kick off the parsing
161
161
return function ( tree ) {
Original file line number Diff line number Diff line change 1
1
{{ 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 }} ">
3
3
Here's one {{ variable }} and here's {{ another }}. And some bar.
4
4
</ p >
5
5
6
- ignored: {{ foo }}
7
- ignoredUnescaped: {{{ foo }}}
6
+ ignored: {{ leaveAsIs }}
7
+ ignoredUnescaped: {{{ leaveAsIs }}}
8
8
rendered: bar
Original file line number Diff line number Diff line change 1
1
@{{ 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 }} ">
3
3
Here's one @{{ variable }} and here's @{{ another }}. And some {{ foo }}.
4
4
</ p >
5
5
6
- ignored: @{{ foo }}
7
- ignoredUnescaped: @{{{ foo }}}
6
+ ignored: @{{ leaveAsIs }}
7
+ ignoredUnescaped: @{{{ leaveAsIs }}}
8
8
rendered: {{ foo }}
You can’t perform that action at this time.
0 commit comments