From 3705599fdff0d0736edc66fef3f83635d769049b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 2 Feb 2021 10:59:11 +0100
Subject: [PATCH 1/2] refactor(@angular-devkit/build-angular): remove config
 barrel file export

---
 .../angular_devkit/build_angular/src/browser/index.ts  |  2 +-
 .../build_angular/src/dev-server/index.ts              | 10 ++++++++--
 .../build_angular/src/utils/package-chunk-sort.ts      |  2 +-
 .../build_angular/src/webpack/configs/index.ts         |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 9adf95b3125d..50303eed2c59 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -60,10 +60,10 @@ import {
   getStatsConfig,
   getStylesConfig,
   getWorkerConfig,
-  normalizeExtraEntryPoints,
 } from '../webpack/configs';
 import { NgBuildAnalyticsPlugin } from '../webpack/plugins/analytics';
 import { markAsyncChunksNonInitial } from '../webpack/utils/async-chunks';
+import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
 import {
   BundleStats,
   ChunkType,
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 281397370af0..a04da3c2ef8f 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -34,8 +34,14 @@ import { readTsconfig } from '../utils/read-tsconfig';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateI18nBrowserWebpackConfigFromContext, getIndexInputFile, getIndexOutputFile } from '../utils/webpack-browser-config';
 import { addError, addWarning } from '../utils/webpack-diagnostics';
-import { getBrowserConfig, getCommonConfig, getStatsConfig, getStylesConfig, getWorkerConfig } from '../webpack/configs';
-import { getDevServerConfig } from '../webpack/configs/dev-server';
+import {
+  getBrowserConfig,
+  getCommonConfig,
+  getDevServerConfig,
+  getStatsConfig,
+  getStylesConfig,
+  getWorkerConfig,
+} from '../webpack/configs';
 import { IndexHtmlWebpackPlugin } from '../webpack/plugins/index-html-webpack-plugin';
 import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Schema } from './schema';
diff --git a/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts
index 506d5e3b78c5..982c3f294c54 100644
--- a/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/utils/package-chunk-sort.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { ExtraEntryPoint } from '../browser/schema';
-import { normalizeExtraEntryPoints } from '../webpack/configs';
+import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
 
 export function generateEntryPoints(appConfig: {
   styles: ExtraEntryPoint[];
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/index.ts b/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
index a6994d4857fc..badd91583a97 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
@@ -7,10 +7,10 @@
  */
 export * from './browser';
 export * from './common';
+export * from './dev-server';
 export * from './server';
 export * from './styles';
 export * from './test';
 export * from './typescript';
-export * from '../utils/helpers';
 export * from './stats';
 export * from './worker';

From 826c3ac95c14d97c7c5107ba381302d4a7d8b866 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 2 Feb 2021 11:14:12 +0100
Subject: [PATCH 2/2] refactor(@angular-devkit/build-angular): remove unused
 `findUp` method

---
 .../build_angular/src/utils/find-up.ts        | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/utils/find-up.ts b/packages/angular_devkit/build_angular/src/utils/find-up.ts
index e499326b8822..d99687c5fdf9 100644
--- a/packages/angular_devkit/build_angular/src/utils/find-up.ts
+++ b/packages/angular_devkit/build_angular/src/utils/find-up.ts
@@ -9,34 +9,6 @@ import { existsSync } from 'fs';
 import * as path from 'path';
 import { isDirectory } from './is-directory';
 
-export function findUp(names: string | string[], from: string, stopOnNodeModules = false): string | null {
-  if (!Array.isArray(names)) {
-    names = [names];
-  }
-  const root = path.parse(from).root;
-
-  let currentDir = from;
-  while (currentDir && currentDir !== root) {
-    for (const name of names) {
-      const p = path.join(currentDir, name);
-      if (existsSync(p)) {
-        return p;
-      }
-    }
-
-    if (stopOnNodeModules) {
-      const nodeModuleP = path.join(currentDir, 'node_modules');
-      if (existsSync(nodeModuleP)) {
-        return null;
-      }
-    }
-
-    currentDir = path.dirname(currentDir);
-  }
-
-  return null;
-}
-
 export function findAllNodeModules(from: string, root?: string): string[] {
   const nodeModules: string[] = [];