File tree 3 files changed +18
-12
lines changed
3 files changed +18
-12
lines changed Original file line number Diff line number Diff line change
1
+ /*
2
+ MIT License http://www.opensource.org/licenses/mit-license.php
3
+ Author Tobias Koppers @sokra
4
+ */
5
+ module . exports = function getImportPrefix ( loaderContext , query ) {
6
+ if ( query . importLoaders === false )
7
+ return "" ;
8
+ var importLoaders = parseInt ( query . importLoaders , 10 ) || 0 ;
9
+ var loadersRequest = loaderContext . loaders . slice (
10
+ loaderContext . loaderIndex ,
11
+ loaderContext . loaderIndex + 1 + importLoaders
12
+ ) . map ( function ( x ) { return x . request ; } ) . join ( "!" ) ;
13
+ return "-!" + loadersRequest + "!" ;
14
+ } ;
Original file line number Diff line number Diff line change 5
5
var path = require ( "path" ) ;
6
6
var loaderUtils = require ( "loader-utils" ) ;
7
7
var processCss = require ( "./processCss" ) ;
8
+ var getImportPrefix = require ( "./getImportPrefix" ) ;
8
9
9
10
10
11
module . exports = function ( content , map ) {
11
12
if ( this . cacheable ) this . cacheable ( ) ;
12
13
var query = loaderUtils . parseQuery ( this . query ) ;
13
14
var root = query . root ;
14
- var importLoaders = parseInt ( query . importLoaders , 10 ) || 0 ;
15
15
var moduleMode = query . module ;
16
16
17
17
if ( typeof map !== "string" ) {
@@ -30,11 +30,7 @@ module.exports = function(content, map) {
30
30
var cssAsString = JSON . stringify ( result . source ) ;
31
31
32
32
// for importing CSS
33
- var loadersRequest = this . loaders . slice (
34
- this . loaderIndex ,
35
- this . loaderIndex + 1 + importLoaders
36
- ) . map ( function ( x ) { return x . request ; } ) . join ( "!" ) ;
37
- var importUrlPrefix = "-!" + loadersRequest + "!" ;
33
+ var importUrlPrefix = getImportPrefix ( this , query ) ;
38
34
39
35
var alreadyImported = { } ;
40
36
var importJs = result . importItems . filter ( function ( imp ) {
Original file line number Diff line number Diff line change 4
4
*/
5
5
var loaderUtils = require ( "loader-utils" ) ;
6
6
var processCss = require ( "./processCss" ) ;
7
+ var getImportPrefix = require ( "./getImportPrefix" ) ;
7
8
8
9
9
10
module . exports = function ( content ) {
10
11
if ( this . cacheable ) this . cacheable ( ) ;
11
12
var query = loaderUtils . parseQuery ( this . query ) ;
12
- var importLoaders = parseInt ( query . importLoaders , 10 ) || 0 ;
13
13
var moduleMode = query . module ;
14
14
15
15
var result = processCss ( content , null , {
@@ -20,11 +20,7 @@ module.exports = function(content) {
20
20
} ) ;
21
21
22
22
// for importing CSS
23
- var loadersRequest = this . loaders . slice (
24
- this . loaderIndex ,
25
- this . loaderIndex + 1 + importLoaders
26
- ) . map ( function ( x ) { return x . request ; } ) . join ( "!" ) ;
27
- var importUrlPrefix = "-!" + loadersRequest + "!" ;
23
+ var importUrlPrefix = getImportPrefix ( this , query ) ;
28
24
29
25
function importItemMatcher ( item ) {
30
26
var match = result . importItemRegExp . exec ( item ) ;
You can’t perform that action at this time.
0 commit comments