Skip to content

Commit b26c0ab

Browse files
alan-agius4vikerman
authored andcommitted
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
1 parent b195981 commit b26c0ab

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

packages/angular_devkit/build_webpack/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"dependencies": {
1010
"@angular-devkit/architect": "0.0.0",
1111
"@angular-devkit/core": "0.0.0",
12-
"rxjs": "6.4.0",
13-
"webpack-merge": "4.2.1"
12+
"rxjs": "6.4.0"
1413
},
1514
"peerDependencies": {
1615
"webpack": "^4.6.0",

packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@ import { Observable, from, of } from 'rxjs';
1212
import { switchMap } from 'rxjs/operators';
1313
import * as webpack from 'webpack';
1414
import * as WebpackDevServer from 'webpack-dev-server';
15-
import { ArchitectPlugin } from '../plugins/architect';
1615
import { getEmittedFiles } from '../utils';
1716
import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
1817
import { Schema as WebpackDevServerBuilderSchema } from './schema';
1918

20-
const webpackMerge = require('webpack-merge');
21-
22-
2319
export type DevServerBuildOutput = BuildResult & {
2420
port: number;
2521
family: string;
@@ -39,12 +35,6 @@ export function runWebpackDevServer(
3935
const log: WebpackLoggingCallback = options.logging
4036
|| ((stats, config) => context.logger.info(stats.toString(config.stats)));
4137

42-
config = webpackMerge(config, {
43-
plugins: [
44-
new ArchitectPlugin(context),
45-
],
46-
});
47-
4838
const devServerConfig = options.devServerConfig || config.devServer || {};
4939
if (devServerConfig.stats) {
5040
config.stats = devServerConfig.stats;

packages/angular_devkit/build_webpack/src/webpack/index.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
1010
import { Observable, from, of } from 'rxjs';
1111
import { switchMap } from 'rxjs/operators';
1212
import * as webpack from 'webpack';
13-
import { ArchitectPlugin } from '../plugins/architect';
1413
import { EmittedFiles, getEmittedFiles } from '../utils';
1514
import { Schema as RealWebpackBuilderSchema } from './schema';
1615

17-
const webpackMerge = require('webpack-merge');
18-
1916
export type WebpackBuilderSchema = json.JsonObject & RealWebpackBuilderSchema;
2017

2118
export interface WebpackLoggingCallback {
@@ -42,12 +39,6 @@ export function runWebpack(
4239
const log: WebpackLoggingCallback = options.logging
4340
|| ((stats, config) => context.logger.info(stats.toString(config.stats)));
4441

45-
config = webpackMerge(config, {
46-
plugins: [
47-
new ArchitectPlugin(context),
48-
],
49-
});
50-
5142
return createWebpack(config).pipe(
5243
switchMap(webpackCompiler => new Observable<BuildResult>(obs => {
5344
const callback: webpack.Compiler.Handler = (err, stats) => {

0 commit comments

Comments
 (0)