Skip to content

Commit

Permalink
add support for Angular v13
Browse files Browse the repository at this point in the history
  • Loading branch information
ocombe committed Nov 23, 2021
1 parent 7334dcc commit 1c1e1a8
Show file tree
Hide file tree
Showing 36 changed files with 1,164 additions and 175 deletions.
6 changes: 6 additions & 0 deletions .bitmap
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
"mainFile": "index.ts",
"rootDir": "packages/angular-v12"
},
"angular-v13": {
"scope": "",
"version": "",
"mainFile": "index.ts",
"rootDir": "packages/angular-v13"
},
"angular-v8": {
"scope": "teambit.angular",
"version": "0.0.22",
Expand Down
75 changes: 74 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,65 @@ env:
BIT_TOKEN: ${{ secrets.BIT_TOKEN }}

jobs:
# Test angular-v12
# Test angular-v13
v13:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip-ci')"
container:
image: docker://bitcli/bit:latest
steps:
- uses: teambit/setup-action@v1
with:
name: angular-github-actions
BIT_TOKEN: ${{ env.BIT_TOKEN }}

- uses: actions/checkout@v2

- name: Remove v12
run: bit remove angular-v12 -s -f --log

- name: Remove v11
run: bit remove angular-v11 -s -f --log

- name: Remove v10
run: bit remove angular-v10 -s -f --log

- name: Remove v9
run: bit remove angular-v9 -s -f --log

- name: Remove v8
run: bit remove angular-v8 -s -f --log

- name: Add example app
run: bit add examples/demo-lib-v13 --log

- name: Install dependencies
run: bit install --log

# Compile the aspects
- name: Bit compile aspects
run: bit compile ng-packagr angular-eslint-config angular angular-v13 --log

# Run bit link to regenerate the package.json of the example component
- name: Bit link
run: bit link --log

# Compile the example component
- name: Bit compile example
run: bit compile demo-lib-v13 --log

- name: Bit test
run: bit test --log

- name: Bit build
run: bit build --log

- uses: actions/upload-artifact@v2
with:
name: debug-log
path: $HOME/Library/Caches/Bit/logs

# Test angular-v12
v12:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip-ci')"
Expand All @@ -31,6 +89,9 @@ jobs:

- uses: actions/checkout@v2

- name: Remove v13
run: bit remove angular-v13 -s -f --log

- name: Remove v11
run: bit remove angular-v11 -s -f --log

Expand Down Expand Up @@ -86,6 +147,9 @@ jobs:

- uses: actions/checkout@v2

- name: Remove v13
run: bit remove angular-v13 -s -f --log

- name: Remove v12
run: bit remove angular-v12 -s -f

Expand Down Expand Up @@ -141,6 +205,9 @@ jobs:

- uses: actions/checkout@v2

- name: Remove v13
run: bit remove angular-v13 -s -f --log

- name: Remove v12
run: bit remove angular-v12 -s -f

Expand Down Expand Up @@ -196,6 +263,9 @@ jobs:

- uses: actions/checkout@v2

- name: Remove v13
run: bit remove angular-v13 -s -f --log

- name: Remove v12
run: bit remove angular-v12 -s -f

Expand Down Expand Up @@ -251,6 +321,9 @@ jobs:

- uses: actions/checkout@v2

- name: Remove v13
run: bit remove angular-v13 -s -f --log

- name: Remove v12
run: bit remove angular-v12 -s -f

Expand Down
6 changes: 6 additions & 0 deletions examples/demo-lib-v13/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* Entry point for this Angular library, do not move or rename this file.
*/
export * from './src/bit-test.component';
export * from './src/bit-test2.component';
export * from './src/bit-test.module';
13 changes: 13 additions & 0 deletions examples/demo-lib-v13/src/bit-test.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Component } from "@angular/core";
import { BitTestService } from './bit-test.service';

@Component({
selector: 'bit-test',
template: `
<p>bit-test component works!</p>
<small>{{ service.content }}</small>
`
})
export class BitTestComponent {
constructor(public service: BitTestService) {}
}
27 changes: 27 additions & 0 deletions examples/demo-lib-v13/src/bit-test.docs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
labels: ['angular', 'typescript', 'bit-test']
description: 'A `bit-test` component.'
---

# Bit test documentation
Import `BitTestModule` :

```typescript
import { BitTestModule } from './bit-test.module';

// add it to your module imports
@NgModule({
// ...
imports: [
BitTestModule
]
// ...
})
export class AppModule {}
```

Use `BitTestComponent` in your templates :

```html
<bit-test></bit-test>
```
15 changes: 15 additions & 0 deletions examples/demo-lib-v13/src/bit-test.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { NgModule } from '@angular/core';
import { BitTestComponent } from './bit-test.component';
import { BitTest2Component } from './bit-test2.component';

@NgModule({
declarations: [
BitTestComponent,
BitTest2Component
],
exports: [
BitTestComponent,
BitTest2Component
]
})
export class BitTestModule {}
8 changes: 8 additions & 0 deletions examples/demo-lib-v13/src/bit-test.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Injectable } from '@angular/core';

@Injectable({ providedIn: 'any' })
export class BitTestService {
get content() {
return 'Content from service';
}
}
30 changes: 30 additions & 0 deletions examples/demo-lib-v13/src/bit-test.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { BitTestComponent } from './bit-test.component';

describe('BitTestComponent', () => {
let component: BitTestComponent;
let fixture: ComponentFixture<BitTestComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ BitTestComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(BitTestComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});

it('should have a service', () => {
expect(component.service).toBeDefined();
expect(component.service.content).toEqual('Content from service');
})
});
11 changes: 11 additions & 0 deletions examples/demo-lib-v13/src/bit-test2.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Component } from '@angular/core';

@Component({
selector: 'bit-test2',
template: `
<p>
bit-test 2 works as well!
</p>
`
})
export class BitTest2Component {}
16 changes: 16 additions & 0 deletions examples/demo-lib-v13/src/compositions/bit-test.composition.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Component, NgModule } from '@angular/core';
import { BitTestModule } from '../bit-test.module';

@Component({
selector: 'composition-cmp',
template: `Composition: <bit-test></bit-test>`
})
class CompositionComponent {}

@NgModule({
declarations: [CompositionComponent],
imports: [BitTestModule],
bootstrap: [CompositionComponent]
})
export class CompositionModule {
}
14 changes: 14 additions & 0 deletions examples/demo-lib-v13/src/compositions/cmp1.composition.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Component } from '@angular/core';

@Component({
selector: 'bit-composition',
template: `
<p>
Composition component 1
</p>
`,
styles: [
]
})
export class StandaloneCompositionComponent {
}
3 changes: 3 additions & 0 deletions packages/angular-v10/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
"@types/react-dev-utils": "~9.0.8",
"@types/remark-prism": "~1.3.0",
"@types/webpack-dev-server": "~3.11.2",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsdoc": "^35.5.1",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint": "7.26.0",
"html-loader": "~1.3.2",
"jest": "~27.0.4",
"jest-preset-angular": "~10.0.1",
Expand Down
3 changes: 3 additions & 0 deletions packages/angular-v11/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"@types/react-dev-utils": "~9.0.8",
"@types/remark-prism": "~1.3.0",
"@types/webpack-dev-server": "~3.11.2",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"eslint": "7.26.0",
"html-loader": "~1.3.2",
"jest": "~27.0.4",
"jest-preset-angular": "~10.0.1",
Expand Down
3 changes: 3 additions & 0 deletions packages/angular-v12/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"@types/react-dev-utils": "~9.0.8",
"@types/remark-prism": "~1.3.0",
"@types/webpack-dev-server": "4.3.1",
"@typescript-eslint/eslint-plugin": "^4.26.0",
"@typescript-eslint/parser": "^4.26.0",
"eslint": "7.26.0",
"html-loader": "~2.1.2",
"jest": "~27.0.4",
"jest-preset-angular": "~10.0.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/angular-v13/angular-v13.aspect.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Aspect } from '@teambit/harmony';

export const AngularV13Aspect = Aspect.create({
id: 'teambit.angular/angular-v13',
});
6 changes: 6 additions & 0 deletions packages/angular-v13/angular-v13.docs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
description: A Bit development environment for Angular Components
labels: ['angular', 'environment', 'env', 'aspect', 'extension']
---

Adds Angular v13 support to your Bit workspace.
Loading

0 comments on commit 1c1e1a8

Please sign in to comment.