Skip to content

Commit 3e4b0a6

Browse files
authored
refactor: support resolving ngcc from pre-v13 package format (#1524)
Because workspaces can have mixed versions of Angular apps, we need to support resolving ngcc using the package format in the v13+ releases (APF) as well as the package format pre-v13.
1 parent 0428c31 commit 3e4b0a6

File tree

11 files changed

+792
-11
lines changed

11 files changed

+792
-11
lines changed

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
- node/install-packages:
1313
app-dir: integration/project
1414
pkg-manager: yarn
15+
- node/install-packages:
16+
app-dir: integration/pre_apf_project
17+
pkg-manager: yarn
1518
- node/install-packages:
1619
app-dir: integration/workspace
1720
pkg-manager: yarn
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import {Component, EventEmitter, Input, Output} from '@angular/core';
2+
3+
@Component({
4+
selector: 'my-app',
5+
template: `<h1>Hello {{name}}</h1>`,
6+
})
7+
export class AppComponent {
8+
name = 'Angular';
9+
@Input() appInput = '';
10+
@Output() appOutput = new EventEmitter<string>();
11+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import {CommonModule} from '@angular/common';
2+
import {NgModule} from '@angular/core';
3+
import {AppComponent} from './app.component';
4+
import {FooComponent} from './foo.component';
5+
6+
@NgModule({
7+
imports: [
8+
CommonModule,
9+
],
10+
declarations: [
11+
AppComponent,
12+
FooComponent,
13+
],
14+
bootstrap: [AppComponent]
15+
})
16+
export class AppModule {
17+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{{title | uppercase}}
2+
<span class="subtitle">
3+
subtitle
4+
</span>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import {Component} from '@angular/core';
2+
3+
@Component({
4+
templateUrl: 'foo.component.html',
5+
})
6+
export class FooComponent {
7+
title = 'Foo Component';
8+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "angular-ls-integration-test-project",
3+
"private": true,
4+
"dependencies": {
5+
"@angular/common": "12.2.10",
6+
"@angular/compiler": "12.2.10",
7+
"@angular/compiler-cli": "12.2.10",
8+
"@angular/core": "12.2.10",
9+
"rxjs": "6.6.7",
10+
"zone.js": "0.11.4"
11+
}
12+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"compilerOptions": {
3+
"moduleResolution": "node",
4+
"experimentalDecorators": true,
5+
"target": "es2015",
6+
"strict": true,
7+
"typeRoots": [
8+
"node_modules/@types"
9+
]
10+
},
11+
"angularCompilerOptions": {
12+
"strictTemplates": true,
13+
"strictInjectionParameters": true
14+
}
15+
}

0 commit comments

Comments
 (0)