Skip to content

Commit add34a7

Browse files
crisbetocrisbeto
committed
wip
1 parent 0b37d96 commit add34a7

File tree

12 files changed

+76
-108
lines changed

12 files changed

+76
-108
lines changed

‎package-lock.json

Lines changed: 5 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"node": ">= 5.4.1"
2626
},
2727
"dependencies": {
28-
"@angular/animations": "~5.0.0-rc.0",
29-
"@angular/common": "~5.0.0-rc.0",
30-
"@angular/compiler": "~5.0.0-rc.0",
31-
"@angular/core": "~5.0.0-rc.0",
32-
"@angular/forms": "~5.0.0-rc.0",
33-
"@angular/http": "~5.0.0-rc.0",
34-
"@angular/platform-browser": "~5.0.0-rc.0",
28+
"@angular/animations": "~5.0.0-rc.1",
29+
"@angular/common": "~5.0.0-rc.1",
30+
"@angular/compiler": "~5.0.0-rc.1",
31+
"@angular/core": "~5.0.0-rc.1",
32+
"@angular/forms": "~5.0.0-rc.1",
33+
"@angular/http": "~5.0.0-rc.1",
34+
"@angular/platform-browser": "~5.0.0-rc.1",
3535
"core-js": "^2.4.1",
3636
"rxjs": "5.x",
3737
"systemjs": "0.19.43",
@@ -40,11 +40,10 @@
4040
"zone.js": "^0.8.12"
4141
},
4242
"devDependencies": {
43-
"@angular/compiler-cli": "~5.0.0-rc.0",
44-
"@angular/platform-browser-dynamic": "~5.0.0-rc.0",
45-
"@angular/platform-server": "~5.0.0-rc.0",
46-
"@angular/router": "~5.0.0-rc.0",
47-
"@angular/tsc-wrapped": "~5.0.0-beta.7",
43+
"@angular/compiler-cli": "~5.0.0-rc.1",
44+
"@angular/platform-browser-dynamic": "~5.0.0-rc.1",
45+
"@angular/platform-server": "~5.0.0-rc.1",
46+
"@angular/router": "~5.0.0-rc.1",
4847
"@google-cloud/storage": "^1.1.1",
4948
"@types/chalk": "^0.4.31",
5049
"@types/fs-extra": "^3.0.1",

‎src/cdk/table/row.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export class CdkCellOutlet {
141141
* a handle to provide that component's cells and context. After init, the CdkCellOutlet will
142142
* construct the cells with the provided context.
143143
*/
144-
static mostRecentCellOutlet: CdkCellOutlet;
144+
static mostRecentCellOutlet: CdkCellOutlet | null = null;
145145

146146
constructor(public _viewContainer: ViewContainerRef) {
147147
CdkCellOutlet.mostRecentCellOutlet = this;

‎src/cdk/table/table.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,9 @@ export class CdkTable<T> implements CollectionViewer {
286286
.createEmbeddedView(this._headerDef.template, {cells});
287287

288288
cells.forEach(cell => {
289-
CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
289+
if (CdkCellOutlet.mostRecentCellOutlet) {
290+
CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
291+
}
290292
});
291293

292294
this._changeDetectorRef.markForCheck();
@@ -346,7 +348,10 @@ export class CdkTable<T> implements CollectionViewer {
346348
const cells = rowData ? this._getCellTemplatesForRow(row) : [];
347349

348350
cells.forEach(cell => {
349-
CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, context);
351+
if (CdkCellOutlet.mostRecentCellOutlet) {
352+
CdkCellOutlet.mostRecentCellOutlet._viewContainer
353+
.createEmbeddedView(cell.template, context);
354+
}
350355
});
351356

352357
this._changeDetectorRef.markForCheck();

‎src/cdk/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"skipLibCheck": true,
2121
"types": [],
2222
"paths": {
23-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
23+
"@angular/cdk/*": ["../../dist/packages/cdk/*"]
2424
}
2525
},
2626
"files": [

‎src/cdk/tsconfig-es5.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"skipLibCheck": true,
2222
"types": [],
2323
"paths": {
24-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
24+
"@angular/cdk/*": ["../../dist/packages/cdk/*"]
2525
}
2626
},
2727
"files": [

‎src/lib/tsconfig-build.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"types": [],
2121
"baseUrl": ".",
2222
"paths": {
23-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
24-
"@angular/material/*": ["../../dist/packages/material/*/public-api"]
23+
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
24+
"@angular/material/*": ["../../dist/packages/material/*"]
2525
}
2626
},
2727
"files": [

‎src/lib/tsconfig-es5.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"types": [],
2222
"baseUrl": ".",
2323
"paths": {
24-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
25-
"@angular/material/*": ["../../dist/packages/material/*/public-api"]
24+
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
25+
"@angular/material/*": ["../../dist/packages/material/*"]
2626
}
2727
},
2828
"files": [

‎tools/dashboard/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~5.0.0-rc.0",
13+
"@angular/animations": "~5.0.0-rc.1",
1414
"@angular/cdk": "github:angular/cdk-builds",
15-
"@angular/common": "~5.0.0-rc.0",
16-
"@angular/compiler": "~5.0.0-rc.0",
17-
"@angular/core": "~5.0.0-rc.0",
18-
"@angular/forms": "~5.0.0-rc.0",
19-
"@angular/http": "~5.0.0-rc.0",
15+
"@angular/common": "~5.0.0-rc.1",
16+
"@angular/compiler": "~5.0.0-rc.1",
17+
"@angular/core": "~5.0.0-rc.1",
18+
"@angular/forms": "~5.0.0-rc.1",
19+
"@angular/http": "~5.0.0-rc.1",
2020
"@angular/material": "github:angular/material2-builds",
21-
"@angular/platform-browser": "~5.0.0-rc.0",
22-
"@angular/platform-browser-dynamic": "~5.0.0-rc.0",
23-
"@angular/router": "~5.0.0-rc.0",
21+
"@angular/platform-browser": "~5.0.0-rc.1",
22+
"@angular/platform-browser-dynamic": "~5.0.0-rc.1",
23+
"@angular/router": "~5.0.0-rc.1",
2424
"@swimlane/ngx-charts": "^6.0.0",
2525
"angularfire2": "^4.0.0-rc.1",
2626
"core-js": "^2.4.1",
@@ -31,8 +31,8 @@
3131
},
3232
"devDependencies": {
3333
"@angular/cli": "^1.2.0",
34-
"@angular/compiler-cli": "~5.0.0-rc.0",
35-
"@angular/language-service": "~5.0.0-rc.0",
34+
"@angular/compiler-cli": "~5.0.0-rc.1",
35+
"@angular/language-service": "~5.0.0-rc.1",
3636
"@types/jasmine": "2.5.45",
3737
"@types/node": "~6.0.60",
3838
"ts-node": "~3.0.4",

‎tools/package-tools/build-package.ts

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import {join} from 'path';
2-
import {main as ngc} from '@angular/tsc-wrapped';
1+
import {join, resolve as resolvePath} from 'path';
2+
import {spawn} from 'child_process';
3+
import {red} from 'chalk';
34
import {PackageBundler} from './build-bundles';
45
import {buildConfig} from './build-config';
56
import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
@@ -102,12 +103,25 @@ export class BuildPackage {
102103
}
103104

104105
/** Compiles the TypeScript sources of a primary or secondary entry point. */
105-
private async _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
106-
const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
107-
const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
108-
109-
await ngc(entryPointTsconfigPath, {basePath: entryPointPath});
110-
renamePrivateReExportsToBeUnique(this, secondaryEntryPoint);
106+
private _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = ''): Promise<void> {
107+
return new Promise((resolve, reject) => {
108+
const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
109+
const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
110+
const ngcPath = resolvePath('./node_modules/.bin/tsc');
111+
const childProcess = spawn(ngcPath, ['-p', entryPointTsconfigPath], {shell: true});
112+
113+
childProcess.stdout.on('data', (data: any) => console.log(`${data}`));
114+
childProcess.stderr.on('data', (data: any) => console.error(red(`${data}`)));
115+
116+
childProcess.on('exit', (exitCode: number) => {
117+
if (exitCode === 0) {
118+
renamePrivateReExportsToBeUnique(this, secondaryEntryPoint);
119+
resolve();
120+
} else {
121+
reject();
122+
}
123+
});
124+
});
111125
}
112126

113127
/** Stores the secondary entry-points for this package if they haven't been computed already. */

‎tools/package-tools/gulp/build-tasks-gulp.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
5656
// Build all required tests before building.
5757
...dependencyNames.map(pkgName => `${pkgName}:build-no-bundles`),
5858
// Build the ESM output that includes all test files. Also build assets for the package.
59-
[`${taskName}:build:esm:tests`, `${taskName}:assets`],
59+
// [`${taskName}:build:esm:tests`, `${taskName}:assets`],
60+
[`${taskName}:assets`, `${taskName}:build:esm`],
6061
// Inline assets into ESM output.
6162
`${taskName}:assets:inline`
6263
));

‎tools/screenshot-test/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
},
1010
"private": true,
1111
"dependencies": {
12-
"@angular/animations": "~5.0.0-rc.0",
13-
"@angular/common": "~5.0.0-rc.0",
14-
"@angular/compiler": "~5.0.0-rc.0",
15-
"@angular/compiler-cli": "~5.0.0-rc.0",
16-
"@angular/core": "~5.0.0-rc.0",
17-
"@angular/forms": "~5.0.0-rc.0",
18-
"@angular/http": "~5.0.0-rc.0",
12+
"@angular/animations": "~5.0.0-rc.1",
13+
"@angular/common": "~5.0.0-rc.1",
14+
"@angular/compiler": "~5.0.0-rc.1",
15+
"@angular/compiler-cli": "~5.0.0-rc.1",
16+
"@angular/core": "~5.0.0-rc.1",
17+
"@angular/forms": "~5.0.0-rc.1",
18+
"@angular/http": "~5.0.0-rc.1",
1919
"@angular/material": "angular/material2-builds",
20-
"@angular/platform-browser": "~5.0.0-rc.0",
21-
"@angular/platform-browser-dynamic": "~5.0.0-rc.0",
22-
"@angular/router": "~5.0.0-rc.0",
20+
"@angular/platform-browser": "~5.0.0-rc.1",
21+
"@angular/platform-browser-dynamic": "~5.0.0-rc.1",
22+
"@angular/router": "~5.0.0-rc.1",
2323
"core-js": "^2.4.1",
2424
"firebase": "^3.7.6",
2525
"rxjs": "^5.0.1",
@@ -28,7 +28,7 @@
2828
},
2929
"devDependencies": {
3030
"@angular/cli": "^1.0.0",
31-
"@angular/compiler-cli": "~5.0.0-rc.0",
31+
"@angular/compiler-cli": "~5.0.0-rc.1",
3232
"@types/node": "^6.0.42",
3333
"ts-node": "1.2.1",
3434
"typescript": "~2.2.1"

0 commit comments

Comments
 (0)