fix compilation for bit start

Author: ocombe

packages/angular-v10/angular-v10.env.ts

@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
 import { ESLintMain } from '@teambit/eslint';
 import { JestMain } from '@teambit/jest';
 import { IsolatorMain } from '@teambit/isolator';
-import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
+import { NgPackagrMain } from '@teambit/ng-packagr';
 import { WebpackMain } from '@teambit/webpack';
 import { Workspace } from '@teambit/workspace';
-import { ngPackagr } from 'ng-packagr';
 import { GeneratorMain } from '@teambit/generator';
+import { PkgMain } from '@teambit/pkg';
 import { AngularV10Aspect } from './angular-v10.aspect';
 import { AngularV10Webpack } from './angular-v10.webpack';
-import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
 
 /**
  * a component environment built for [Angular](https://angular.io).
  */
 export class AngularV10Env extends AngularEnv {
   name = 'Angular-v10';
-  angularWebpack = new AngularV10Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
-  ngPackagr = ngPackagr() as NgPackagr;
-  readDefaultTsConfig = readDefaultTsConfig;
+  angularWebpack = new AngularV10Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
+  ngPackagr = require.resolve('ng-packagr');
+  readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
 
   constructor(
     jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV10Env extends AngularEnv {
     private webpackMain: WebpackMain,
     private workspace: Workspace | undefined,
     private compositions: CompositionsMain,
+    private pkg: PkgMain,
   ) {
     super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
   }

packages/angular-v10/angular-v10.main.runtime.ts

@@ -14,6 +14,7 @@ export class AngularV10Main extends AngularMain {
     compositions,
     envs,
     isolator,
+    pkg,
   ]: AngularDeps): Promise<AngularMain> {
     const angularV10Env = new AngularV10Env(
       jestAspect,
@@ -25,6 +26,7 @@ export class AngularV10Main extends AngularMain {
       webpack,
       workspace,
       compositions,
+      pkg,
     );
     return new AngularV10Main(envs, angularV10Env);
   }

packages/angular-v10/angular-v10.webpack.ts

@@ -32,6 +32,7 @@ import { CompositionsMain } from '@teambit/compositions';
 import { Logger } from '@teambit/logger';
 import { WebpackConfigWithDevServer, WebpackMain } from '@teambit/webpack';
 import { Workspace } from '@teambit/workspace';
+import { PkgMain } from '@teambit/pkg';
 import path from 'path';
 import webpack, { Configuration } from 'webpack';
 import WsDevServer, { addDevServerEntrypoints } from 'webpack-dev-server';
@@ -54,8 +55,8 @@ export class AngularV10Webpack extends AngularWebpack {
   webpackBuildConfigFactory = webpack4BuildConfigFactory;
   webpack: typeof webpack;
 
-  constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
-    super(workspace, webpackMain, compositions, AngularV10Aspect, nodeModulesPaths);
+  constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
+    super(workspace, webpackMain, compositions, pkg, AngularV10Aspect, nodeModulesPaths);
     // resolving to the webpack used by angular devkit to avoid multiple instances of webpack
     // otherwise, if we use a different version, it would break
     const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -83,7 +84,7 @@ export class AngularV10Webpack extends AngularWebpack {
     workspaceRoot: string,
     logger: Logger,
     setup: WebpackSetup,
-    webpackOptions: Partial<WebpackConfigWithDevServer> = {},
+    webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
     angularOptions: Partial<BrowserBuilderSchema> = {}
   ): Promise<WebpackConfigWithDevServer | Configuration> {
     // Options from angular.json

packages/angular-v11/angular-v11.env.ts

@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
 import { ESLintMain } from '@teambit/eslint';
 import { JestMain } from '@teambit/jest';
 import { IsolatorMain } from '@teambit/isolator';
-import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
+import { PkgMain } from '@teambit/pkg';
+import { NgPackagrMain } from '@teambit/ng-packagr';
 import { WebpackMain } from '@teambit/webpack';
 import { Workspace } from '@teambit/workspace';
-import { ngPackagr } from 'ng-packagr';
 import { GeneratorMain } from '@teambit/generator';
 import { AngularV11Aspect } from './angular-v11.aspect';
 import { AngularV11Webpack } from './angular-v11.webpack';
-import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
 
 /**
  * a component environment built for [Angular](https://angular.io).
  */
 export class AngularV11Env extends AngularEnv {
   name = 'Angular-v11';
-  angularWebpack = new AngularV11Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
-  ngPackagr = ngPackagr() as NgPackagr;
-  readDefaultTsConfig = readDefaultTsConfig;
+  angularWebpack = new AngularV11Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
+  ngPackagr = require.resolve('ng-packagr');
+  readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
 
   constructor(
     jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV11Env extends AngularEnv {
     private webpackMain: WebpackMain,
     private workspace: Workspace | undefined,
     private compositions: CompositionsMain,
+    private pkg: PkgMain,
   ) {
     super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
   }

packages/angular-v11/angular-v11.main.runtime.ts

@@ -14,6 +14,7 @@ export class AngularV11Main extends AngularMain {
     compositions,
     envs,
     isolator,
+    pkg,
   ]: AngularDeps): Promise<AngularMain> {
     const angularV11Env = new AngularV11Env(
       jestAspect,
@@ -25,6 +26,7 @@ export class AngularV11Main extends AngularMain {
       webpack,
       workspace,
       compositions,
+      pkg,
     );
     return new AngularV11Main(envs, angularV11Env);
   }

packages/angular-v11/angular-v11.webpack.ts

@@ -22,6 +22,7 @@ import {
 import { IndexHtmlWebpackPlugin } from '@angular-devkit/build-angular/src/webpack/plugins/index-html-webpack-plugin';
 import { getSystemPath, logging, normalize, tags } from '@angular-devkit/core';
 import { AngularWebpack, optionValue, WebpackSetup } from '@teambit/angular';
+import { PkgMain } from '@teambit/pkg';
 import { Workspace } from '@teambit/workspace';
 import { CompositionsMain } from '@teambit/compositions';
 import { webpack4ServeConfigFactory } from './webpack/webpack4.serve.config';
@@ -41,8 +42,8 @@ export class AngularV11Webpack extends AngularWebpack {
   webpackBuildConfigFactory = webpack4BuildConfigFactory;
   webpack: typeof webpack;
 
-  constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
-    super(workspace, webpackMain, compositions, AngularV11Aspect, nodeModulesPaths);
+  constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
+    super(workspace, webpackMain, compositions, pkg, AngularV11Aspect, nodeModulesPaths);
     // resolving to the webpack used by angular devkit to avoid multiple instances of webpack
     // otherwise, if we use a different version, it would break
     const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -70,7 +71,7 @@ export class AngularV11Webpack extends AngularWebpack {
     workspaceRoot: string,
     logger: Logger,
     setup: WebpackSetup,
-    webpackOptions: Partial<WebpackConfigWithDevServer> = {},
+    webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
     angularOptions: Partial<BrowserBuilderSchema> = {}
   ): Promise<WebpackConfigWithDevServer | Configuration> {
     // Options from angular.json

packages/angular-v12/angular-v12.env.ts

@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
 import { ESLintMain } from '@teambit/eslint';
 import { JestMain } from '@teambit/jest';
 import { IsolatorMain } from '@teambit/isolator';
-import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
+import { PkgMain } from '@teambit/pkg';
+import { NgPackagrMain } from '@teambit/ng-packagr';
 import { WebpackMain } from '@teambit/webpack';
 import { Workspace } from '@teambit/workspace';
-import { ngPackagr } from 'ng-packagr';
 import { GeneratorMain } from '@teambit/generator';
 import { AngularV12Aspect } from './angular-v12.aspect';
 import { AngularV12Webpack } from './angular-v12.webpack';
-import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
 
 /**
  * a component environment built for [Angular](https://angular.io).
  */
 export class AngularV12Env extends AngularEnv {
   name = 'Angular-v12';
-  angularWebpack = new AngularV12Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
-  ngPackagr = ngPackagr() as NgPackagr;
-  readDefaultTsConfig = readDefaultTsConfig;
+  angularWebpack = new AngularV12Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
+  ngPackagr = require.resolve('ng-packagr');
+  readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
 
   constructor(
     jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV12Env extends AngularEnv {
     private webpackMain: WebpackMain,
     private workspace: Workspace | undefined,
     private compositions: CompositionsMain,
+    private pkg: PkgMain
   ) {
     super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
   }

packages/angular-v12/angular-v12.main.runtime.ts

@@ -14,6 +14,7 @@ export class AngularV12Main extends AngularMain {
     compositions,
     envs,
     isolator,
+    pkg,
   ]: AngularDeps): Promise<AngularMain> {
     const angularV12Env = new AngularV12Env(
       jestAspect,
@@ -25,6 +26,7 @@ export class AngularV12Main extends AngularMain {
       webpack,
       workspace,
       compositions,
+      pkg,
     );
     return new AngularV12Main(envs, angularV12Env);
   }

packages/angular-v12/angular-v12.webpack.ts

@@ -28,9 +28,10 @@ import { CompositionsMain } from '@teambit/compositions';
 import { Logger } from '@teambit/logger';
 import { WebpackConfigWithDevServer, WebpackMain } from '@teambit/webpack';
 import { Workspace } from '@teambit/workspace';
+import { PkgMain } from '@teambit/pkg';
 import path from 'path';
 import webpack, { Configuration } from 'webpack';
-import WsDevServer, { addDevServerEntrypoints } from 'webpack-dev-server';
+import WsDevServer from 'webpack-dev-server';
 import { webpack5BuildConfigFactory } from './webpack/webpack5.build.config';
 import { webpack5ServeConfigFactory } from './webpack/webpack5.serve.config';
 import { AngularV12Aspect } from './angular-v12.aspect';
@@ -42,8 +43,8 @@ export class AngularV12Webpack extends AngularWebpack {
   webpackBuildConfigFactory = webpack5BuildConfigFactory;
   webpack: typeof webpack;
 
-  constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
-    super(workspace, webpackMain, compositions, AngularV12Aspect, nodeModulesPaths);
+  constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
+    super(workspace, webpackMain, compositions, pkg, AngularV12Aspect, nodeModulesPaths);
     // resolving to the webpack used by angular devkit to avoid multiple instances of webpack
     // otherwise, if we use a different version, it would break
     const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -106,7 +107,7 @@ export class AngularV12Webpack extends AngularWebpack {
     workspaceRoot: string,
     logger: Logger,
     setup: WebpackSetup,
-    webpackOptions: Partial<WebpackConfigWithDevServer> = {},
+    webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
     angularOptions: Partial<BrowserBuilderSchema> = {}
   ): Promise<WebpackConfigWithDevServer | Configuration> {
     // Options from angular.json

packages/angular-v8/angular-v8.env.ts

@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
 import { ESLintMain } from '@teambit/eslint';
 import { JestMain } from '@teambit/jest';
 import { IsolatorMain } from '@teambit/isolator';
-import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
+import { NgPackagrMain } from '@teambit/ng-packagr';
 import { WebpackMain } from '@teambit/webpack';
 import { Workspace } from '@teambit/workspace';
-import { ngPackagr } from 'ng-packagr';
+import { PkgMain } from '@teambit/pkg';
 import { GeneratorMain } from '@teambit/generator';
 import { AngularV8Aspect } from './angular-v8.aspect';
 import { AngularV8Webpack } from './angular-v8.webpack';
-import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
 
 /**
  * a component environment built for [Angular](https://angular.io).
  */
 export class AngularV8Env extends AngularEnv {
   name = 'Angular-v8';
-  angularWebpack = new AngularV8Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
-  ngPackagr = ngPackagr() as NgPackagr;
-  readDefaultTsConfig = readDefaultTsConfig;
+  angularWebpack = new AngularV8Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
+  ngPackagr = require.resolve('ng-packagr');
+  readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
 
   constructor(
     jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV8Env extends AngularEnv {
     private webpackMain: WebpackMain,
     private workspace: Workspace | undefined,
     private compositions: CompositionsMain,
+    private pkg: PkgMain,
   ) {
     super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
   }