refactor(@angular-devkit/build-angular): move all builders into a builders subdirectory

All Angular builders are now located within one subdirectory of the `src` directory. This organization provides better discovery of the builders and will allow builder specific code to be stored in a single area.

packages/angular/cli/BUILD.bazel

@@ -96,14 +96,14 @@ ts_library(
 )
 
 CLI_SCHEMA_DATA = [
-    "//packages/angular_devkit/build_angular:src/app-shell/schema.json",
-    "//packages/angular_devkit/build_angular:src/browser/schema.json",
-    "//packages/angular_devkit/build_angular:src/dev-server/schema.json",
-    "//packages/angular_devkit/build_angular:src/extract-i18n/schema.json",
-    "//packages/angular_devkit/build_angular:src/karma/schema.json",
-    "//packages/angular_devkit/build_angular:src/ng-packagr/schema.json",
-    "//packages/angular_devkit/build_angular:src/protractor/schema.json",
-    "//packages/angular_devkit/build_angular:src/server/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/app-shell/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/browser/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/dev-server/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/extract-i18n/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/karma/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/ng-packagr/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/protractor/schema.json",
+    "//packages/angular_devkit/build_angular:src/builders/server/schema.json",
     "//packages/schematics/angular:app-shell/schema.json",
     "//packages/schematics/angular:application/schema.json",
     "//packages/schematics/angular:class/schema.json",

packages/angular/cli/lib/config/workspace-schema.json

@@ -338,12 +338,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/app-shell/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/app-shell/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/app-shell/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/app-shell/schema.json"
                   }
                 }
               }
@@ -360,12 +360,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/browser/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/browser/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/browser/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/browser/schema.json"
                   }
                 }
               }
@@ -382,12 +382,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/dev-server/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/dev-server/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/dev-server/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/dev-server/schema.json"
                   }
                 }
               }
@@ -404,12 +404,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/extract-i18n/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/extract-i18n/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/extract-i18n/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/extract-i18n/schema.json"
                   }
                 }
               }
@@ -426,12 +426,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/karma/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/karma/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/karma/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/karma/schema.json"
                   }
                 }
               }
@@ -448,12 +448,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/protractor/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/protractor/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/protractor/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/protractor/schema.json"
                   }
                 }
               }
@@ -470,12 +470,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/server/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/server/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/server/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/server/schema.json"
                   }
                 }
               }
@@ -492,12 +492,12 @@
                   "description": "A default named configuration to use when a target configuration is not provided."
                 },
                 "options": {
-                  "$ref": "../../../../angular_devkit/build_angular/src/ng-packagr/schema.json"
+                  "$ref": "../../../../angular_devkit/build_angular/src/builders/ng-packagr/schema.json"
                 },
                 "configurations": {
                   "type": "object",
                   "additionalProperties": {
-                    "$ref": "../../../../angular_devkit/build_angular/src/ng-packagr/schema.json"
+                    "$ref": "../../../../angular_devkit/build_angular/src/builders/ng-packagr/schema.json"
                   }
                 }
               }

packages/angular_devkit/build_angular/BUILD.bazel

@@ -19,42 +19,42 @@ package(default_visibility = ["//visibility:public"])
 
 ts_json_schema(
     name = "app_shell_schema",
-    src = "src/app-shell/schema.json",
+    src = "src/builders/app-shell/schema.json",
 )
 
 ts_json_schema(
     name = "browser_schema",
-    src = "src/browser/schema.json",
+    src = "src/builders/browser/schema.json",
 )
 
 ts_json_schema(
     name = "dev_server_schema",
-    src = "src/dev-server/schema.json",
+    src = "src/builders/dev-server/schema.json",
 )
 
 ts_json_schema(
     name = "extract_i18n_schema",
-    src = "src/extract-i18n/schema.json",
+    src = "src/builders/extract-i18n/schema.json",
 )
 
 ts_json_schema(
     name = "karma_schema",
-    src = "src/karma/schema.json",
+    src = "src/builders/karma/schema.json",
 )
 
 ts_json_schema(
     name = "protractor_schema",
-    src = "src/protractor/schema.json",
+    src = "src/builders/protractor/schema.json",
 )
 
 ts_json_schema(
     name = "server_schema",
-    src = "src/server/schema.json",
+    src = "src/builders/server/schema.json",
 )
 
 ts_json_schema(
     name = "ng_packagr_schema",
-    src = "src/ng-packagr/schema.json",
+    src = "src/builders/ng-packagr/schema.json",
 )
 
 ts_library(
@@ -72,14 +72,14 @@ ts_library(
             "src/testing/**/*.ts",
         ],
     ) + [
-        "//packages/angular_devkit/build_angular:src/app-shell/schema.ts",
-        "//packages/angular_devkit/build_angular:src/browser/schema.ts",
-        "//packages/angular_devkit/build_angular:src/dev-server/schema.ts",
-        "//packages/angular_devkit/build_angular:src/extract-i18n/schema.ts",
-        "//packages/angular_devkit/build_angular:src/karma/schema.ts",
-        "//packages/angular_devkit/build_angular:src/protractor/schema.ts",
-        "//packages/angular_devkit/build_angular:src/server/schema.ts",
-        "//packages/angular_devkit/build_angular:src/ng-packagr/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/app-shell/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/browser/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/dev-server/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/extract-i18n/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/karma/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/protractor/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/server/schema.ts",
+        "//packages/angular_devkit/build_angular:src/builders/ng-packagr/schema.ts",
     ],
     data = glob(
         include = [

packages/angular_devkit/build_angular/builders.json

@@ -2,43 +2,43 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "app-shell": {
-      "implementation": "./src/app-shell",
-      "schema": "./src/app-shell/schema.json",
+      "implementation": "./src/builders/app-shell",
+      "schema": "./src/builders/app-shell/schema.json",
       "description": "Build a server application and a browser application, then render the index.html and use it for the browser output."
     },
     "browser": {
-      "implementation": "./src/browser",
-      "schema": "./src/browser/schema.json",
+      "implementation": "./src/builders/browser",
+      "schema": "./src/builders/browser/schema.json",
       "description": "Build a browser application."
     },
     "dev-server": {
-      "implementation": "./src/dev-server",
-      "schema": "./src/dev-server/schema.json",
+      "implementation": "./src/builders/dev-server",
+      "schema": "./src/builders/dev-server/schema.json",
       "description": "Serve a browser application."
     },
     "extract-i18n": {
-      "implementation": "./src/extract-i18n",
-      "schema": "./src/extract-i18n/schema.json",
+      "implementation": "./src/builders/extract-i18n",
+      "schema": "./src/builders/extract-i18n/schema.json",
       "description": "Extract i18n strings from a browser application."
     },
     "karma": {
-      "implementation": "./src/karma",
-      "schema": "./src/karma/schema.json",
+      "implementation": "./src/builders/karma",
+      "schema": "./src/builders/karma/schema.json",
       "description": "Run Karma unit tests."
     },
     "protractor": {
-      "implementation": "./src/protractor",
-      "schema": "./src/protractor/schema.json",
+      "implementation": "./src/builders/protractor",
+      "schema": "./src/builders/protractor/schema.json",
       "description": "Run protractor over a dev server."
     },
     "server": {
-      "implementation": "./src/server",
-      "schema": "./src/server/schema.json",
+      "implementation": "./src/builders/server",
+      "schema": "./src/builders/server/schema.json",
       "description": "Build a server Angular application."
     },
     "ng-packagr": {
-      "implementation": "./src/ng-packagr",
-      "schema": "./src/ng-packagr/schema.json",
+      "implementation": "./src/builders/ng-packagr",
+      "schema": "./src/builders/ng-packagr/schema.json",
       "description": "Build a library with ng-packagr."
     }
   }

packages/angular_devkit/build_angular/src/builders/app-shell/app-shell_spec.ts

@@ -11,7 +11,7 @@ import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core'
 import express from 'express'; // eslint-disable-line import/no-extraneous-dependencies
 import * as http from 'http';
 import { AddressInfo } from 'net';
-import { createArchitect, host } from '../testing/test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('AppShell Builder', () => {
   const target = { project: 'app', target: 'app-shell' };

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

@@ -15,13 +15,13 @@ import {
 import { JsonObject, normalize, resolve } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
+import { normalizeOptimization } from '../../utils';
+import { InlineCriticalCssProcessor } from '../../utils/index-file/inline-critical-css';
+import { augmentAppWithServiceWorker } from '../../utils/service-worker';
+import { Spinner } from '../../utils/spinner';
 import { BrowserBuilderOutput } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ServerBuilderOutput } from '../server';
-import { normalizeOptimization } from '../utils';
-import { InlineCriticalCssProcessor } from '../utils/index-file/inline-critical-css';
-import { augmentAppWithServiceWorker } from '../utils/service-worker';
-import { Spinner } from '../utils/spinner';
 import { Schema as BuildWebpackAppShellSchema } from './schema';
 
 async function _renderUniversal(

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

@@ -15,32 +15,35 @@ import { Observable, from } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
 import { ScriptTarget } from 'typescript';
 import webpack from 'webpack';
-import { ExecutionTransformer } from '../transforms';
+import { ExecutionTransformer } from '../../transforms';
 import {
   BuildBrowserFeatures,
   deleteOutputDir,
   normalizeAssetPatterns,
   normalizeOptimization,
   urlJoin,
-} from '../utils';
-import { ThresholdSeverity, checkBudgets } from '../utils/bundle-calculator';
-import { colors } from '../utils/color';
-import { copyAssets } from '../utils/copy-assets';
-import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
-import { I18nOptions } from '../utils/i18n-options';
-import { FileInfo } from '../utils/index-file/augment-index-html';
-import { IndexHtmlGenerator, IndexHtmlTransform } from '../utils/index-file/index-html-generator';
-import { ensureOutputPaths } from '../utils/output-paths';
-import { generateEntryPoints } from '../utils/package-chunk-sort';
-import { readTsconfig } from '../utils/read-tsconfig';
-import { augmentAppWithServiceWorker } from '../utils/service-worker';
-import { Spinner } from '../utils/spinner';
-import { assertCompatibleAngularVersion } from '../utils/version';
+} from '../../utils';
+import { ThresholdSeverity, checkBudgets } from '../../utils/bundle-calculator';
+import { colors } from '../../utils/color';
+import { copyAssets } from '../../utils/copy-assets';
+import { i18nInlineEmittedFiles } from '../../utils/i18n-inlining';
+import { I18nOptions } from '../../utils/i18n-options';
+import { FileInfo } from '../../utils/index-file/augment-index-html';
+import {
+  IndexHtmlGenerator,
+  IndexHtmlTransform,
+} from '../../utils/index-file/index-html-generator';
+import { ensureOutputPaths } from '../../utils/output-paths';
+import { generateEntryPoints } from '../../utils/package-chunk-sort';
+import { readTsconfig } from '../../utils/read-tsconfig';
+import { augmentAppWithServiceWorker } from '../../utils/service-worker';
+import { Spinner } from '../../utils/spinner';
+import { assertCompatibleAngularVersion } from '../../utils/version';
 import {
   generateI18nBrowserWebpackConfigFromContext,
   getIndexInputFile,
   getIndexOutputFile,
-} from '../utils/webpack-browser-config';
+} from '../../utils/webpack-browser-config';
 import {
   getAnalyticsConfig,
   getBrowserConfig,
@@ -49,16 +52,16 @@ import {
   getStylesConfig,
   getTypeScriptConfig,
   getWorkerConfig,
-} from '../webpack/configs';
-import { markAsyncChunksNonInitial } from '../webpack/utils/async-chunks';
-import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
+} from '../../webpack/configs';
+import { markAsyncChunksNonInitial } from '../../webpack/utils/async-chunks';
+import { normalizeExtraEntryPoints } from '../../webpack/utils/helpers';
 import {
   statsErrorsToString,
   statsHasErrors,
   statsHasWarnings,
   statsWarningsToString,
   webpackStatsLogger,
-} from '../webpack/utils/stats';
+} from '../../webpack/utils/stats';
 import { Schema as BrowserBuilderSchema } from './schema';
 
 /**

packages/angular_devkit/build_angular/src/builders/browser/specs/allow-js_spec.ts

@@ -11,7 +11,7 @@ import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder allow js', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/aot_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder AOT', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/base-href_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder base href', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/browser-support_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder browser support', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/build-optimizer_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder build optimizer', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/bundle-budgets_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder bundle budgets', () => {
   const cssExtensions = ['css', 'scss', 'less', 'styl'];

packages/angular_devkit/build_angular/src/builders/browser/specs/cross-origin_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput, CrossOrigin } from '@angular-devkit/build-angular';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder crossOrigin', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/deploy-url_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder deploy url', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/errors_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder errors', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/font-optimization_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder font optimization', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/index_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, tags, virtualFs, workspaces } from '@angular-devkit/core';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder index HTML processing', () => {
   const targetSpec = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts

@@ -16,7 +16,7 @@ import {
   host,
   lazyModuleFiles,
   lazyModuleFnImport,
-} from '../../testing/test-utils';
+} from '../../../testing/test-utils';
 
 describe('Browser Builder lazy modules', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/no-entry-module_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder no entry module', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/optimization-level_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder optimization level', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/output-path_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { getSystemPath, join, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder output path', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/poll_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder poll', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/rebuild_spec.ts

@@ -15,7 +15,7 @@ import {
   lazyModuleFiles,
   lazyModuleFnImport,
   outputPath,
-} from '../../testing/test-utils';
+} from '../../../testing/test-utils';
 
 describe('Browser Builder rebuilds', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/replacements_spec.ts

@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect';
 import { logging, normalize, virtualFs } from '@angular-devkit/core';
 import { of, race } from 'rxjs';
 import { delay, filter, map, take, takeUntil, takeWhile, tap, timeout } from 'rxjs/operators';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder file replacements', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/resolve-json-module_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { join, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { createArchitect, host, outputPath } from '../../testing/test-utils';
+import { createArchitect, host, outputPath } from '../../../testing/test-utils';
 
 describe('Browser Builder resolve json module', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/resources-output-path_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder styles resources output path', () => {
   const imgSvg = `

packages/angular_devkit/build_angular/src/builders/browser/specs/scripts-array_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder scripts array', () => {
   const scripts: { [path: string]: string } = {

packages/angular_devkit/build_angular/src/builders/browser/specs/service-worker_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder service worker', () => {
   const manifest = {

packages/angular_devkit/build_angular/src/builders/browser/specs/source-map_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { OutputHashing } from '@angular-devkit/build-angular';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder source map', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/stats-json_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder stats json', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/styles_spec.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { normalize, tags } from '@angular-devkit/core';
 import { dirname } from 'path';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder styles', () => {
   const extensionsWithImportSupport = ['css', 'scss', 'less', 'styl'];

packages/angular_devkit/build_angular/src/builders/browser/specs/svg_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host, outputPath } from '../../testing/test-utils';
+import { createArchitect, host, outputPath } from '../../../testing/test-utils';
 
 describe('Browser Builder allow svg', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/tsconfig-paths_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder tsconfig paths', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/unused-files-warning_spec.ts

@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { logging } from '@angular-devkit/core';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../../testing/test-utils';
+import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder unused files warnings', () => {
   const warningMessageSuffix = `is part of the TypeScript compilation but it's unused`;

packages/angular_devkit/build_angular/src/builders/browser/specs/vendor-chunk_spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder vendor chunk', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/vendor-source-map_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
-import { browserBuild, createArchitect, host } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host } from '../../../testing/test-utils';
 
 describe('Browser Builder external source map', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/web-worker_spec.ts

@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect';
 import { join, logging, virtualFs } from '@angular-devkit/core';
 import { timer } from 'rxjs';
 import { debounceTime, map, switchMap, takeWhile, tap } from 'rxjs/operators';
-import { browserBuild, createArchitect, host, outputPath } from '../../testing/test-utils';
+import { browserBuild, createArchitect, host, outputPath } from '../../../testing/test-utils';
 
 describe('Browser Builder Web Worker support', () => {
   const target = { project: 'app', target: 'build' };

packages/angular_devkit/build_angular/src/builders/browser/specs/works_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { describeBuilder } from '../../testing';
+import { describeBuilder } from '../../../testing';
 import { buildWebpackBrowser } from '../index';
 
 const BROWSER_BUILDER_INFO = {

packages/angular_devkit/build_angular/src/builders/browser/tests/setup.ts

@@ -8,7 +8,7 @@
 
 import { Schema } from '../schema';
 
-export { describeBuilder } from '../../testing';
+export { describeBuilder } from '../../../testing';
 
 export const BROWSER_BUILDER_INFO = Object.freeze({
   name: '@angular-devkit/build-angular:browser',

packages/angular_devkit/build_angular/src/builders/dev-server/hmr_spec.ts

@@ -13,7 +13,7 @@ import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page';
 import puppeteer from 'puppeteer/lib/cjs/puppeteer/node';
 /* eslint-enable import/no-extraneous-dependencies */
 import { debounceTime, switchMap, take } from 'rxjs/operators';
-import { createArchitect, host } from '../testing/test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 declare const document: any;

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

@@ -19,22 +19,21 @@ import { concatMap, switchMap } from 'rxjs/operators';
 import * as url from 'url';
 import webpack from 'webpack';
 import webpackDevServer from 'webpack-dev-server';
-import { Schema as BrowserBuilderSchema, OutputHashing } from '../browser/schema';
-import { ExecutionTransformer } from '../transforms';
-import { normalizeOptimization } from '../utils';
-import { findCachePath } from '../utils/cache-path';
-import { checkPort } from '../utils/check-port';
-import { colors } from '../utils/color';
-import { I18nOptions } from '../utils/i18n-options';
-import { IndexHtmlTransform } from '../utils/index-file/index-html-generator';
-import { generateEntryPoints } from '../utils/package-chunk-sort';
-import { readTsconfig } from '../utils/read-tsconfig';
-import { assertCompatibleAngularVersion } from '../utils/version';
+import { ExecutionTransformer } from '../../transforms';
+import { normalizeOptimization } from '../../utils';
+import { findCachePath } from '../../utils/cache-path';
+import { checkPort } from '../../utils/check-port';
+import { colors } from '../../utils/color';
+import { I18nOptions } from '../../utils/i18n-options';
+import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
+import { generateEntryPoints } from '../../utils/package-chunk-sort';
+import { readTsconfig } from '../../utils/read-tsconfig';
+import { assertCompatibleAngularVersion } from '../../utils/version';
 import {
   generateI18nBrowserWebpackConfigFromContext,
   getIndexInputFile,
   getIndexOutputFile,
-} from '../utils/webpack-browser-config';
+} from '../../utils/webpack-browser-config';
 import {
   getAnalyticsConfig,
   getBrowserConfig,
@@ -44,9 +43,10 @@ import {
   getStylesConfig,
   getTypeScriptConfig,
   getWorkerConfig,
-} from '../webpack/configs';
-import { IndexHtmlWebpackPlugin } from '../webpack/plugins/index-html-webpack-plugin';
-import { createWebpackLoggingCallback } from '../webpack/utils/stats';
+} from '../../webpack/configs';
+import { IndexHtmlWebpackPlugin } from '../../webpack/plugins/index-html-webpack-plugin';
+import { createWebpackLoggingCallback } from '../../webpack/utils/stats';
+import { Schema as BrowserBuilderSchema, OutputHashing } from '../browser/schema';
 import { Schema } from './schema';
 
 export type DevServerBuilderOptions = Schema & json.JsonObject;
@@ -413,7 +413,7 @@ async function setupLocalize(
     enforce: 'post',
     use: [
       {
-        loader: require.resolve('../babel/webpack-loader'),
+        loader: require.resolve('../../babel/webpack-loader'),
         options: {
           cacheDirectory: findCachePath('babel-dev-server-i18n'),
           cacheIdentifier: JSON.stringify({

packages/angular_devkit/build_angular/src/builders/dev-server/index_spec.ts

@@ -9,7 +9,7 @@
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { workspaces } from '@angular-devkit/core';
 import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
-import { createArchitect, host } from '../testing/test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Dev Server Builder index', () => {
   const targetSpec = { project: 'app', target: 'serve' };

packages/angular_devkit/build_angular/src/builders/dev-server/live-reload_spec.ts

@@ -15,7 +15,7 @@ import { Browser } from 'puppeteer/lib/cjs/puppeteer/common/Browser';
 import { Page } from 'puppeteer/lib/cjs/puppeteer/common/Page';
 import puppeteer from 'puppeteer/lib/cjs/puppeteer/node';
 import { debounceTime, switchMap, take } from 'rxjs/operators';
-import { createArchitect, host } from '../testing/test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare const document: any;

packages/angular_devkit/build_angular/src/builders/dev-server/ssl_spec.ts

@@ -11,7 +11,7 @@ import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { tags } from '@angular-devkit/core';
 import * as https from 'https';
 import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
-import { createArchitect, host } from '../testing/test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Dev Server Builder ssl', () => {
   const target = { project: 'app', target: 'serve' };

packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/build-budgets_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Type as BudgetType } from '../../../';
+import { Type as BudgetType } from '../../../..';
 import { serveWebpackBrowser } from '../../index';
 import {
   BASE_OPTIONS,

packages/angular_devkit/build_angular/src/builders/dev-server/tests/execute-fetch.ts

@@ -13,7 +13,7 @@ import {
   BuilderHarness,
   BuilderHarnessExecutionOptions,
   BuilderHarnessExecutionResult,
-} from '../../testing/builder-harness';
+} from '../../../testing/builder-harness';
 
 export async function executeOnceAndFetch<T>(
   harness: BuilderHarness<T>,

packages/angular_devkit/build_angular/src/builders/dev-server/tests/setup.ts

@@ -8,16 +8,16 @@
 
 import { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
+import { BuilderHarness } from '../../../testing/builder-harness';
 import { buildWebpackBrowser } from '../../browser';
 import { Schema as BrowserSchema } from '../../browser/schema';
 import {
   BASE_OPTIONS as BROWSER_BASE_OPTIONS,
   BROWSER_BUILDER_INFO,
 } from '../../browser/tests/setup';
-import { BuilderHarness } from '../../testing/builder-harness';
 import { Schema } from '../schema';
 
-export { describeBuilder } from '../../testing';
+export { describeBuilder } from '../../../testing';
 
 export const DEV_SERVER_BUILDER_INFO = Object.freeze({
   name: '@angular-devkit/build-angular:dev-server',

packages/angular_devkit/build_angular/src/builders/dev-server/works_spec.ts

@@ -10,7 +10,7 @@ import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
-import { createArchitect, host } from '../testing/test-utils';
+import { createArchitect, host } from '../../testing/test-utils';
 
 describe('Dev Server Builder', () => {
   const target = { project: 'app', target: 'serve' };

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

@@ -14,19 +14,19 @@ import type { Diagnostics } from '@angular/localize/src/tools/src/diagnostics';
 import * as fs from 'fs';
 import * as path from 'path';
 import webpack from 'webpack';
-import { Schema as BrowserBuilderOptions, OutputHashing } 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 { ExecutionTransformer } from '../../transforms';
+import { createI18nOptions } from '../../utils/i18n-options';
+import { assertCompatibleAngularVersion } from '../../utils/version';
+import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config';
 import {
   getBrowserConfig,
   getCommonConfig,
   getStatsConfig,
   getTypeScriptConfig,
   getWorkerConfig,
-} from '../webpack/configs';
-import { createWebpackLoggingCallback } from '../webpack/utils/stats';
+} from '../../webpack/configs';
+import { createWebpackLoggingCallback } from '../../webpack/utils/stats';
+import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema';
 import { Format, Schema } from './schema';
 
 export type ExtractI18nBuilderOptions = Schema & JsonObject;

packages/angular_devkit/build_angular/src/builders/extract-i18n/works_spec.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, extractI18nTargetSpec, host } from '../testing/test-utils';
+import { createArchitect, extractI18nTargetSpec, host } from '../../testing/test-utils';
 
 describe('Extract i18n Target', () => {
   const extractionFile = join(normalize('src'), 'messages.xlf');

packages/angular_devkit/build_angular/src/builders/karma/find-tests.ts

@@ -9,7 +9,7 @@
 import { existsSync } from 'fs';
 import * as glob from 'glob';
 import { basename, dirname, extname, join } from 'path';
-import { isDirectory } from '../utils/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/builders/karma/index.ts

@@ -13,18 +13,18 @@ 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, OutputHashing } from '../browser/schema';
-import { ExecutionTransformer } from '../transforms';
-import { assertCompatibleAngularVersion } from '../utils/version';
-import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import { ExecutionTransformer } from '../../transforms';
+import { assertCompatibleAngularVersion } from '../../utils/version';
+import { generateBrowserWebpackConfigFromContext } from '../../utils/webpack-browser-config';
 import {
   getCommonConfig,
   getStylesConfig,
   getTestConfig,
   getTypeScriptConfig,
   getWorkerConfig,
-} from '../webpack/configs';
-import { SingleTestTransformLoader } from '../webpack/plugins/single-test-transform';
+} from '../../webpack/configs';
+import { SingleTestTransformLoader } from '../../webpack/plugins/single-test-transform';
+import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema';
 import { findTests } from './find-tests';
 import { Schema as KarmaBuilderOptions } from './schema';
 

packages/angular_devkit/build_angular/src/builders/karma/tests/setup.ts

@@ -8,7 +8,7 @@
 
 import { Schema } from '../schema';
 
-export { describeBuilder } from '../../testing';
+export { describeBuilder } from '../../../testing';
 
 export const KARMA_BUILDER_INFO = Object.freeze({
   name: '@angular-devkit/build-angular:karma',