refactor(@angular-devkit/build-webpack): cleanup stable architect API file names

clydin · mgechev · commit bf0fcf39e05e · 2019-04-02T04:50:08.000-07:00
diff --git a/packages/angular_devkit/build_webpack/builders.json b/packages/angular_devkit/build_webpack/builders.json
@@ -2,26 +2,22 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "build": {
-      "implementation": "./src/webpack/index2",
-      "class": "./src/webpack",
+      "implementation": "./src/webpack",
       "schema": "./src/webpack/schema.json",
       "description": "Build a webpack app."
     },
     "webpack": {
-      "implementation": "./src/webpack/index2",
-      "class": "./src/webpack",
+      "implementation": "./src/webpack",
       "schema": "./src/webpack/schema.json",
       "description": "Build a webpack app."
     },
     "dev-server": {
-      "implementation": "./src/webpack-dev-server/index2",
-      "class": "./src/webpack-dev-server",
+      "implementation": "./src/webpack-dev-server",
       "schema": "./src/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
     },
     "webpack-dev-server": {
-      "implementation": "./src/webpack-dev-server/index2",
-      "class": "./src/webpack-dev-server",
+      "implementation": "./src/webpack-dev-server",
       "schema": "./src/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
     }
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
@@ -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, createBuilder } from '@angular-devkit/architect/src/index2';
 import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import * as net from 'net';
 import { Observable, from, of } from 'rxjs';
@@ -14,7 +14,7 @@ import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { ArchitectPlugin } from '../plugins/architect';
 import { getEmittedFiles } from '../utils';
-import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack/index2';
+import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
 import { Schema as WebpackDevServerBuilderSchema } from './schema';
 
 const webpackMerge = require('webpack-merge');
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
@@ -5,15 +5,15 @@
  * 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 { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
 import { experimental, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import * as path from 'path';
-import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
-import { DevServerBuildOutput } from './index2';
+import { DevServerBuildOutput } from './index';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
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
@@ -5,14 +5,14 @@
  * 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 { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 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 { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
 import { Architect } from '../../../architect/src/architect';
 import { TestingArchitectHost } from '../../../architect/testing/testing-architect-host';
-import { BuildResult } from './index2';
+import { BuildResult } from './index';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 
