refactor(@angular-devkit/build-angular): standardize builder exports

Author: clydin

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

@@ -36,9 +36,9 @@ import { normalizeOptimization } from '../utils';
 import { Schema } from './schema';
 const open = require('open');
 
-export type DevServerBuilderSchema = Schema & json.JsonObject;
+export type DevServerBuilderOptions = Schema & json.JsonObject;
 
-export const devServerBuildOverriddenKeys: (keyof DevServerBuilderSchema)[] = [
+export const devServerBuildOverriddenKeys: (keyof DevServerBuilderOptions)[] = [
   'watch',
   'optimization',
   'aot',
@@ -72,7 +72,7 @@ export type ServerConfigTransformFn = (
  *     transforming webpack configuration before passing it to webpack).
  */
 export function serveWebpackBrowser(
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   context: BuilderContext,
   transforms: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
@@ -98,7 +98,7 @@ export function serveWebpackBrowser(
     const rawBrowserOptions = await context.getTargetOptions(browserTarget);
 
     // Override options we need to override, if defined.
-    const overrides = (Object.keys(options) as (keyof DevServerBuilderSchema)[])
+    const overrides = (Object.keys(options) as (keyof DevServerBuilderOptions)[])
     .filter(key => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
     .reduce<json.JsonObject & Partial<BrowserBuilderSchema>>((previous, key) => ({
       ...previous,
@@ -227,7 +227,7 @@ export function serveWebpackBrowser(
  */
 export function buildServerConfig(
   workspaceRoot: string,
-  serverOptions: DevServerBuilderSchema,
+  serverOptions: DevServerBuilderOptions,
   browserOptions: BrowserBuilderSchema,
   logger: logging.LoggerApi,
 ): WebpackDevServer.Configuration {
@@ -301,7 +301,7 @@ export function buildServerConfig(
  * @param logger A generic logger to use for showing warnings.
  */
 export function buildServePath(
-  serverOptions: DevServerBuilderSchema,
+  serverOptions: DevServerBuilderOptions,
   browserOptions: BrowserBuilderSchema,
   logger: logging.LoggerApi,
 ): string {
@@ -332,7 +332,7 @@ export function buildServePath(
  * @private
  */
 function _addLiveReload(
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   browserOptions: BrowserBuilderSchema,
   webpackConfig: webpack.Configuration,
   clientAddress: url.UrlWithStringQuery,
@@ -400,7 +400,7 @@ function _addLiveReload(
  */
 function _addSslConfig(
   root: string,
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   config: WebpackDevServer.Configuration,
 ) {
   let sslKey: string | undefined = undefined;
@@ -433,7 +433,7 @@ function _addSslConfig(
  */
 function _addProxyConfig(
   root: string,
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   config: WebpackDevServer.Configuration,
 ) {
   let proxyConfig = {};
@@ -488,4 +488,4 @@ function _findDefaultServePath(baseHref?: string, deployUrl?: string): string |
 }
 
 
-export default createBuilder<DevServerBuilderSchema, DevServerBuilderOutput>(serveWebpackBrowser);
+export default createBuilder<DevServerBuilderOptions, DevServerBuilderOutput>(serveWebpackBrowser);

packages/angular_devkit/build_angular/src/index.ts

@@ -12,9 +12,9 @@
 // See https://github.com/angular/angular-cli/issues/9691#issuecomment-367322703 for details.
 // We need to add a require here to satisfy the dependency checker.
 // require('ajv');
+
 export * from './transforms';
-export * from './app-shell';
-export * from './browser';
+
 export {
   AssetPattern,
   AssetPatternClass as AssetPatternObject,
@@ -25,16 +25,32 @@ export {
   OptimizationClass as OptimizationObject,
   OptimizationUnion,
   OutputHashing,
-  Schema as BrowserBuilderSchema,
+  Schema as BrowserBuilderOptions,
   SourceMapClass as SourceMapObject,
   SourceMapUnion,
   StylePreprocessorOptions,
   Type,
 } from './browser/schema';
-export * from './dev-server';
-export * from './extract-i18n';
-export * from './karma';
-export * from './karma/schema';
-export * from './protractor';
-export { execute as executeServerBuilder } from './server';
-export * from './tslint';
+
+export {
+  buildWebpackBrowser as executeBrowserBuilder,
+  BrowserBuilderOutput,
+} from './browser';
+
+export {
+  serveWebpackBrowser as executeDevServerBuilder,
+  DevServerBuilderOptions,
+  DevServerBuilderOutput,
+} from './dev-server';
+
+export {
+  execute as executeKarmaBuilder,
+  KarmaBuilderOptions,
+  KarmaConfigOptions,
+} from './karma';
+
+export {
+  execute as executeServerBuilder,
+  ServerBuilderOptions,
+  ServerBuilderOutput,
+} from './server';

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

@@ -23,7 +23,7 @@ import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browse
 import { Schema as KarmaBuilderOptions } from './schema';
 
 // tslint:disable-next-line:no-implicit-dependencies
-type KarmaConfigOptions = import ('karma').ConfigOptions & {
+export type KarmaConfigOptions = import ('karma').ConfigOptions & {
   buildWebpack?: unknown;
   configFile?: string;
 };

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

@@ -25,15 +25,17 @@ import {
 import { ExecutionTransformer } from '../transforms';
 import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
-import { Schema as BuildWebpackServerOptions } from './schema';
+import { Schema as ServerBuilderOptions } from './schema';
 
 // If success is true, outputPath should be set.
 export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath?: string;
 };
 
+export { ServerBuilderOptions };
+
 export function execute(
-  options: BuildWebpackServerOptions,
+  options: ServerBuilderOptions,
   context: BuilderContext,
   transforms: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
@@ -67,7 +69,7 @@ export function execute(
   );
 }
 
-export default createBuilder<json.JsonObject & BuildWebpackServerOptions, ServerBuilderOutput>(
+export default createBuilder<json.JsonObject & ServerBuilderOptions, ServerBuilderOutput>(
   execute,
 );
 
@@ -80,7 +82,7 @@ function getCompilerConfig(wco: WebpackConfigOptions) {
 }
 
 async function buildServerWebpackConfig(
-  options: BuildWebpackServerOptions,
+  options: ServerBuilderOptions,
   context: BuilderContext,
 ) {
   const { config } = await generateBrowserWebpackConfigFromContext(