@@ -117,54 +117,58 @@ export default function loader(content, map, meta) {
117
117
exportOnlyLocals
118
118
) ;
119
119
120
- const exports = getExports (
120
+ const exportItems = getExports (
121
121
messages ,
122
122
exportLocalsStyle ,
123
123
importItemReplacer
124
124
) ;
125
125
126
+ const exportsCode =
127
+ exportItems . length > 0
128
+ ? exportOnlyLocals
129
+ ? `module.exports = {\n${ exportItems . join ( ',\n' ) } \n};`
130
+ : `// Exports\nexports.locals = {\n${ exportItems . join ( ',\n' ) } \n};`
131
+ : '' ;
132
+
126
133
if ( exportOnlyLocals ) {
127
- return callback (
128
- null ,
129
- exports . length > 0
130
- ? `module.exports = {\n${ exports . join ( ',\n' ) } \n};`
131
- : ''
132
- ) ;
134
+ return callback ( null , exportsCode ) ;
133
135
}
134
136
135
137
let cssAsString = JSON . stringify ( result . css ) . replace (
136
138
placholderRegExps . importItemG ,
137
139
importItemReplacer
138
140
) ;
139
141
140
- const imports = getImports ( messages , importPrefix , this , ( message ) => {
141
- if ( message . type !== 'url' ) {
142
- return ;
143
- }
142
+ const importItems = getImports (
143
+ messages ,
144
+ importPrefix ,
145
+ this ,
146
+ ( message ) => {
147
+ if ( message . type !== 'url' ) {
148
+ return ;
149
+ }
144
150
145
- const { placeholder } = message . item ;
151
+ const { placeholder } = message . item ;
146
152
147
- cssAsString = cssAsString . replace (
148
- new RegExp ( placeholder , 'g' ) ,
149
- ( ) => `" + ${ placeholder } + "`
150
- ) ;
151
- } ) ;
153
+ cssAsString = cssAsString . replace (
154
+ new RegExp ( placeholder , 'g' ) ,
155
+ ( ) => `" + ${ placeholder } + "`
156
+ ) ;
157
+ }
158
+ ) ;
152
159
153
160
const runtimeCode = `exports = module.exports = require(${ stringifyRequest (
154
161
this ,
155
162
require . resolve ( './runtime/api' )
156
163
) } )(${ ! ! sourceMap } );\n`;
157
164
const importCode =
158
- imports . length > 0 ? `// Imports\n${ imports . join ( '\n' ) } \n\n` : '' ;
165
+ importItems . length > 0
166
+ ? `// Imports\n${ importItems . join ( '\n' ) } \n\n`
167
+ : '' ;
159
168
const moduleCode = `// Module\nexports.push([module.id, ${ cssAsString } , ""${
160
169
result . map ? `,${ result . map } ` : ''
161
170
} ]);\n\n`;
162
- const exportsCode =
163
- exports . length > 0
164
- ? `// Exports\nexports.locals = {\n${ exports . join ( ',\n' ) } \n};`
165
- : '' ;
166
171
167
- // Embed runtime
168
172
return callback (
169
173
null ,
170
174
runtimeCode + importCode + moduleCode + exportsCode
0 commit comments