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

Author: clydin

packages/angular_devkit/build_webpack/src/plugins/architect.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 { strings } from '@angular-devkit/core';
 import * as path from 'path';
 import * as webpack from 'webpack';

packages/angular_devkit/build_webpack/src/webpack-dev-server/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, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, createBuilder } from '@angular-devkit/architect';
 import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import * as net from 'net';
 import { Observable, from, of } from 'rxjs';

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

@@ -5,9 +5,9 @@
  * 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';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import { experimental, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';

packages/angular_devkit/build_webpack/src/webpack/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 { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import { Observable, from, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';

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

@@ -5,13 +5,13 @@
  * 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';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import { experimental, join, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { Architect } from '../../../architect/src/architect';
-import { TestingArchitectHost } from '../../../architect/testing/testing-architect-host';
 import { BuildResult } from './index';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any