From 0fd18be1c201e3849f3928b99a3a6a44849214b6 Mon Sep 17 00:00:00 2001
From: Zhicheng Wang <zcwang@thoughtworks.com>
Date: Thu, 26 Oct 2017 09:44:14 +0800
Subject: [PATCH] fix(build): use html-loader to figureprint images (#3415)

see https://github.com/webpack-contrib/html-loader#root-relative-urls
---
 packages/@angular/cli/models/webpack-configs/common.ts | 10 ++++++++--
 packages/@angular/cli/package.json                     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts
index 40c45598e927..10a22663026d 100644
--- a/packages/@angular/cli/models/webpack-configs/common.ts
+++ b/packages/@angular/cli/models/webpack-configs/common.ts
@@ -18,7 +18,7 @@ const SilentError = require('silent-error');
  * know they are used.
  *
  * require('source-map-loader')
- * require('raw-loader')
+ * require('html-loader')
  * require('url-loader')
  * require('file-loader')
  * require('@angular-devkit/build-optimizer')
@@ -188,7 +188,13 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     },
     module: {
       rules: [
-        { test: /\.html$/, loader: 'raw-loader' },
+        {
+          test: /\.html$/,
+          loader: 'html-loader',
+          options: {
+            root: appRoot,
+          }
+        },
         {
           test: /\.(eot|svg|cur)$/,
           loader: 'file-loader',
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
index e9c38c0998f2..fa3197778f54 100644
--- a/packages/@angular/cli/package.json
+++ b/packages/@angular/cli/package.json
@@ -61,7 +61,7 @@
     "postcss-custom-properties": "^6.1.0",
     "postcss-loader": "^1.3.3",
     "postcss-url": "^5.1.2",
-    "raw-loader": "^0.5.1",
+    "html-loader": "^0.5.1",
     "resolve": "^1.1.7",
     "rxjs": "^5.4.2",
     "sass-loader": "^6.0.3",