File tree Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Expand file tree Collapse file tree 2 files changed +14
-2
lines changed Original file line number Diff line number Diff line change @@ -125,12 +125,24 @@ module.exports = function (content) {
125
125
} )
126
126
}
127
127
128
+ // stringify an Array of loader objects
129
+ function stringifyLoaders ( loaders ) {
130
+ return loaders . map ( function ( obj ) {
131
+ return obj && typeof obj === 'object' && typeof obj . loader === 'string'
132
+ ? obj . loader + ( obj . options ? '?' + JSON . stringify ( obj . options ) : '' )
133
+ : obj
134
+ } ) . join ( '!' )
135
+ }
136
+
128
137
function getLoaderString ( type , part , index , scoped ) {
129
138
var lang = part . lang || defaultLang [ type ]
130
139
var loader = loaders [ lang ]
131
140
var rewriter = type === 'styles' ? styleRewriter + ( scoped ? '&scoped=true!' : '!' ) : ''
132
141
var injectString = ( type === 'script' && query . inject ) ? 'inject-loader!' : ''
133
142
if ( loader !== undefined ) {
143
+ if ( Array . isArray ( loader ) ) {
144
+ loader = stringifyLoaders ( loader )
145
+ }
134
146
// add css modules
135
147
if ( type === 'styles' ) {
136
148
loader = addCssModulesToLoader ( loader , part , index )
Original file line number Diff line number Diff line change 58
58
"eslint-config-vue" : " ^1.0.0" ,
59
59
"eslint-plugin-html" : " ^1.5.2" ,
60
60
"expose-loader" : " ^0.7.1" ,
61
- "extract-text-webpack-plugin" : " ^2.0.0-beta.4 " ,
61
+ "extract-text-webpack-plugin" : " ^2.0.0-rc.0 " ,
62
62
"file-loader" : " ^0.9.0" ,
63
63
"inject-loader" : " ^2.0.0" ,
64
64
"jsdom" : " ^9.2.1" ,
75
75
"url-loader" : " ^0.5.7" ,
76
76
"vue" : " ^2.1.0" ,
77
77
"vue-template-compiler" : " ^2.1.0" ,
78
- "webpack" : " ^2.1.0-beta.27 "
78
+ "webpack" : " ^2.2.0 "
79
79
}
80
80
}
You can’t perform that action at this time.
0 commit comments