Comparing version 1.0.6 to 1.1.0
@@ -174,9 +174,9 @@ /* | ||
.replace( /\$SUBROOT/g, '$(\\\'#\'+ guid + dguid + \'\\\')' ) | ||
.replace( /([^\.])require\(([^\)]*)\)/ig, function ( _, a, b ) { | ||
var _b = ( b || '' ) | ||
.replace( /(^|[^\.])require\(([^\)]*)\)/ig, function ( a, b, c ) { | ||
var _c = ( c || '' ) | ||
.split( ',' ); | ||
_b.map( function ( value, index ) { | ||
_b[ index ] = that.trim( _b[ index ] ); | ||
_c.map( function ( value, index ) { | ||
_c[ index ] = that.trim( _c[ index ] ); | ||
} ); | ||
return _ + '$TPLS[' + _b[ 0 ] + '](' + ( _b.length > 1 ? _b[ 1 ] : '$DATA' ) + ', "\'+ guid +\'")'; | ||
return b + '$TPLS[' + _c[ 0 ] + '](' + ( _c.length > 1 ? _c[ 1 ] : '$DATA' ) + ', "\'+ guid +\'")'; | ||
} ) + '\\n\');\n'; | ||
@@ -183,0 +183,0 @@ } |
@@ -79,9 +79,9 @@ var fs = require( 'fs' ); | ||
.replace( /\$SUBROOT/g, '$(\\\'#\'+ guid + dguid + \'\\\')' ) | ||
.replace( /([^\.])require\(([^\)]*)\)/ig, function ( _, a, b ) { | ||
var _b = ( b || '' ) | ||
.replace( /(^|[^\.])require\(([^\)]*)\)/ig, function ( a, b, c ) { | ||
var _c = ( c || '' ) | ||
.split( ',' ); | ||
_b.map( function ( value, index ) { | ||
_b[ index ] = that.trim( _b[ index ] ); | ||
_c.map( function ( value, index ) { | ||
_c[ index ] = that.trim( _c[ index ] ); | ||
} ); | ||
return _ + '$TPLS[' + _b[ 0 ] + '](' + ( _b.length > 1 ? _b[ 1 ] : '$DATA' ) + ', "\'+ guid +\'")'; | ||
return b + '$TPLS[' + _c[ 0 ] + '](' + ( _c.length > 1 ? _c[ 1 ] : '$DATA' ) + ', "\'+ guid +\'")'; | ||
} ) + '\\n\');\n'; | ||
@@ -88,0 +88,0 @@ } |
@@ -20,3 +20,3 @@ { | ||
}, | ||
"version": "1.0.6", | ||
"version": "1.1.0", | ||
"readmeFilename": "README.md", | ||
@@ -23,0 +23,0 @@ "bugs": { |
36421