3 files changed +31
-14
lines changed Original file line number Diff line number Diff line change @@ -75,19 +75,12 @@ module.exports = function (source) {
75
75
var displayName = params . name || getName ( rsrcPath ) ;
76
76
var tag = params . tag || null ;
77
77
var reactDom = params . reactDom || 'react-dom' ;
78
- var attrs = { } ;
79
-
80
- if ( params . attrs ) {
81
- // easier than having to write json in the query
82
- // if anyone wants to exploit it, it's their build process
83
- /*eslint no-eval:0*/
84
- eval ( 'assign(attrs, ' + params . attrs + ');' ) ;
85
- }
78
+ var attrs = assign ( { } , params . attrs || { } ) ;
86
79
87
80
var opts = {
88
- reactDom : reactDom ,
89
- tagName : tag ,
90
- attrs : attrs ,
81
+ reactDom : reactDom ,
82
+ tagName : tag ,
83
+ attrs : attrs ,
91
84
displayName : displayName
92
85
} ;
93
86
Original file line number Diff line number Diff line change 2
2
"name" : " svg-react-loader" ,
3
3
"fullname" : " SVG to React Loader" ,
4
4
"description" : " A Webpack Loader to turn SVGs into React Components" ,
5
- "version" : " 0.3.2 " ,
5
+ "version" : " 0.3.3 " ,
6
6
"keywords" : [
7
7
" webpack" ,
8
8
" loader" ,
Original file line number Diff line number Diff line change 1
1
/*globals describe, it*/
2
2
var react = require ( 'react' ) ;
3
- var loader = require ( 'svg-react-loader ' ) ;
3
+ var loader = require ( '../ ' ) ;
4
4
var babel = require ( 'babel-core' ) ;
5
5
var fs = require ( 'fs' ) ;
6
6
var path = require ( 'path' ) ;
@@ -33,7 +33,7 @@ function read (filepath) {
33
33
return fs . readFileSync ( path . join ( __dirname , filepath ) , 'utf8' ) ;
34
34
}
35
35
36
- describe ( 'something ' , function ( ) {
36
+ describe ( 'svg-react-loader ' , function ( ) {
37
37
it ( 'should return a function' , function ( ) {
38
38
loader . should . be . a . function ;
39
39
} ) ;
@@ -113,4 +113,28 @@ describe('something', function () {
113
113
resourcePath : filename
114
114
} ) ;
115
115
} ) ;
116
+
117
+ it ( 'json query' , function ( done ) {
118
+ var filename = './svg/text.svg' ;
119
+
120
+ invoke ( read ( filename ) , {
121
+ callback : function ( /*error, result*/ ) {
122
+ done ( ) ;
123
+ } ,
124
+ query : '?' + JSON . stringify ( {
125
+ attrs : {
126
+ style : { } ,
127
+ width : 'auto' ,
128
+ height : 'auto'
129
+ }
130
+ } ) ,
131
+ resourceQuery : '?' + JSON . stringify ( {
132
+ attrs : {
133
+ style : { } ,
134
+ width : 'auto' ,
135
+ height : 'auto'
136
+ }
137
+ } )
138
+ } ) ;
139
+ } ) ;
116
140
} ) ;
0 commit comments