From a1cf5f5b1e297ddf6e0fd246880964ee54907c31 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 12 Oct 2019 11:28:02 +0200
Subject: [PATCH] fix(@angular-devkit/build-webpack): proxy config with windows
 authentication

It seems that this is causing issues with proxy config and IIS with Windows authentication, for now we remove the `ArchitectPlugin` since it's not being used.

Fixes #14595
---
 packages/angular_devkit/build_webpack/package.json     |  3 +--
 .../build_webpack/src/webpack-dev-server/index.ts      | 10 ----------
 .../angular_devkit/build_webpack/src/webpack/index.ts  |  9 ---------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 8d78bfe3829d..b3b49aaad972 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -9,8 +9,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.5.3",
-    "webpack-merge": "4.2.2"
+    "rxjs": "6.5.3"
   },
   "peerDependencies": {
     "webpack": "^4.6.0",
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index c78b0c9da2f9..a61fae14aa2f 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
@@ -12,14 +12,10 @@ import { Observable, from, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
-import { ArchitectPlugin } from '../plugins/architect';
 import { getEmittedFiles } from '../utils';
 import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
 import { Schema as WebpackDevServerBuilderSchema } from './schema';
 
-const webpackMerge = require('webpack-merge');
-
-
 export type DevServerBuildOutput = BuildResult & {
   port: number;
   family: string;
@@ -39,12 +35,6 @@ export function runWebpackDevServer(
   const log: WebpackLoggingCallback = options.logging
     || ((stats, config) => context.logger.info(stats.toString(config.stats)));
 
-  config = webpackMerge(config, {
-    plugins: [
-      new ArchitectPlugin(context),
-    ],
-  });
-
   const devServerConfig = options.devServerConfig || config.devServer || {};
   if (devServerConfig.stats) {
     config.stats = devServerConfig.stats;
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index 0da60ee387f4..6daf93ef0f26 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -10,12 +10,9 @@ import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import { Observable, from, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
-import { ArchitectPlugin } from '../plugins/architect';
 import { EmittedFiles, getEmittedFiles } from '../utils';
 import { Schema as RealWebpackBuilderSchema } from './schema';
 
-const webpackMerge = require('webpack-merge');
-
 export type WebpackBuilderSchema = json.JsonObject & RealWebpackBuilderSchema;
 
 export interface WebpackLoggingCallback {
@@ -42,12 +39,6 @@ export function runWebpack(
   const log: WebpackLoggingCallback = options.logging
     || ((stats, config) => context.logger.info(stats.toString(config.stats)));
 
-  config = webpackMerge(config, {
-    plugins: [
-      new ArchitectPlugin(context),
-    ],
-  });
-
   return createWebpack(config).pipe(
     switchMap(webpackCompiler => new Observable<BuildResult>(obs => {
       const callback: webpack.Compiler.Handler = (err, stats) => {