refactor(@ngtools/webpack): move interfaces to separate file

Alan Agius · mgechev · commit 655626c28433 · 2019-04-01T02:54:41.000-07:00
This is to avoid circular imports
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -36,9 +36,14 @@ import * as path from 'path';
 import * as ts from 'typescript';
 import { Compiler, compilation } from 'webpack';
 import { time, timeEnd } from './benchmark';
-import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
+import { WebpackCompilerHost } from './compiler_host';
 import { resolveEntryModuleFromMain } from './entry_resolver';
 import { DiagnosticMode, gatherDiagnostics, hasErrors } from './gather_diagnostics';
+import {
+  AngularCompilerPluginOptions,
+  ContextElementDependencyConstructor,
+  PLATFORM,
+} from './interfaces';
 import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
 import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
@@ -63,6 +68,7 @@ import {
   MESSAGE_KIND,
   UpdateMessage,
 } from './type_checker_messages';
+import { workaroundResolve } from './utils';
 import {
   VirtualFileSystemDecorator,
   VirtualWatchFileSystemDecorator,
@@ -76,61 +82,6 @@ import { WebpackInputHost } from './webpack-input-host';
 
 const treeKill = require('tree-kill');
 
-export interface ContextElementDependency { }
-
-export interface ContextElementDependencyConstructor {
-  new(modulePath: string, name: string): ContextElementDependency;
-}
-
-/**
- * Option Constants
- */
-export interface AngularCompilerPluginOptions {
-  sourceMap?: boolean;
-  tsConfigPath: string;
-  basePath?: string;
-  entryModule?: string;
-  mainPath?: string;
-  skipCodeGeneration?: boolean;
-  hostReplacementPaths?: { [path: string]: string } | ((path: string) => string);
-  forkTypeChecker?: boolean;
-  i18nInFile?: string;
-  i18nInFormat?: string;
-  i18nOutFile?: string;
-  i18nOutFormat?: string;
-  locale?: string;
-  missingTranslation?: string;
-  platform?: PLATFORM;
-  nameLazyFiles?: boolean;
-  logger?: logging.Logger;
-  directTemplateLoading?: boolean;
-  // When using the loadChildren string syntax, @ngtools/webpack must query @angular/compiler-cli
-  // via a private API to know which lazy routes exist. This increases build and rebuild time.
-  // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
-  // This option is also used for when the compilation doesn't need this sort of processing at all.
-  discoverLazyRoutes?: boolean;
-  importFactories?: boolean;
-
-  // added to the list of lazy routes
-  additionalLazyModules?: { [module: string]: string };
-  additionalLazyModuleResources?: string[];
-
-  // The ContextElementDependency of correct Webpack compilation.
-  // This is needed when there are multiple Webpack installs.
-  contextElementDependencyConstructor?: ContextElementDependencyConstructor;
-
-  // Use tsconfig to include path globs.
-  compilerOptions?: ts.CompilerOptions;
-
-  host?: virtualFs.Host<fs.Stats>;
-  platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];
-}
-
-export enum PLATFORM {
-  Browser,
-  Server,
-}
-
 export class AngularCompilerPlugin {
   private _options: AngularCompilerPluginOptions;
 
@@ -701,6 +652,7 @@ export class AngularCompilerPlugin {
         host,
         true,
         this._options.directTemplateLoading,
+        this._platform,
       );
 
       // Create and set a new WebpackResourceLoader in AOT
diff --git a/packages/ngtools/webpack/src/interfaces.ts b/packages/ngtools/webpack/src/interfaces.ts
@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * 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 { logging, virtualFs } from '@angular-devkit/core';
+import * as fs from 'fs';
+import * as ts from 'typescript';
+
+export enum PLATFORM {
+  Browser,
+  Server,
+}
+
+export interface ContextElementDependency { }
+
+export interface ContextElementDependencyConstructor {
+  new(modulePath: string, name: string): ContextElementDependency;
+}
+
+/**
+ * Option Constants
+ */
+export interface AngularCompilerPluginOptions {
+  sourceMap?: boolean;
+  tsConfigPath: string;
+  basePath?: string;
+  entryModule?: string;
+  mainPath?: string;
+  skipCodeGeneration?: boolean;
+  hostReplacementPaths?: { [path: string]: string } | ((path: string) => string);
+  forkTypeChecker?: boolean;
+  i18nInFile?: string;
+  i18nInFormat?: string;
+  i18nOutFile?: string;
+  i18nOutFormat?: string;
+  locale?: string;
+  missingTranslation?: string;
+  platform?: PLATFORM;
+  nameLazyFiles?: boolean;
+  logger?: logging.Logger;
+  directTemplateLoading?: boolean;
+
+  // When using the loadChildren string syntax, @ngtools/webpack must query @angular/compiler-cli
+  // via a private API to know which lazy routes exist. This increases build and rebuild time.
+  // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
+  // This option is also used for when the compilation doesn't need this sort of processing at all.
+  discoverLazyRoutes?: boolean;
+  importFactories?: boolean;
+
+  // added to the list of lazy routes
+  additionalLazyModules?: { [module: string]: string };
+  additionalLazyModuleResources?: string[];
+
+  // The ContextElementDependency of correct Webpack compilation.
+  // This is needed when there are multiple Webpack installs.
+  contextElementDependencyConstructor?: ContextElementDependencyConstructor;
+
+  // Use tsconfig to include path globs.
+  compilerOptions?: ts.CompilerOptions;
+
+  host?: virtualFs.Host<fs.Stats>;
+  platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];
+}
