asnowwolf
diff --git a/Collapse file
‎package.json‎
Copy file name to clipboardExpand all lines: package.json
+3Lines changed: 3 additions & 0 deletions b/Collapse file
‎package.json‎
Copy file name to clipboardExpand all lines: package.json
+3Lines changed: 3 additions & 0 deletions
diff --git a/Collapse file
‎packages/@angular/cli/models/webpack-configs/common.ts‎
Copy file name to clipboardExpand all lines: packages/@angular/cli/models/webpack-configs/common.ts
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎packages/@angular/cli/models/webpack-configs/common.ts‎
Copy file name to clipboardExpand all lines: packages/@angular/cli/models/webpack-configs/common.ts
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎packages/@angular/cli/models/webpack-configs/styles.ts‎
Copy file name to clipboardExpand all lines: packages/@angular/cli/models/webpack-configs/styles.ts
+6-1Lines changed: 6 additions & 1 deletion b/Collapse file
‎packages/@angular/cli/models/webpack-configs/styles.ts‎
Copy file name to clipboardExpand all lines: packages/@angular/cli/models/webpack-configs/styles.ts
+6-1Lines changed: 6 additions & 1 deletion
@@ -48,6 +48,7 @@
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "css-loader": "^0.26.1",
+    "css-with-mapping-loader": "0.0.3",
     "cssnano": "^3.10.0",
     "debug": "^2.1.3",
     "denodeify": "^1.2.1",
@@ -62,6 +63,7 @@
     "fs-extra": "^0.30.0",
     "get-caller-file": "^1.0.0",
     "glob": "^7.0.3",
+    "html-loader": "^0.4.4",
     "html-webpack-plugin": "^2.19.0",
     "inflection": "^1.7.0",
     "inquirer": "^0.12.0",
@@ -74,6 +76,7 @@
     "loader-utils": "^0.2.16",
     "lodash": "^4.11.1",
     "magic-string": "^0.16.0",
+    "markup-inline-loader": "^0.1.3",
     "minimatch": "^3.0.3",
     "node-modules-path": "^1.0.0",
     "node-sass": "^4.3.0",
 
@@ -124,7 +124,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       rules: [
         { enforce: 'pre', test: /\.js$/, loader: 'source-map-loader', exclude: [nodeModules] },
         { test: /\.json$/, loader: 'json-loader' },
-        { test: /\.html$/, loader: 'raw-loader' },
+        { test: /\.html$/, loaders: ['html-loader', 'markup-inline-loader'] },
         { test: /\.(eot|svg)$/, loader: `file-loader?name=[name]${hashFormat.file}.[ext]` },
         {
           test: /\.(jpg|png|gif|otf|ttf|woff|woff2)$/,
 
@@ -90,7 +90,12 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   // load component css as raw strings
   let rules: any = baseRules.map(({test, loaders}) => ({
-    exclude: globalStylePaths, test, loaders: ['raw-loader', ...commonLoaders, ...loaders]
+    exclude: globalStylePaths, test, loaders: [
+      'css-with-mapping-loader',
+      `css-loader?${JSON.stringify({ sourceMap: cssSourceMap })}`,
+      ...commonLoaders,
+      ...loaders
+    ]
   }));
 
   // load global css as css files