Skip to content

Commit 60eb00e

Browse files
ocombeocombe
committed
fix compilation for bit start 
1 parent f960500 commit 60eb00e

22 files changed

+250
-149
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
55
import { ESLintMain } from '@teambit/eslint';
66
import { JestMain } from '@teambit/jest';
77
import { IsolatorMain } from '@teambit/isolator';
8-
import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
8+
import { NgPackagrMain } from '@teambit/ng-packagr';
99
import { WebpackMain } from '@teambit/webpack';
1010
import { Workspace } from '@teambit/workspace';
11-
import { ngPackagr } from 'ng-packagr';
1211
import { GeneratorMain } from '@teambit/generator';
12+
import { PkgMain } from '@teambit/pkg';
1313
import { AngularV10Aspect } from './angular-v10.aspect';
1414
import { AngularV10Webpack } from './angular-v10.webpack';
15-
import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
1615

1716
/**
1817
* a component environment built for [Angular](https://angular.io).
1918
*/
2019
export class AngularV10Env extends AngularEnv {
2120
name = 'Angular-v10';
22-
angularWebpack = new AngularV10Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
23-
ngPackagr = ngPackagr() as NgPackagr;
24-
readDefaultTsConfig = readDefaultTsConfig;
21+
angularWebpack = new AngularV10Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
22+
ngPackagr = require.resolve('ng-packagr');
23+
readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
2524

2625
constructor(
2726
jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV10Env extends AngularEnv {
3332
private webpackMain: WebpackMain,
3433
private workspace: Workspace | undefined,
3534
private compositions: CompositionsMain,
35+
private pkg: PkgMain,
3636
) {
3737
super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
3838
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class AngularV10Main extends AngularMain {
1414
compositions,
1515
envs,
1616
isolator,
17+
pkg,
1718
]: AngularDeps): Promise<AngularMain> {
1819
const angularV10Env = new AngularV10Env(
1920
jestAspect,
@@ -25,6 +26,7 @@ export class AngularV10Main extends AngularMain {
2526
webpack,
2627
workspace,
2728
compositions,
29+
pkg,
2830
);
2931
return new AngularV10Main(envs, angularV10Env);
3032
}

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { CompositionsMain } from '@teambit/compositions';
3232
import { Logger } from '@teambit/logger';
3333
import { WebpackConfigWithDevServer, WebpackMain } from '@teambit/webpack';
3434
import { Workspace } from '@teambit/workspace';
35+
import { PkgMain } from '@teambit/pkg';
3536
import path from 'path';
3637
import webpack, { Configuration } from 'webpack';
3738
import WsDevServer, { addDevServerEntrypoints } from 'webpack-dev-server';
@@ -54,8 +55,8 @@ export class AngularV10Webpack extends AngularWebpack {
5455
webpackBuildConfigFactory = webpack4BuildConfigFactory;
5556
webpack: typeof webpack;
5657

57-
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
58-
super(workspace, webpackMain, compositions, AngularV10Aspect, nodeModulesPaths);
58+
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
59+
super(workspace, webpackMain, compositions, pkg, AngularV10Aspect, nodeModulesPaths);
5960
// resolving to the webpack used by angular devkit to avoid multiple instances of webpack
6061
// otherwise, if we use a different version, it would break
6162
const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -83,7 +84,7 @@ export class AngularV10Webpack extends AngularWebpack {
8384
workspaceRoot: string,
8485
logger: Logger,
8586
setup: WebpackSetup,
86-
webpackOptions: Partial<WebpackConfigWithDevServer> = {},
87+
webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
8788
angularOptions: Partial<BrowserBuilderSchema> = {}
8889
): Promise<WebpackConfigWithDevServer | Configuration> {
8990
// Options from angular.json

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
55
import { ESLintMain } from '@teambit/eslint';
66
import { JestMain } from '@teambit/jest';
77
import { IsolatorMain } from '@teambit/isolator';
8-
import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
8+
import { PkgMain } from '@teambit/pkg';
9+
import { NgPackagrMain } from '@teambit/ng-packagr';
910
import { WebpackMain } from '@teambit/webpack';
1011
import { Workspace } from '@teambit/workspace';
11-
import { ngPackagr } from 'ng-packagr';
1212
import { GeneratorMain } from '@teambit/generator';
1313
import { AngularV11Aspect } from './angular-v11.aspect';
1414
import { AngularV11Webpack } from './angular-v11.webpack';
15-
import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
1615

1716
/**
1817
* a component environment built for [Angular](https://angular.io).
1918
*/
2019
export class AngularV11Env extends AngularEnv {
2120
name = 'Angular-v11';
22-
angularWebpack = new AngularV11Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
23-
ngPackagr = ngPackagr() as NgPackagr;
24-
readDefaultTsConfig = readDefaultTsConfig;
21+
angularWebpack = new AngularV11Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
22+
ngPackagr = require.resolve('ng-packagr');
23+
readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
2524

2625
constructor(
2726
jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV11Env extends AngularEnv {
3332
private webpackMain: WebpackMain,
3433
private workspace: Workspace | undefined,
3534
private compositions: CompositionsMain,
35+
private pkg: PkgMain,
3636
) {
3737
super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
3838
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class AngularV11Main extends AngularMain {
1414
compositions,
1515
envs,
1616
isolator,
17+
pkg,
1718
]: AngularDeps): Promise<AngularMain> {
1819
const angularV11Env = new AngularV11Env(
1920
jestAspect,
@@ -25,6 +26,7 @@ export class AngularV11Main extends AngularMain {
2526
webpack,
2627
workspace,
2728
compositions,
29+
pkg,
2830
);
2931
return new AngularV11Main(envs, angularV11Env);
3032
}

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
import { IndexHtmlWebpackPlugin } from '@angular-devkit/build-angular/src/webpack/plugins/index-html-webpack-plugin';
2323
import { getSystemPath, logging, normalize, tags } from '@angular-devkit/core';
2424
import { AngularWebpack, optionValue, WebpackSetup } from '@teambit/angular';
25+
import { PkgMain } from '@teambit/pkg';
2526
import { Workspace } from '@teambit/workspace';
2627
import { CompositionsMain } from '@teambit/compositions';
2728
import { webpack4ServeConfigFactory } from './webpack/webpack4.serve.config';
@@ -41,8 +42,8 @@ export class AngularV11Webpack extends AngularWebpack {
4142
webpackBuildConfigFactory = webpack4BuildConfigFactory;
4243
webpack: typeof webpack;
4344

44-
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
45-
super(workspace, webpackMain, compositions, AngularV11Aspect, nodeModulesPaths);
45+
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
46+
super(workspace, webpackMain, compositions, pkg, AngularV11Aspect, nodeModulesPaths);
4647
// resolving to the webpack used by angular devkit to avoid multiple instances of webpack
4748
// otherwise, if we use a different version, it would break
4849
const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -70,7 +71,7 @@ export class AngularV11Webpack extends AngularWebpack {
7071
workspaceRoot: string,
7172
logger: Logger,
7273
setup: WebpackSetup,
73-
webpackOptions: Partial<WebpackConfigWithDevServer> = {},
74+
webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
7475
angularOptions: Partial<BrowserBuilderSchema> = {}
7576
): Promise<WebpackConfigWithDevServer | Configuration> {
7677
// Options from angular.json

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
55
import { ESLintMain } from '@teambit/eslint';
66
import { JestMain } from '@teambit/jest';
77
import { IsolatorMain } from '@teambit/isolator';
8-
import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
8+
import { PkgMain } from '@teambit/pkg';
9+
import { NgPackagrMain } from '@teambit/ng-packagr';
910
import { WebpackMain } from '@teambit/webpack';
1011
import { Workspace } from '@teambit/workspace';
11-
import { ngPackagr } from 'ng-packagr';
1212
import { GeneratorMain } from '@teambit/generator';
1313
import { AngularV12Aspect } from './angular-v12.aspect';
1414
import { AngularV12Webpack } from './angular-v12.webpack';
15-
import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
1615

1716
/**
1817
* a component environment built for [Angular](https://angular.io).
1918
*/
2019
export class AngularV12Env extends AngularEnv {
2120
name = 'Angular-v12';
22-
angularWebpack = new AngularV12Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
23-
ngPackagr = ngPackagr() as NgPackagr;
24-
readDefaultTsConfig = readDefaultTsConfig;
21+
angularWebpack = new AngularV12Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
22+
ngPackagr = require.resolve('ng-packagr');
23+
readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
2524

2625
constructor(
2726
jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV12Env extends AngularEnv {
3332
private webpackMain: WebpackMain,
3433
private workspace: Workspace | undefined,
3534
private compositions: CompositionsMain,
35+
private pkg: PkgMain
3636
) {
3737
super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
3838
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class AngularV12Main extends AngularMain {
1414
compositions,
1515
envs,
1616
isolator,
17+
pkg,
1718
]: AngularDeps): Promise<AngularMain> {
1819
const angularV12Env = new AngularV12Env(
1920
jestAspect,
@@ -25,6 +26,7 @@ export class AngularV12Main extends AngularMain {
2526
webpack,
2627
workspace,
2728
compositions,
29+
pkg,
2830
);
2931
return new AngularV12Main(envs, angularV12Env);
3032
}

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ import { CompositionsMain } from '@teambit/compositions';
2828
import { Logger } from '@teambit/logger';
2929
import { WebpackConfigWithDevServer, WebpackMain } from '@teambit/webpack';
3030
import { Workspace } from '@teambit/workspace';
31+
import { PkgMain } from '@teambit/pkg';
3132
import path from 'path';
3233
import webpack, { Configuration } from 'webpack';
33-
import WsDevServer, { addDevServerEntrypoints } from 'webpack-dev-server';
34+
import WsDevServer from 'webpack-dev-server';
3435
import { webpack5BuildConfigFactory } from './webpack/webpack5.build.config';
3536
import { webpack5ServeConfigFactory } from './webpack/webpack5.serve.config';
3637
import { AngularV12Aspect } from './angular-v12.aspect';
@@ -42,8 +43,8 @@ export class AngularV12Webpack extends AngularWebpack {
4243
webpackBuildConfigFactory = webpack5BuildConfigFactory;
4344
webpack: typeof webpack;
4445

45-
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
46-
super(workspace, webpackMain, compositions, AngularV12Aspect, nodeModulesPaths);
46+
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
47+
super(workspace, webpackMain, compositions, pkg, AngularV12Aspect, nodeModulesPaths);
4748
// resolving to the webpack used by angular devkit to avoid multiple instances of webpack
4849
// otherwise, if we use a different version, it would break
4950
const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -106,7 +107,7 @@ export class AngularV12Webpack extends AngularWebpack {
106107
workspaceRoot: string,
107108
logger: Logger,
108109
setup: WebpackSetup,
109-
webpackOptions: Partial<WebpackConfigWithDevServer> = {},
110+
webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
110111
angularOptions: Partial<BrowserBuilderSchema> = {}
111112
): Promise<WebpackConfigWithDevServer | Configuration> {
112113
// Options from angular.json

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
55
import { ESLintMain } from '@teambit/eslint';
66
import { JestMain } from '@teambit/jest';
77
import { IsolatorMain } from '@teambit/isolator';
8-
import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
8+
import { NgPackagrMain } from '@teambit/ng-packagr';
99
import { WebpackMain } from '@teambit/webpack';
1010
import { Workspace } from '@teambit/workspace';
11-
import { ngPackagr } from 'ng-packagr';
11+
import { PkgMain } from '@teambit/pkg';
1212
import { GeneratorMain } from '@teambit/generator';
1313
import { AngularV8Aspect } from './angular-v8.aspect';
1414
import { AngularV8Webpack } from './angular-v8.webpack';
15-
import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
1615

1716
/**
1817
* a component environment built for [Angular](https://angular.io).
1918
*/
2019
export class AngularV8Env extends AngularEnv {
2120
name = 'Angular-v8';
22-
angularWebpack = new AngularV8Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
23-
ngPackagr = ngPackagr() as NgPackagr;
24-
readDefaultTsConfig = readDefaultTsConfig;
21+
angularWebpack = new AngularV8Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
22+
ngPackagr = require.resolve('ng-packagr');
23+
readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
2524

2625
constructor(
2726
jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV8Env extends AngularEnv {
3332
private webpackMain: WebpackMain,
3433
private workspace: Workspace | undefined,
3534
private compositions: CompositionsMain,
35+
private pkg: PkgMain,
3636
) {
3737
super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
3838
}

‎packages/angular-v8/angular-v8.main.runtime.ts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class AngularV8Main extends AngularMain {
1414
compositions,
1515
envs,
1616
isolator,
17+
pkg,
1718
]: AngularDeps): Promise<AngularMain> {
1819
const angularV8Env = new AngularV8Env(
1920
jestAspect,
@@ -25,6 +26,7 @@ export class AngularV8Main extends AngularMain {
2526
webpack,
2627
workspace,
2728
compositions,
29+
pkg,
2830
);
2931
return new AngularV8Main(envs, angularV8Env);
3032
}

‎packages/angular-v8/angular-v8.webpack.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { CompositionsMain } from '@teambit/compositions';
3131
import { Logger } from '@teambit/logger';
3232
import { WebpackConfigWithDevServer, WebpackMain } from '@teambit/webpack';
3333
import { Workspace } from '@teambit/workspace';
34+
import { PkgMain } from '@teambit/pkg';
3435
import path from 'path';
3536
import webpack, { Configuration } from 'webpack';
3637
import WsDevServer, { addDevServerEntrypoints } from 'webpack-dev-server';
@@ -55,8 +56,8 @@ export class AngularV8Webpack extends AngularWebpack {
5556
webpackBuildConfigFactory = webpack4BuildConfigFactory;
5657
webpack: typeof webpack;
5758

58-
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, nodeModulesPaths: string[]) {
59-
super(workspace, webpackMain, compositions, AngularV8Aspect, nodeModulesPaths);
59+
constructor(workspace: Workspace | undefined, webpackMain: WebpackMain, compositions: CompositionsMain, pkg: PkgMain, nodeModulesPaths: string[]) {
60+
super(workspace, webpackMain, compositions, pkg, AngularV8Aspect, nodeModulesPaths);
6061
// resolving to the webpack used by angular devkit to avoid multiple instances of webpack
6162
// otherwise, if we use a different version, it would break
6263
const buildAngular = require.resolve('@angular-devkit/build-angular');
@@ -84,7 +85,7 @@ export class AngularV8Webpack extends AngularWebpack {
8485
workspaceRoot: string,
8586
logger: Logger,
8687
setup: WebpackSetup,
87-
webpackOptions: Partial<WebpackConfigWithDevServer> = {},
88+
webpackOptions: Partial<WebpackConfigWithDevServer | Configuration> = {},
8889
angularOptions: Partial<BrowserBuilderSchema> = {}
8990
): Promise<WebpackConfigWithDevServer | Configuration> {
9091
// Options from angular.json

‎packages/angular-v9/angular-v9.env.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import { EnvDescriptor } from '@teambit/envs';
55
import { ESLintMain } from '@teambit/eslint';
66
import { JestMain } from '@teambit/jest';
77
import { IsolatorMain } from '@teambit/isolator';
8-
import { NgPackagr, NgPackagrMain } from '@teambit/ng-packagr';
8+
import { NgPackagrMain } from '@teambit/ng-packagr';
99
import { WebpackMain } from '@teambit/webpack';
1010
import { Workspace } from '@teambit/workspace';
11-
import { ngPackagr } from 'ng-packagr';
11+
import { PkgMain } from '@teambit/pkg';
1212
import { GeneratorMain } from '@teambit/generator';
1313
import { AngularV9Aspect } from './angular-v9.aspect';
1414
import { AngularV9Webpack } from './angular-v9.webpack';
15-
import { readDefaultTsConfig } from 'ng-packagr/lib/ts/tsconfig';
1615

1716
/**
1817
* a component environment built for [Angular](https://angular.io).
1918
*/
2019
export class AngularV9Env extends AngularEnv {
2120
name = 'Angular-v9';
22-
angularWebpack = new AngularV9Webpack(this.workspace, this.webpackMain, this.compositions, this.nodeModulesPaths);
23-
ngPackagr = ngPackagr() as NgPackagr;
24-
readDefaultTsConfig = readDefaultTsConfig;
21+
angularWebpack = new AngularV9Webpack(this.workspace, this.webpackMain, this.compositions, this.pkg, this.nodeModulesPaths);
22+
ngPackagr = require.resolve('ng-packagr');
23+
readDefaultTsConfig = require.resolve('ng-packagr/lib/ts/tsconfig');
2524

2625
constructor(
2726
jestAspect: JestMain,
@@ -33,6 +32,7 @@ export class AngularV9Env extends AngularEnv {
3332
private webpackMain: WebpackMain,
3433
private workspace: Workspace | undefined,
3534
private compositions: CompositionsMain,
35+
private pkg: PkgMain
3636
) {
3737
super(jestAspect, compiler, eslint, ngPackagrAspect, isolator, workspace, generator);
3838
}

‎packages/angular-v9/angular-v9.main.runtime.ts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class AngularV9Main extends AngularMain {
1414
compositions,
1515
envs,
1616
isolator,
17+
pkg,
1718
]: AngularDeps): Promise<AngularMain> {
1819
const angularV9Env = new AngularV9Env(
1920
jestAspect,
@@ -25,6 +26,7 @@ export class AngularV9Main extends AngularMain {
2526
webpack,
2627
workspace,
2728
compositions,
29+
pkg,
2830
);
2931
return new AngularV9Main(envs, angularV9Env);
3032
}

0 commit comments

Comments
 (0)