File tree 2 files changed +17
-2
lines changed
2 files changed +17
-2
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ module.exports = function(useSourceMap) {
25
25
var alreadyImportedModules = { } ;
26
26
for ( var i = 0 ; i < this . length ; i ++ ) {
27
27
var id = this [ i ] [ 0 ] ;
28
- if ( typeof id === "number" )
28
+ if ( id != null )
29
29
alreadyImportedModules [ id ] = true ;
30
30
}
31
31
for ( i = 0 ; i < modules . length ; i ++ ) {
@@ -34,7 +34,7 @@ module.exports = function(useSourceMap) {
34
34
// this implementation is not 100% perfect for weird media query combinations
35
35
// when a module is imported multiple times with different media queries.
36
36
// I hope this will never occur (Hey this way we have smaller bundles)
37
- if ( typeof item [ 0 ] ! == "number" || ! alreadyImportedModules [ item [ 0 ] ] ) {
37
+ if ( item [ 0 ] == null || ! alreadyImportedModules [ item [ 0 ] ] ) {
38
38
if ( mediaQuery && ! item [ 2 ] ) {
39
39
item [ 2 ] = mediaQuery ;
40
40
} else if ( mediaQuery ) {
Original file line number Diff line number Diff line change @@ -52,6 +52,21 @@ describe("css-base", function() {
52
52
"@media print{body { d: 4; }}" +
53
53
"@media screen{body { a: 1; }}" ) ;
54
54
} ) ;
55
+ it ( "should import named modules" , function ( ) {
56
+ var m = base ( ) ;
57
+ var m1 = [ "./module1" , "body { a: 1; }" , "screen" ] ;
58
+ var m2 = [ "./module2" , "body { b: 2; }" , "" ] ;
59
+ var m3 = [ "./module3" , "body { c: 3; }" , "" ] ;
60
+ var m4 = [ "./module4" , "body { d: 4; }" , "" ] ;
61
+ m . i ( [ m2 , m3 ] , "" ) ;
62
+ m . i ( [ m2 ] , "" ) ;
63
+ m . i ( [ m2 , m4 ] , "print" ) ;
64
+ m . push ( m1 ) ;
65
+ m . toString ( ) . should . be . eql ( "body { b: 2; }" +
66
+ "body { c: 3; }" +
67
+ "@media print{body { d: 4; }}" +
68
+ "@media screen{body { a: 1; }}" ) ;
69
+ } ) ;
55
70
it ( "should toString with source mapping" , function ( ) {
56
71
var m = base ( true ) ;
57
72
m . push ( [ 1 , "body { a: 1; }" , "" , {
You can’t perform that action at this time.
0 commit comments