fix(@angular/cli): correct CSS import fallback logic

Author: clydin

packages/@angular/cli/models/webpack-configs/styles.ts

@@ -72,14 +72,13 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
                 loader.resolve(context, url, (err: Error, result: string) => {
                   if (err) {
                     reject(err);
-                    return;
+                  } else {
+                    resolve(result);
                   }
-
-                  resolve(result);
                 });
+              } else {
+                resolve(result);
               }
-
-              resolve(result);
             });
           });
         },

tests/e2e/tests/build/styles/material-import.ts

@@ -29,7 +29,16 @@ export default function () {
         .then(() => replaceInFile('src/app/app.component.ts',
           './app.component.css', `./app.component.${ext}`))
         // run build app
-        .then(() => ng('build', '--extract-css', '--sourcemap'));
+        .then(() => ng('build', '--extract-css', '--sourcemap'))
+        .then(() => writeMultipleFiles({
+          [`src/styles.${ext}`]: stripIndents`
+            @import "@angular/material/prebuilt-themes/indigo-pink.css";
+          `,
+          [`src/app/app.component.${ext}`]: stripIndents`
+            @import "@angular/material/prebuilt-themes/indigo-pink.css";
+          `,
+        }))
+        .then(() => ng('build', '--extract-css'));
     });
   });