From cd6bab9904b4a1bc0d21c07868e6656368655063 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 14 Dec 2017 13:06:12 -0500
Subject: [PATCH] feat(@angular/cli): support sourcemaps in injected
 stylesheets

---
 package-lock.json                                      | 9 +++++----
 package.json                                           | 2 +-
 packages/@angular/cli/models/webpack-configs/styles.ts | 5 +----
 packages/@angular/cli/package.json                     | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 184bce270c46..6583e5f732c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8272,11 +8272,12 @@
       "dev": true
     },
     "style-loader": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz",
-      "integrity": "sha1-dFMzhM9pjHEEx5URULSXF63C87s=",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
+      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
       "requires": {
-        "loader-utils": "1.1.0"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
       }
     },
     "stylus": {
diff --git a/package.json b/package.json
index 4590dc2c60db..cbbfa3263239 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "source-map": "^0.5.6",
     "source-map-loader": "^0.2.0",
     "source-map-support": "^0.4.1",
-    "style-loader": "^0.13.1",
+    "style-loader": "^0.19.1",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
     "tree-kill": "^1.0.0",
diff --git a/packages/@angular/cli/models/webpack-configs/styles.ts b/packages/@angular/cli/models/webpack-configs/styles.ts
index ade1f18b3da6..723cc9902e63 100644
--- a/packages/@angular/cli/models/webpack-configs/styles.ts
+++ b/packages/@angular/cli/models/webpack-configs/styles.ts
@@ -36,10 +36,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const entryPoints: { [key: string]: string[] } = {};
   const globalStylePaths: string[] = [];
   const extraPlugins: any[] = [];
-  // style-loader does not support sourcemaps without absolute publicPath, so it's
-  // better to disable them when not extracting css
-  // https://github.com/webpack-contrib/style-loader#recommended-configuration
-  const cssSourceMap = buildOptions.extractCss && buildOptions.sourcemaps;
+  const cssSourceMap = buildOptions.sourcemaps;
 
   // Minify/optimize css in production.
   const minimizeCss = buildOptions.target === 'production';
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
index 468daef52f96..85d9e349d806 100644
--- a/packages/@angular/cli/package.json
+++ b/packages/@angular/cli/package.json
@@ -72,7 +72,7 @@
     "source-map-loader": "^0.2.0",
     "source-map-support": "^0.4.1",
     "istanbul-instrumenter-loader": "^2.0.0",
-    "style-loader": "^0.13.1",
+    "style-loader": "^0.19.1",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
     "uglifyjs-webpack-plugin": "~1.1.2",