refactor(@angular-devkit/build-angular): cleanup architect imports

Author: clydin

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

@@ -10,7 +10,7 @@ import {
   BuilderOutput,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
+} from '@angular-devkit/architect';
 import { JsonObject, experimental, join, normalize, resolve, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';

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

@@ -10,11 +10,11 @@ import {
   BuilderInfo,
   BuilderOutput,
   createBuilder,
-} from '@angular-devkit/architect/src/index2';
+} from '@angular-devkit/architect';
 import {
   WebpackLoggingCallback,
   runWebpack,
-} from '@angular-devkit/build-webpack/src/webpack';
+} from '@angular-devkit/build-webpack';
 import {
   Path,
   analytics,

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

@@ -10,12 +10,12 @@ import {
   BuilderContext,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
-import { WebpackLoggingCallback } from '@angular-devkit/build-webpack/src/webpack';
+} from '@angular-devkit/architect';
 import {
   DevServerBuildOutput,
+  WebpackLoggingCallback,
   runWebpackDevServer,
-} from '@angular-devkit/build-webpack/src/webpack-dev-server';
+} from '@angular-devkit/build-webpack';
 import { experimental, json, logging, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';

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

@@ -9,8 +9,8 @@ import {
   BuilderContext,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
-import { runWebpack } from '@angular-devkit/build-webpack/src/webpack';
+} from '@angular-devkit/architect';
+import { runWebpack } from '@angular-devkit/build-webpack';
 import { JsonObject } from '@angular-devkit/core';
 import * as path from 'path';
 import * as webpack from 'webpack';

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

@@ -5,7 +5,7 @@
  * 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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';

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

@@ -10,7 +10,7 @@ import {
   BuilderOutput,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
+} from '@angular-devkit/architect';
 import { JsonObject, tags } from '@angular-devkit/core';
 import { resolve } from 'path';
 import * as url from 'url';

packages/angular_devkit/build_angular/src/server/index.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 { BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
-import { runWebpack } from '@angular-devkit/build-webpack/src/webpack';
+import { BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import { runWebpack } from '@angular-devkit/build-webpack';
 import {
   Path,
   experimental,

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

@@ -5,7 +5,7 @@
  * 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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
 import * as glob from 'glob';

packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts

@@ -5,7 +5,7 @@
  * 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 { BuilderContext } from '@angular-devkit/architect/src/index2';
+import { BuilderContext } from '@angular-devkit/architect';
 import {
   experimental,
   getSystemPath,

packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts

@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function
-
+import { Architect } from '@angular-devkit/architect/src/architect';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
-import { Architect } from '../../../architect/src/architect';
 import { createArchitect, host } from '../utils';
 
 

packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';

packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { toArray } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';

packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { browserBuild, createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/index_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { take, tap, timeout } from 'rxjs/operators';
 import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';

packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 

packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { browserBuild, createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 

packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { browserBuild, createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts

@@ -7,7 +7,7 @@
  */
 // tslint:disable:no-big-function
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';

packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { of, race } from 'rxjs';

packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { createArchitect, host, outputPath } from '../utils';

packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { logging } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';

packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { OutputHashing } from '../../src/browser/schema';
 import { browserBuild, createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 

packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts

@@ -7,7 +7,7 @@
  */
 // tslint:disable:no-big-function
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging, normalize, tags } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 

packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host, outputPath } from '../utils';
 

packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 

packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts

@@ -5,7 +5,7 @@
  * 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 { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';