fix(@angular/cli): adjust postcss url promise handling

angular · Feb 7, 2018 · 4a745c9 · 4a745c9
1 parent 48b3b16
commit 4a745c9
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/packages/@angular/cli/plugins/postcss-cli-resources.ts b/packages/@angular/cli/plugins/postcss-cli-resources.ts
@@ -107,15 +107,21 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
   };
 
   return (root) => {
-    const resourceCache = new Map<string, string>();
+    const urlDeclarations: Array<postcss.Declaration> = [];
+    root.walkDecls(decl => {
+      if (decl.value && decl.value.includes('url')) {
+        urlDeclarations.push(decl);
+      }
+    });
 
-    return root.walkDecls(async decl => {
-      const value = decl.value;
+    if (urlDeclarations.length === 0) {
+      return;
+    }
 
-      if (!value || value.indexOf('url') === -1) {
-        return;
-      }
+    const resourceCache = new Map<string, string>();
 
+    return Promise.all(urlDeclarations.map(async decl => {
+      const value = decl.value;
       const urlRegex = /url\(\s*['"]?([ \S]+?)['"]??\s*\)/g;
       const segments: string[] = [];
 
@@ -149,6 +155,6 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       if (modified) {
         decl.value = segments.join('');
       }
-    });
+    }));
   };
 });