File tree Expand file tree Collapse file tree 1 file changed +16
-5
lines changed Expand file tree Collapse file tree 1 file changed +16
-5
lines changed Original file line number Diff line number Diff line change @@ -34,9 +34,18 @@ const cached = new Map();
34
34
const memoizedLoaders = new WeakMap ( ) ;
35
35
36
36
function normalizeInputs ( input : string | string [ ] | Record < string , string > ) {
37
- if ( Array . isArray ( input ) ) return input ;
38
- if ( typeof input === 'string' ) return [ input ] ;
39
- return Object . values ( input ) ;
37
+ let urls : string [ ] = [ ] ;
38
+ if ( Array . isArray ( input ) ) {
39
+ urls = input ;
40
+ } else if ( typeof input === 'string' ) {
41
+ urls = [ input ] ;
42
+ } else {
43
+ urls = Object . values ( input ) ;
44
+ }
45
+
46
+ return urls . map ( ( url ) => {
47
+ return url . includes ( 'undefined' ) || url . includes ( 'null' ) || ! url ? '' : url ;
48
+ } ) ;
40
49
}
41
50
42
51
function load <
@@ -60,8 +69,6 @@ function load<
60
69
return ( ) : Array < Promise < any > > | null => {
61
70
const urls = normalizeInputs ( inputs ( ) ) ;
62
71
63
- if ( urls . some ( ( url ) => url . includes ( 'undefined' ) ) ) return null ;
64
-
65
72
let loader : Loader < TData > = memoizedLoaders . get ( loaderConstructorFactory ( urls ) ) ;
66
73
if ( ! loader ) {
67
74
loader = new ( loaderConstructorFactory ( urls ) ) ( ) ;
@@ -71,6 +78,10 @@ function load<
71
78
if ( extensions ) extensions ( loader ) ;
72
79
// TODO: reevaluate this
73
80
return urls . map ( ( url ) => {
81
+ if ( url === '' ) {
82
+ return null ;
83
+ }
84
+
74
85
if ( ! cached . has ( url ) ) {
75
86
cached . set (
76
87
url ,
You can’t perform that action at this time.
0 commit comments