Skip to content

Commit 3bfef81

Browse files
committed
feat: support new envs architecture for v12/13/14/15
1 parent 3521b36 commit 3bfef81

File tree

223 files changed

+5251
-3960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+5251
-3960
lines changed

.bitmap

+44-8
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
"mainFile": "index.ts",
2222
"rootDir": "scopes/dev-services/compiler/angular-elements"
2323
},
24-
"dev-services/compiler/angular-elements-loader": {
25-
"scope": "teambit.angular",
26-
"version": "0.0.10",
27-
"mainFile": "index.ts",
28-
"rootDir": "scopes/dev-services/compiler/angular-elements-loader"
29-
},
3024
"dev-services/compiler/ng-multi-compiler": {
3125
"scope": "teambit.angular",
3226
"version": "0.1.25",
@@ -45,12 +39,48 @@
4539
"mainFile": "index.ts",
4640
"rootDir": "scopes/dev-services/compiler/ngcc"
4741
},
42+
"dev-services/compiler/webpack": {
43+
"scope": "",
44+
"version": "",
45+
"mainFile": "index.ts",
46+
"rootDir": "scopes/dev-services/compiler/webpack"
47+
},
4848
"dev-services/linter/angular-eslint-config": {
4949
"scope": "teambit.angular",
5050
"version": "1.0.2",
51-
"mainFile": "index.ts",
51+
"mainFile": "index.js",
5252
"rootDir": "scopes/dev-services/linter/eslint-config"
5353
},
54+
"dev-services/preview/angular-runtime": {
55+
"scope": "",
56+
"version": "",
57+
"mainFile": "index.ts",
58+
"rootDir": "scopes/dev-services/preview/angular-runtime"
59+
},
60+
"dev-services/preview/mounter": {
61+
"scope": "",
62+
"version": "",
63+
"mainFile": "index.ts",
64+
"rootDir": "scopes/dev-services/preview/mounter"
65+
},
66+
"dev-services/preview/preview": {
67+
"scope": "",
68+
"version": "",
69+
"mainFile": "index.ts",
70+
"rootDir": "scopes/dev-services/preview/preview"
71+
},
72+
"generators/angular-starters": {
73+
"scope": "",
74+
"version": "",
75+
"mainFile": "index.ts",
76+
"rootDir": "scopes/generators/angular-starters"
77+
},
78+
"generators/angular-templates": {
79+
"scope": "",
80+
"version": "",
81+
"mainFile": "index.ts",
82+
"rootDir": "scopes/generators/angular-templates"
83+
},
5484
"versions/angular-v10": {
5585
"scope": "teambit.angular",
5686
"version": "1.2.27",
@@ -111,5 +141,11 @@
111141
"mainFile": "index.ts",
112142
"rootDir": "scopes/versions/common/angular-base"
113143
},
144+
"versions/common/angular-common": {
145+
"scope": "",
146+
"version": "",
147+
"mainFile": "index.ts",
148+
"rootDir": "scopes/versions/common/angular-common"
149+
},
114150
"$schema-version": "15.0.0"
115-
}
151+
}

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ module.exports = {
8989
'no-unused-expressions': 'off',
9090
'max-len': [
9191
2,
92-
120,
92+
200,
9393
2,
9494
{
9595
ignoreUrls: true,

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,6 @@ yarn.lock
106106

107107
# cypress
108108
cypress/videos
109+
110+
# other
111+
/scopes/versions/angular-v15/backup/

examples/demo-app/demo-app.ng-app.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { AngularAppOptions, BrowserOptions, DevServerOptions } from '@teambit/angular-apps';
1+
import { AngularAppOptions } from '@teambit/angular-apps';
2+
import { BrowserOptions, DevServerOptions } from '@teambit/angular-common';
23

34
const angularOptions: BrowserOptions & DevServerOptions = {
45
main: './src/main.ts',
56
polyfills: './src/polyfills.ts',
67
index: './src/index.html',
78
tsConfig: 'tsconfig.app.json',
89
assets: ['./src/favicon.ico', './src/assets'],
9-
styles: ['./src/styles.scss'],
10+
styles: ['./src/styles.scss']
1011
};
1112

1213
export const DemoAppOptions: AngularAppOptions = {

examples/demo-lib-v15/src/compositions/cmp1.composition.ts

+4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import { Component } from '@angular/core';
2+
import { BitTestModule } from '../bit-test.module';
23

34
@Component({
45
selector: 'bit-composition',
6+
standalone: true,
7+
imports: [BitTestModule],
58
template: `
69
<p>
710
Composition component 1
11+
<bit-test></bit-test>
812
</p>
913
`,
1014
styles: [

scopes/angular/angular.aspect.ts

-5
This file was deleted.

scopes/angular/angular.bit-env.ts

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { AngularV15Env } from '@teambit/angular-v15';
2+
import { NativeCompileCache } from '@teambit/toolbox.performance.v8-cache';
3+
4+
// Disable v8-caching because it breaks ESM loaders
5+
NativeCompileCache.uninstall();
6+
7+
export class AngularEnv extends AngularV15Env {
8+
name = 'Angular';
9+
packageName = '@teambit/angular';
10+
}
11+
12+
export default new AngularEnv();

scopes/angular/angular.docs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bit create <template-name> <component-name> --env teambit.angular/angular
7272
```
7373

7474
## Angular versions
75-
The Angular env (teambit.angular/angular) uses the latest stable versions of Angular and its dependencies.
75+
The Angular env (teambit.angular/angular) uses the latest stable version of Angular and its dependencies.
7676
Whenever a new major version of Angular is released, a new major version of the Angular env is created.
7777

7878
If you want to use a specific version of Angular, you can use one those env versions instead of `teambit.angular/angular`:

scopes/angular/angular.env.ts

-3
This file was deleted.

scopes/angular/angular.main.runtime.ts

-109
This file was deleted.

scopes/angular/index.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
export type { AngularMain } from './angular.main.runtime';
2-
export { AngularEnv } from './angular.env';
3-
export { AngularAspect, AngularAspect as default } from './angular.aspect';
1+
export { AngularEnv } from './angular.bit-env';

scopes/dev-services/compiler/angular-elements-loader/index.ts

-1
This file was deleted.

0 commit comments

Comments
 (0)