From 87b04063dd4ca85858430a1c83ef24974c59bbca Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 13:46:43 -0400
Subject: [PATCH] refactor(@angular-devkit/build-webpack): cleanup architect
 imports

---
 .../angular_devkit/build_webpack/src/plugins/architect.ts     | 2 +-
 .../build_webpack/src/webpack-dev-server/index.ts             | 2 +-
 .../build_webpack/src/webpack-dev-server/index_spec_large.ts  | 4 ++--
 packages/angular_devkit/build_webpack/src/webpack/index.ts    | 2 +-
 .../build_webpack/src/webpack/index_spec_large.ts             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/plugins/architect.ts b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
index 9528740427..4ba52d3fe4 100644
--- a/packages/angular_devkit/build_webpack/src/plugins/architect.ts
+++ b/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';
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index 6742e66b6a..c1fd3c1575 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ b/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';
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
index 96211d6886..dc5faf4be4 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
+++ b/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';
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index a77b9a9a61..73c4abcd68 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/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';
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
index a010c56154..114bc56fc6 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
+++ b/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