refactor(@angular-devkit/build-angular): re-structure folder structure and move code

Previous
```
packages/angular_devkit/build_angular
├── plugins
│   └── webpack
└── src
    ├── angular-cli-files
    │   ├── models
    │   │   └── webpack-configs
    │   ├── plugins
    │   └── utilities
    │       ├── index-file
    │       └── service-worker
    ├── app-shell
    ├── browser
    │   └── specs
    ├── dev-server
    ├── extract-i18n
    ├── karma
    ├── ng-packagr
    ├── protractor
    ├── server
    ├── tslint
    ├── utils
    └── webpack
        └── models
```

Now
```
packages/angular_devkit/build_angular
├── plugins
└── src
    ├── app-shell
    ├── browser
    │   └── specs
    ├── dev-server
    ├── extract-i18n
    ├── karma
    ├── ng-packagr
    ├── protractor
    ├── server
    ├── tslint
    ├── utils
    │   └── index-file
    └── webpack
        ├── configs
        ├── plugins
        └── utils
```

Author: alan-agius4

packages/angular_devkit/build_angular/plugins/karma.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-module.exports = require('../src/angular-cli-files/plugins/karma');
+module.exports = require('../src/webpack/plugins/karma');

packages/angular_devkit/build_angular/src/app-shell/index.ts

@@ -15,10 +15,10 @@ import { JsonObject, normalize, resolve } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import { BrowserBuilderOutput } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ServerBuilderOutput } from '../server';
+import { augmentAppWithServiceWorker } from '../utils/service-worker';
 import { Schema as BuildWebpackAppShellSchema } from './schema';
 
 async function _renderUniversal(

packages/angular_devkit/build_angular/src/browser/index.ts

@@ -15,35 +15,6 @@ import { Observable, from } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
 import { ScriptTarget } from 'typescript';
 import * as webpack from 'webpack';
-import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
-import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
-import {
-  getAotConfig,
-  getBrowserConfig,
-  getCommonConfig,
-  getNonAotConfig,
-  getStatsConfig,
-  getStylesConfig,
-  getWorkerConfig,
-  normalizeExtraEntryPoints,
-} from '../angular-cli-files/models/webpack-configs';
-import { markAsyncChunksNonInitial } from '../angular-cli-files/utilities/async-chunks';
-import { ThresholdSeverity, checkBudgets } from '../angular-cli-files/utilities/bundle-calculator';
-import {
-  IndexHtmlTransform,
-  writeIndexHtml,
-} from '../angular-cli-files/utilities/index-file/write-index-html';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
-import {
-  createWebpackLoggingCallback,
-  generateBuildStats,
-  generateBundleStats,
-  statsErrorsToString,
-  statsHasErrors,
-  statsHasWarnings,
-  statsWarningsToString,
-} from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
 import {
   BuildBrowserFeatures,
@@ -54,18 +25,26 @@ import {
   urlJoin,
 } from '../utils';
 import { BundleActionExecutor } from '../utils/action-executor';
+import { WebpackConfigOptions } from '../utils/build-options';
+import { ThresholdSeverity, checkBudgets } from '../utils/bundle-calculator';
 import { findCachePath } from '../utils/cache-path';
 import { copyAssets } from '../utils/copy-assets';
 import { cachingDisabled } from '../utils/environment-options';
 import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
 import { I18nOptions } from '../utils/i18n-options';
+import {
+  IndexHtmlTransform,
+  writeIndexHtml,
+} from '../utils/index-file/write-index-html';
 import { ensureOutputPaths } from '../utils/output-paths';
 import {
   InlineOptions,
   ProcessBundleFile,
   ProcessBundleOptions,
   ProcessBundleResult,
 } from '../utils/process-bundle';
+import { readTsconfig } from '../utils/read-tsconfig';
+import { augmentAppWithServiceWorker } from '../utils/service-worker';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import {
   BrowserWebpackConfigOptions,
@@ -74,6 +53,27 @@ import {
   getIndexInputFile,
   getIndexOutputFile,
 } from '../utils/webpack-browser-config';
+import {
+  getAotConfig,
+  getBrowserConfig,
+  getCommonConfig,
+  getNonAotConfig,
+  getStatsConfig,
+  getStylesConfig,
+  getWorkerConfig,
+  normalizeExtraEntryPoints,
+} from '../webpack/configs';
+import { NgBuildAnalyticsPlugin } from '../webpack/plugins/analytics';
+import { markAsyncChunksNonInitial } from '../webpack/utils/async-chunks';
+import {
+  createWebpackLoggingCallback,
+  generateBuildStats,
+  generateBundleStats,
+  statsErrorsToString,
+  statsHasErrors,
+  statsHasWarnings,
+  statsWarningsToString,
+} from '../webpack/utils/stats';
 import { Schema as BrowserBuilderSchema } from './schema';
 
 const cacheDownlevelPath = cachingDisabled ? undefined : findCachePath('angular-build-dl');

packages/angular_devkit/build_angular/src/dev-server/index.ts

@@ -22,23 +22,23 @@ import * as ts from 'typescript';
 import * as url from 'url';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
-import { normalizeExtraEntryPoints } from '../angular-cli-files/models/webpack-configs/utils';
-import { IndexHtmlWebpackPlugin } from '../angular-cli-files/plugins/index-html-webpack-plugin';
-import { checkPort } from '../angular-cli-files/utilities/check-port';
-import { IndexHtmlTransform } from '../angular-cli-files/utilities/index-file/write-index-html';
-import { generateEntryPoints } from '../angular-cli-files/utilities/package-chunk-sort';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { createWebpackLoggingCallback } from '../angular-cli-files/utilities/stats';
 import { buildBrowserWebpackConfigFromContext } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { BuildBrowserFeatures, normalizeOptimization } from '../utils';
 import { findCachePath } from '../utils/cache-path';
+import { checkPort } from '../utils/check-port';
 import { I18nOptions } from '../utils/i18n-options';
+import { IndexHtmlTransform } from '../utils/index-file/write-index-html';
+import { generateEntryPoints } from '../utils/package-chunk-sort';
 import { createI18nPlugins } from '../utils/process-bundle';
+import { readTsconfig } from '../utils/read-tsconfig';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { getIndexInputFile, getIndexOutputFile } from '../utils/webpack-browser-config';
 import { addError, addWarning } from '../utils/webpack-diagnostics';
+import { normalizeExtraEntryPoints } from '../webpack/configs';
+import { IndexHtmlWebpackPlugin } from '../webpack/plugins/index-html-webpack-plugin';
+import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Schema } from './schema';
 const open = require('open');
 
@@ -87,9 +87,6 @@ export function serveWebpackBrowser(
   let first = true;
   const host = new NodeJsSyncHost();
 
-  const loggingFn =
-    transforms.logging || createWebpackLoggingCallback(!!options.verbose, context.logger);
-
   async function setup(): Promise<{
     browserOptions: json.JsonObject & BrowserBuilderSchema;
     webpackConfig: webpack.Configuration;
@@ -237,7 +234,7 @@ export function serveWebpackBrowser(
         webpackConfig,
         context,
         {
-          logging: loggingFn,
+          logging: transforms.logging || createWebpackLoggingCallback(!!options.verbose, context.logger),
           webpackFactory: require('webpack') as typeof webpack,
           webpackDevServerFactory: require('webpack-dev-server') as typeof WebpackDevServer,
         },

packages/angular_devkit/build_angular/src/extract-i18n/index.ts

@@ -17,18 +17,18 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { gte as semverGte } from 'semver';
 import * as webpack from 'webpack';
-import {
-  getAotConfig,
-  getCommonConfig,
-  getStatsConfig,
-  getStylesConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { createWebpackLoggingCallback } from '../angular-cli-files/utilities/stats';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { createI18nOptions } from '../utils/i18n-options';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import {
+  getAotConfig,
+  getCommonConfig,
+  getStatsConfig,
+  getStylesConfig,
+} from '../webpack/configs';
+import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Format, Schema } from './schema';
 
 export type ExtractI18nBuilderOptions = Schema & JsonObject;

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-tests.ts renamed to packages/angular_devkit/build_angular/src/karma/find-tests.ts

@@ -8,7 +8,7 @@
 import { existsSync } from 'fs';
 import * as glob from 'glob';
 import { basename, dirname, extname, join } from 'path';
-import { isDirectory } from './is-directory';
+import { isDirectory } from '../utils/is-directory';
 
 // go through all patterns and find unique list of files
 export function findTests(patterns: string[], cwd: string, workspaceRoot: string): string[] {

packages/angular_devkit/build_angular/src/karma/index.ts

@@ -11,19 +11,19 @@ import { dirname, resolve } from 'path';
 import { Observable, from } from 'rxjs';
 import { defaultIfEmpty, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
+import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { ExecutionTransformer } from '../transforms';
+import { assertCompatibleAngularVersion } from '../utils/version';
+import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import {
   getCommonConfig,
   getNonAotConfig,
   getStylesConfig,
   getTestConfig,
   getWorkerConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { SingleTestTransformLoader } from '../angular-cli-files/plugins/single-test-transform';
-import { findTests } from '../angular-cli-files/utilities/find-tests';
-import { Schema as BrowserBuilderOptions } from '../browser/schema';
-import { ExecutionTransformer } from '../transforms';
-import { assertCompatibleAngularVersion } from '../utils/version';
-import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+} from '../webpack/configs';
+import { SingleTestTransformLoader } from '../webpack/plugins/single-test-transform';
+import { findTests } from './find-tests';
 import { Schema as KarmaBuilderOptions } from './schema';
 
 // tslint:disable-next-line:no-implicit-dependencies

packages/angular_devkit/build_angular/src/server/index.ts

@@ -13,22 +13,22 @@ import { Observable, from } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
 import { ScriptTarget } from 'typescript';
 import * as webpack from 'webpack';
-import {
-  getAotConfig,
-  getCommonConfig,
-  getServerConfig,
-  getStatsConfig,
-  getStylesConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { createWebpackLoggingCallback } from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
 import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
 import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
 import { I18nOptions } from '../utils/i18n-options';
 import { ensureOutputPaths } from '../utils/output-paths';
+import { readTsconfig } from '../utils/read-tsconfig';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateI18nBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import {
+  getAotConfig,
+  getCommonConfig,
+  getServerConfig,
+  getStatsConfig,
+  getStylesConfig,
+} from '../webpack/configs';
+import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Schema as ServerBuilderOptions } from './schema';
 
 // If success is true, outputPath should be set.

packages/angular_devkit/build_angular/src/tslint/index.ts

@@ -13,7 +13,7 @@ import { Minimatch } from 'minimatch';
 import * as path from 'path';
 import * as tslint from 'tslint'; // tslint:disable-line:no-implicit-dependencies
 import { Program } from 'typescript';
-import { stripBom } from '../angular-cli-files/utilities/strip-bom';
+import { stripBom } from '../utils/strip-bom';
 import { Schema as RealTslintBuilderOptions } from './schema';
 
 

packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts renamed to packages/angular_devkit/build_angular/src/utils/build-options.ts

@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
 import { logging } from '@angular-devkit/core';
 import { ParsedConfiguration } from '@angular/compiler-cli';
 import {
@@ -19,8 +17,8 @@ import {
   Localize,
   OptimizationClass,
   SourceMapClass,
-} from '../../browser/schema';
-import { NormalizedFileReplacement } from '../../utils/normalize-file-replacements';
+} from '../browser/schema';
+import { NormalizedFileReplacement } from './normalize-file-replacements';
 
 export interface BuildOptions {
   optimization: OptimizationClass;

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts renamed to packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as webpack from 'webpack';
-import { ProcessBundleFile, ProcessBundleResult } from '../../../src/utils/process-bundle';
-import { Budget, Type } from '../../browser/schema';
-import { formatSize } from '../utilities/stats';
+import { Budget, Type } from '../browser/schema';
+import { ProcessBundleFile, ProcessBundleResult } from '../utils/process-bundle';
+import { formatSize } from '../webpack/utils/stats';
 
 interface Size {
   size: number;

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts renamed to packages/angular_devkit/build_angular/src/utils/bundle-calculator_spec.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as webpack from 'webpack';
-import { Budget, Type } from '../../browser/schema';
-import { ProcessBundleResult } from '../../utils/process-bundle';
+import { Budget, Type } from '../browser/schema';
 import { ThresholdSeverity, checkBudgets } from './bundle-calculator';
+import { ProcessBundleResult } from './process-bundle';
 
 const KB = 1024;
 

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/check-port.ts renamed to packages/angular_devkit/build_angular/src/utils/check-port.ts

@@ -11,9 +11,9 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { Schema as ServerBuilderSchema } from '../server/schema';
+import { readTsconfig } from '../utils/read-tsconfig';
 import { createTranslationLoader } from './load-translations';
 
 export interface I18nOptions {

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-up.ts renamed to packages/angular_devkit/build_angular/src/utils/find-up.ts

@@ -10,7 +10,7 @@ import { EmittedFiles } from '@angular-devkit/build-webpack';
 import { Path, dirname, getSystemPath, join, virtualFs } from '@angular-devkit/core';
 import { Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ExtraEntryPoint } from '../../../browser/schema';
+import { ExtraEntryPoint } from '../../browser/schema';
 import { generateEntryPoints } from '../package-chunk-sort';
 import { stripBom } from '../strip-bom';
 import { CrossOriginValue, FileInfo, augmentIndexHtml } from './augment-index-html';

packages/angular_devkit/build_angular/src/utils/i18n-options.ts

@@ -9,13 +9,13 @@
 
 
 import { Path, virtualFs } from '@angular-devkit/core';
-import { BuildOptions } from '../angular-cli-files/models/build-options';
 import {
   AssetPatternClass,
   OptimizationClass,
   Schema as BrowserBuilderSchema,
   SourceMapClass,
 } from '../browser/schema';
+import { BuildOptions } from './build-options';
 import { normalizeAssetPatterns } from './normalize-asset-patterns';
 import {
   NormalizedFileReplacement,

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts renamed to packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts

@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { ExtraEntryPoint } from '../../browser/schema';
-import { normalizeExtraEntryPoints } from '../models/webpack-configs/utils';
+import { ExtraEntryPoint } from '../browser/schema';
+import { normalizeExtraEntryPoints } from '../webpack/configs';
 
 export function generateEntryPoints(appConfig: {
   styles: ExtraEntryPoint[];

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts renamed to packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts

@@ -18,15 +18,15 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as webpack from 'webpack';
 import { merge as webpackMerge } from 'webpack-merge';
-import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
-import { getEsVersionForFileName } from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import {
   NormalizedBrowserBuilderSchema,
   defaultProgress,
   normalizeBrowserSchema,
 } from '../utils';
+import { WebpackConfigOptions } from '../utils/build-options';
+import { readTsconfig } from '../utils/read-tsconfig';
+import { getEsVersionForFileName } from '../webpack/utils/helpers';
 import { BuildBrowserFeatures } from './build-browser-features';
 import { profilingEnabled } from './environment-options';
 import { I18nOptions, configureI18nBuild } from './i18n-options';

packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts renamed to packages/angular_devkit/build_angular/src/utils/index-file/write-index-html.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as webpack from 'webpack';
-import { CommonJsUsageWarnPlugin } from '../../plugins/webpack';
-import { WebpackConfigOptions } from '../build-options';
-import { getSourceMapDevTool } from './utils';
+import { WebpackConfigOptions } from '../../utils/build-options';
+import { CommonJsUsageWarnPlugin } from '../plugins';
+import { getSourceMapDevTool } from '../utils/helpers';
 
 export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configuration {
   const { buildOptions } = wco;