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
}

‎src/lib/slide-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/system-config.ts

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***********************************************************************************************
2-
* SystemJS Configuration used for the unittests.
2+
* User Configuration.
33
**********************************************************************************************/
44

55
const components = [
@@ -38,7 +38,6 @@ const packages: any = {
3838
defaultExtension: 'js'
3939
}
4040
};
41-
4241
components.forEach(name => {
4342
packages[`@angular2-material/${name}`] = {
4443
format: 'cjs',
@@ -51,24 +50,41 @@ components.forEach(name => {
5150
/***********************************************************************************************
5251
* Everything underneath this line is managed by the CLI.
5352
**********************************************************************************************/
54-
const barrels: string[] = [
53+
const angularPackages = {
5554
// Angular specific barrels.
56-
'@angular/core',
57-
'@angular/common',
58-
'@angular/compiler',
59-
'@angular/http',
60-
'@angular/forms',
61-
'@angular/router',
62-
'@angular/platform-browser',
63-
'@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/compiler/testing': { main: '../bundles/compiler-testing.umd.js'},
60+
'@angular/http': { main: 'bundles/http.umd.js'},
61+
'@angular/http/testing': { main: '../bundles/http-testing.umd.js'},
62+
'@angular/forms': { main: 'bundles/forms.umd.js'},
63+
'@angular/router': { main: 'bundles/router.umd.js'},
64+
'@angular/platform-browser': { main: 'bundles/platform-browser.umd.js'},
65+
'@angular/platform-browser/testing': { main: '../bundles/platform-browser-testing.umd.js'},
66+
'@angular/platform-browser-dynamic': { main: 'bundles/platform-browser-dynamic.umd.js'},
67+
'@angular/platform-browser-dynamic/testing': {
68+
main: '../bundles/platform-browser-dynamic-testing.umd.js'
69+
},
70+
};
6471

72+
const barrels: string[] = [
6573
// Thirdparty barrels.
6674
'rxjs',
6775

76+
// App specific barrels.
77+
'demo-app',
78+
'button-toggle',
79+
'gestures',
80+
'live-announcer',
81+
'portal',
82+
'overlay',
6883
...components
84+
/** @cli-barrel */
6985
];
7086

71-
const _cliSystemConfig = {};
87+
const _cliSystemConfig = angularPackages;
7288
barrels.forEach((barrelName: string) => {
7389
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
7490
});
@@ -80,7 +96,8 @@ declare var System: any;
8096
System.config({
8197
map: {
8298
'@angular': 'vendor/@angular',
83-
'rxjs': 'vendor/rxjs'
99+
'rxjs': 'vendor/rxjs',
100+
'main': 'main.js'
84101
},
85102
packages: _cliSystemConfig
86103
});

‎test/karma.config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ export function config(config) {
2020
],
2121
files: [
2222
{pattern: 'dist/vendor/core-js/client/core.js', included: true, watched: false},
23-
{pattern: 'dist/vendor/hammerjs/hammer.min.js', included: true, watched: false},
2423
{pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false},
2524
{pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false},
2625
{pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false},
26+
{pattern: 'dist/vendor/zone.js/dist/proxy.js', included: true, watched: false},
27+
{pattern: 'dist/vendor/zone.js/dist/sync-test.js', included: true, watched: false},
28+
{pattern: 'dist/vendor/zone.js/dist/jasmine-patch.js', included: true, watched: false},
2729
{pattern: 'dist/vendor/zone.js/dist/async-test.js', included: true, watched: false},
2830
{pattern: 'dist/vendor/zone.js/dist/fake-async-test.js', included: true, watched: false},
2931
{pattern: 'dist/vendor/hammerjs/hammer.min.js', included: true, watched: false},
@@ -43,7 +45,7 @@ export function config(config) {
4345
{pattern: 'dist/**/*.js.map', included: false, watched: false}
4446
],
4547
proxies: {
46-
// required for component assests fetched by Angular's compiler
48+
// required for component assets fetched by Angular's compiler
4749
'/components/': '/base/dist/components/',
4850
'/core/': '/base/dist/core/',
4951
},

0 commit comments

Comments
 (0)