From dfccc77d168b3fac8f4bd50bb24fd3ffbbec987d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 1 Aug 2018 09:52:38 +0200
Subject: [PATCH 1/2] fix(@angular/cli): remove `vendorSourceMap` warning that
 `vendorSourceMap` is not allowed

While the build works and there are no error, at the moment you will have a warning in `angular.json`
---
 packages/angular/cli/lib/config/schema.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 18628f59599b..e2b067df91a8 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -605,6 +605,11 @@
               "description": "Output sourcemaps.",
               "default": true
             },
+            "vendorSourceMap": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            },
             "evalSourceMap": {
               "type": "boolean",
               "description": "Output in-file eval sourcemaps.",
@@ -1000,6 +1005,11 @@
               "type": "boolean",
               "description": "Output sourcemaps."
             },
+            "vendorSourceMap": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            },
             "evalSourceMap": {
               "type": "boolean",
               "description": "Output in-file eval sourcemaps."
@@ -1383,6 +1393,11 @@
               "description": "Output sourcemaps.",
               "default": true
             },
+            "vendorSourceMap": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            },
             "evalSourceMap": {
               "type": "boolean",
               "description": "Output in-file eval sourcemaps.",

From 1b4841bf0a25bc189e301147b655c25b090cceee Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 1 Aug 2018 13:24:09 +0200
Subject: [PATCH 2/2] fix(@angular-devkit/build-angular): `--vendor-source-map`
 doesn't work on `ng serve`

Closes #11715
---
 docs/documentation/serve.md                           | 11 ++++++++++-
 .../build_angular/src/dev-server/index.ts             |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/documentation/serve.md b/docs/documentation/serve.md
index 180dda74283a..d99466bdbcc3 100644
--- a/docs/documentation/serve.md
+++ b/docs/documentation/serve.md
@@ -208,6 +208,15 @@ ng serve [project]
     Output in-file eval sourcemaps.
   </p>
 </details>
+<details>
+  <summary>vendor-source-map</summary>
+  <p>
+    <code>--vendor-source-map</code>
+  </p>
+  <p>
+    Resolve vendor packages sourcemaps.
+  </p>
+</details>
 <details>
   <summary>vendor-chunk</summary>
   <p>
@@ -261,4 +270,4 @@ ng serve [project]
   <p>
     Log progress to the console while building.
   </p>
-</details>
+</details>
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index d4b244b3e14a..5451d11725cc 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -51,6 +51,7 @@ export interface DevServerBuilderOptions {
   optimization?: boolean;
   aot?: boolean;
   sourceMap?: boolean;
+  vendorSourceMap?: boolean;
   evalSourceMap?: boolean;
   vendorChunk?: boolean;
   commonChunk?: boolean;
@@ -399,6 +400,8 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
       ...(options.optimization !== undefined ? { optimization: options.optimization } : {}),
       ...(options.aot !== undefined ? { aot: options.aot } : {}),
       ...(options.sourceMap !== undefined ? { sourceMap: options.sourceMap } : {}),
+      ...(options.vendorSourceMap !== undefined ?
+         { vendorSourceMap: options.vendorSourceMap } : {}),
       ...(options.evalSourceMap !== undefined ? { evalSourceMap: options.evalSourceMap } : {}),
       ...(options.vendorChunk !== undefined ? { vendorChunk: options.vendorChunk } : {}),
       ...(options.commonChunk !== undefined ? { commonChunk: options.commonChunk } : {}),