Skip to content

Commit 4f2bc66

Browse files
karakara
authored
chore(release): update versions for RC.6 (#1149)
1 parent aaf41bd commit 4f2bc66

File tree

13 files changed

+92
-57
lines changed

13 files changed

+92
-57
lines changed

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
"node": ">= 4.2.1 < 5"
2424
},
2525
"dependencies": {
26-
"@angular/common": "2.0.0-rc.5",
27-
"@angular/compiler": "2.0.0-rc.5",
28-
"@angular/core": "2.0.0-rc.5",
29-
"@angular/forms": "0.3.0",
30-
"@angular/http": "2.0.0-rc.5",
31-
"@angular/platform-browser": "2.0.0-rc.5",
32-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
33-
"@angular/router": "3.0.0-rc.1",
34-
"core-js": "^2.4.0",
26+
"@angular/common": "2.0.0-rc.6",
27+
"@angular/compiler": "2.0.0-rc.6",
28+
"@angular/core": "2.0.0-rc.6",
29+
"@angular/forms": "2.0.0-rc.6",
30+
"@angular/http": "2.0.0-rc.6",
31+
"@angular/platform-browser": "2.0.0-rc.6",
32+
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
33+
"@angular/router": "3.0.0-rc.2",
34+
"core-js": "^2.4.1",
3535
"hammerjs": "^2.0.8",
36-
"rxjs": "5.0.0-beta.6",
36+
"rxjs": "5.0.0-beta.11",
3737
"systemjs": "0.19.31",
38-
"zone.js": "0.6.12"
38+
"zone.js": "0.6.17"
3939
},
4040
"devDependencies": {
41-
"@angular/compiler-cli": "^0.4.1",
41+
"@angular/compiler-cli": "0.6.0",
4242
"@types/glob": "^5.0.29",
4343
"@types/gulp": "^3.8.29",
4444
"@types/hammerjs": "^2.0.30",

‎src/demo-app/system-config.ts‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,23 @@ components.forEach(name => {
5050
/***********************************************************************************************
5151
* Everything underneath this line is managed by the CLI.
5252
**********************************************************************************************/
53-
const barrels: string[] = [
53+
const angularPackages = {
5454
// Angular specific barrels.
55-
'@angular/core',
56-
'@angular/common',
57-
'@angular/compiler',
58-
'@angular/http',
59-
'@angular/forms',
60-
'@angular/router',
61-
'@angular/platform-browser',
62-
'@angular/platform-browser-dynamic',
55+
'@angular/core': { main: 'bundles/core.umd.js'},
56+
'@angular/core/testing': { main: 'bundles/core-testing.umd.js'},
57+
'@angular/common': { main: 'bundles/common.umd.js'},
58+
'@angular/compiler': { main: 'bundles/compiler.umd.js'},
59+
'@angular/http': { main: 'bundles/http.umd.js'},
60+
'@angular/forms': { main: 'bundles/forms.umd.js'},
61+
'@angular/router': { main: 'bundles/router.umd.js'},
62+
'@angular/platform-browser': { main: 'bundles/platform-browser.umd.js'},
63+
'@angular/platform-browser-dynamic': { main: 'bundles/platform-browser-dynamic.umd.js'},
64+
'@angular/platform-browser-dynamic/testing': {
65+
main: 'bundles/platform-browser-dynamic-testing.umd.js'
66+
},
67+
};
6368

69+
const barrels: string[] = [
6470
// Thirdparty barrels.
6571
'rxjs',
6672

@@ -75,7 +81,7 @@ const barrels: string[] = [
7581
/** @cli-barrel */
7682
];
7783

78-
const _cliSystemConfig = {};
84+
const _cliSystemConfig = angularPackages;
7985
barrels.forEach((barrelName: string) => {
8086
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
8187
});

‎src/e2e-app/system-config.ts‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,23 @@ components.forEach(name => {
5050
/***********************************************************************************************
5151
* Everything underneath this line is managed by the CLI.
5252
**********************************************************************************************/
53-
const barrels: string[] = [
53+
const angularPackages = {
5454
// Angular specific barrels.
55-
'@angular/core',
56-
'@angular/common',
57-
'@angular/compiler',
58-
'@angular/http',
59-
'@angular/forms',
60-
'@angular/router',
61-
'@angular/platform-browser',
62-
'@angular/platform-browser-dynamic',
55+
'@angular/core': { main: 'bundles/core.umd.js'},
56+
'@angular/core/testing': { main: 'bundles/core-testing.umd.js'},
57+
'@angular/common': { main: 'bundles/common.umd.js'},
58+
'@angular/compiler': { main: 'bundles/compiler.umd.js'},
59+
'@angular/http': { main: 'bundles/http.umd.js'},
60+
'@angular/forms': { main: 'bundles/forms.umd.js'},
61+
'@angular/router': { main: 'bundles/router.umd.js'},
62+
'@angular/platform-browser': { main: 'bundles/platform-browser.umd.js'},
63+
'@angular/platform-browser-dynamic': { main: 'bundles/platform-browser-dynamic.umd.js'},
64+
'@angular/platform-browser-dynamic/testing': {
65+
main: 'bundles/platform-browser-dynamic-testing.umd.js'
66+
},
67+
};
6368

69+
const barrels: string[] = [
6470
// Thirdparty barrels.
6571
'rxjs',
6672

@@ -75,7 +81,7 @@ const barrels: string[] = [
7581
/** @cli-barrel */
7682
];
7783

78-
const _cliSystemConfig = {};
84+
const _cliSystemConfig = angularPackages;
7985
barrels.forEach((barrelName: string) => {
8086
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
8187
});

‎src/lib/button-toggle/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"homepage": "https://github.com/angular/material2#readme",
2525
"peerDependencies": {
2626
"@angular2-material/core": "2.0.0-alpha.7-12",
27-
"@angular/forms": "^0.3.0"
27+
"@angular/forms": "2.0.0-rc.6"
2828
}
2929
}

‎src/lib/checkbox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"peerDependencies": {
2424
"@angular2-material/core": "2.0.0-alpha.7-12",
25-
"@angular/forms": "^0.3.0"
25+
"@angular/forms": "2.0.0-rc.6"
2626
}
2727
}

‎src/lib/core/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"homepage": "https://github.com/angular/material2#readme",
2222
"peerDependencies": {
23-
"@angular/core": "^2.0.0-rc.5",
24-
"@angular/common": "^2.0.0-rc.5"
23+
"@angular/core": "^2.0.0-rc.6",
24+
"@angular/common": "^2.0.0-rc.6"
2525
}
2626
}

‎src/lib/icon/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"peerDependencies": {
24-
"@angular/http": "2.0.0-rc.5",
24+
"@angular/http": "2.0.0-rc.6",
2525
"@angular2-material/core": "2.0.0-alpha.7-12"
2626
}
2727
}

‎src/lib/input/input.spec.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,9 @@ describe('MdInput', function () {
363363

364364
fixture.componentInstance.disabled = true;
365365
fixture.detectChanges();
366-
expect(el.getAttribute('disabled')).toEqual('');
366+
fixture.whenStable().then(() => {
367+
expect(el.getAttribute('disabled')).toEqual('');
368+
});
367369
});
368370

369371
it('supports the disabled attribute as an unbound attribute', () => {
@@ -373,7 +375,9 @@ describe('MdInput', function () {
373375
let el: HTMLInputElement = fixture.debugElement.query(By.css('input')).nativeElement;
374376

375377
expect(el).not.toBeNull();
376-
expect(el.getAttribute('disabled')).toEqual('');
378+
fixture.whenStable().then(() => {
379+
expect(el.getAttribute('disabled')).toEqual('');
380+
});
377381
});
378382

379383
it('supports the list attribute', () => {

‎src/lib/input/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"homepage": "https://github.com/angular/material2#readme",
2525
"peerDependencies": {
2626
"@angular2-material/core": "2.0.0-alpha.7-12",
27-
"@angular/forms": "^0.3.0"
27+
"@angular/forms": "2.0.0-rc.6"
2828
}
2929
}

‎src/lib/radio/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"peerDependencies": {
2424
"@angular2-material/core": "2.0.0-alpha.7-12",
25-
"@angular/forms": "^0.3.0"
25+
"@angular/forms": "2.0.0-rc.6"
2626
}
2727
}

0 commit comments

Comments
 (0)