skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(release): update versions for RC.6 (#1149)

Browse Source
This commit is contained in:
Kara
2016-09-01 10:14:38 -07:00
committed by GitHub
parent aaf41bdbac
commit 4f2bc66904
13 changed files with 92 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+12 -12
View File
@@ -23,22 +23,22 @@
"node": ">= 4.2.1 < 5"
},
"dependencies": {
"@angular/common": "2.0.0-rc.5",
"@angular/compiler": "2.0.0-rc.5",
"@angular/core": "2.0.0-rc.5",
"@angular/forms": "0.3.0",
"@angular/http": "2.0.0-rc.5",
"@angular/platform-browser": "2.0.0-rc.5",
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
"@angular/router": "3.0.0-rc.1",
"core-js": "^2.4.0",
"@angular/common": "2.0.0-rc.6",
"@angular/compiler": "2.0.0-rc.6",
"@angular/core": "2.0.0-rc.6",
"@angular/forms": "2.0.0-rc.6",
"@angular/http": "2.0.0-rc.6",
"@angular/platform-browser": "2.0.0-rc.6",
"@angular/platform-browser-dynamic": "2.0.0-rc.6",
"@angular/router": "3.0.0-rc.2",
"core-js": "^2.4.1",
"hammerjs": "^2.0.8",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.11",
"systemjs": "0.19.31",
"zone.js": "0.6.12"
"zone.js": "0.6.17"
},
"devDependencies": {
"@angular/compiler-cli": "^0.4.1",
"@angular/compiler-cli": "0.6.0",
"@types/glob": "^5.0.29",
"@types/gulp": "^3.8.29",
"@types/hammerjs": "^2.0.30",
src/demo-app/system-config.ts
+16 -10
View File
@@ -50,17 +50,23 @@ components.forEach(name => {
/***********************************************************************************************
* Everything underneath this line is managed by the CLI.
**********************************************************************************************/
const barrels: string[] = [
const angularPackages = {
// Angular specific barrels.
'@angular/core',
'@angular/common',
'@angular/compiler',
'@angular/http',
'@angular/forms',
'@angular/router',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',
'@angular/core': { main: 'bundles/core.umd.js'},
'@angular/core/testing': { main: 'bundles/core-testing.umd.js'},
'@angular/common': { main: 'bundles/common.umd.js'},
'@angular/compiler': { main: 'bundles/compiler.umd.js'},
'@angular/http': { main: 'bundles/http.umd.js'},
'@angular/forms': { main: 'bundles/forms.umd.js'},
'@angular/router': { main: 'bundles/router.umd.js'},
'@angular/platform-browser': { main: 'bundles/platform-browser.umd.js'},
'@angular/platform-browser-dynamic': { main: 'bundles/platform-browser-dynamic.umd.js'},
'@angular/platform-browser-dynamic/testing': {
main: 'bundles/platform-browser-dynamic-testing.umd.js'
},
};
const barrels: string[] = [
// Thirdparty barrels.
'rxjs',
@@ -75,7 +81,7 @@ const barrels: string[] = [
/** @cli-barrel */
];
const _cliSystemConfig = {};
const _cliSystemConfig = angularPackages;
barrels.forEach((barrelName: string) => {
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
});
src/e2e-app/system-config.ts
+16 -10
View File
@@ -50,17 +50,23 @@ components.forEach(name => {
/***********************************************************************************************
* Everything underneath this line is managed by the CLI.
**********************************************************************************************/
const barrels: string[] = [
const angularPackages = {
// Angular specific barrels.
'@angular/core',
'@angular/common',
'@angular/compiler',
'@angular/http',
'@angular/forms',
'@angular/router',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',
'@angular/core': { main: 'bundles/core.umd.js'},
'@angular/core/testing': { main: 'bundles/core-testing.umd.js'},
'@angular/common': { main: 'bundles/common.umd.js'},
'@angular/compiler': { main: 'bundles/compiler.umd.js'},
'@angular/http': { main: 'bundles/http.umd.js'},
'@angular/forms': { main: 'bundles/forms.umd.js'},
'@angular/router': { main: 'bundles/router.umd.js'},
'@angular/platform-browser': { main: 'bundles/platform-browser.umd.js'},
'@angular/platform-browser-dynamic': { main: 'bundles/platform-browser-dynamic.umd.js'},
'@angular/platform-browser-dynamic/testing': {
main: 'bundles/platform-browser-dynamic-testing.umd.js'
},
};
const barrels: string[] = [
// Thirdparty barrels.
'rxjs',
@@ -75,7 +81,7 @@ const barrels: string[] = [
/** @cli-barrel */
];
const _cliSystemConfig = {};
const _cliSystemConfig = angularPackages;
barrels.forEach((barrelName: string) => {
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
});
src/lib/button-toggle/package.json
+1 -1
View File
@@ -24,6 +24,6 @@
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular2-material/core": "2.0.0-alpha.7-12",
"@angular/forms": "^0.3.0"
"@angular/forms": "2.0.0-rc.6"
}
}
src/lib/checkbox/package.json
+1 -1
View File
@@ -22,6 +22,6 @@
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular2-material/core": "2.0.0-alpha.7-12",
"@angular/forms": "^0.3.0"
"@angular/forms": "2.0.0-rc.6"
}
}
src/lib/core/package.json
+2 -2
View File
@@ -20,7 +20,7 @@
},
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular/core": "^2.0.0-rc.5",
"@angular/common": "^2.0.0-rc.5"
"@angular/core": "^2.0.0-rc.6",
"@angular/common": "^2.0.0-rc.6"
}
}
src/lib/icon/package.json
+1 -1
View File
@@ -21,7 +21,7 @@
},
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular/http": "2.0.0-rc.5",
"@angular/http": "2.0.0-rc.6",
"@angular2-material/core": "2.0.0-alpha.7-12"
}
}
src/lib/input/input.spec.ts
+6 -2
View File
@@ -363,7 +363,9 @@ describe('MdInput', function () {
fixture.componentInstance.disabled = true;
fixture.detectChanges();
expect(el.getAttribute('disabled')).toEqual('');
fixture.whenStable().then(() => {
expect(el.getAttribute('disabled')).toEqual('');
});
});
it('supports the disabled attribute as an unbound attribute', () => {
@@ -373,7 +375,9 @@ describe('MdInput', function () {
let el: HTMLInputElement = fixture.debugElement.query(By.css('input')).nativeElement;
expect(el).not.toBeNull();
expect(el.getAttribute('disabled')).toEqual('');
fixture.whenStable().then(() => {
expect(el.getAttribute('disabled')).toEqual('');
});
});
it('supports the list attribute', () => {
src/lib/input/package.json
+1 -1
View File
@@ -24,6 +24,6 @@
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular2-material/core": "2.0.0-alpha.7-12",
"@angular/forms": "^0.3.0"
"@angular/forms": "2.0.0-rc.6"
}
}
src/lib/radio/package.json
+1 -1
View File
@@ -22,6 +22,6 @@
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular2-material/core": "2.0.0-alpha.7-12",
"@angular/forms": "^0.3.0"
"@angular/forms": "2.0.0-rc.6"
}
}
src/lib/slide-toggle/package.json
+1 -1
View File
@@ -24,6 +24,6 @@
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular2-material/core": "2.0.0-alpha.7-12",
"@angular/forms": "^0.3.0"
"@angular/forms": "2.0.0-rc.6"
}
}
src/lib/system-config.ts
+30 -13
View File
@@ -1,5 +1,5 @@
/***********************************************************************************************
* SystemJS Configuration used for the unittests.
* User Configuration.
**********************************************************************************************/
const components = [
@@ -38,7 +38,6 @@ const packages: any = {
defaultExtension: 'js'
}
};
components.forEach(name => {
packages[`@angular2-material/${name}`] = {
format: 'cjs',
@@ -51,24 +50,41 @@ components.forEach(name => {
/***********************************************************************************************
* Everything underneath this line is managed by the CLI.
**********************************************************************************************/
const barrels: string[] = [
const angularPackages = {
// Angular specific barrels.
'@angular/core',
'@angular/common',
'@angular/compiler',
'@angular/http',
'@angular/forms',
'@angular/router',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',
'@angular/core': { main: 'bundles/core.umd.js'},
'@angular/core/testing': { main: '../bundles/core-testing.umd.js'},
'@angular/common': { main: 'bundles/common.umd.js'},
'@angular/compiler': { main: 'bundles/compiler.umd.js'},
'@angular/compiler/testing': { main: '../bundles/compiler-testing.umd.js'},
'@angular/http': { main: 'bundles/http.umd.js'},
'@angular/http/testing': { main: '../bundles/http-testing.umd.js'},
'@angular/forms': { main: 'bundles/forms.umd.js'},
'@angular/router': { main: 'bundles/router.umd.js'},
'@angular/platform-browser': { main: 'bundles/platform-browser.umd.js'},
'@angular/platform-browser/testing': { main: '../bundles/platform-browser-testing.umd.js'},
'@angular/platform-browser-dynamic': { main: 'bundles/platform-browser-dynamic.umd.js'},
'@angular/platform-browser-dynamic/testing': {
main: '../bundles/platform-browser-dynamic-testing.umd.js'
},
};
const barrels: string[] = [
// Thirdparty barrels.
'rxjs',
// App specific barrels.
'demo-app',
'button-toggle',
'gestures',
'live-announcer',
'portal',
'overlay',
...components
/** @cli-barrel */
];
const _cliSystemConfig = {};
const _cliSystemConfig = angularPackages;
barrels.forEach((barrelName: string) => {
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
});
@@ -80,7 +96,8 @@ declare var System: any;
System.config({
map: {
'@angular': 'vendor/@angular',
'rxjs': 'vendor/rxjs'
'rxjs': 'vendor/rxjs',
'main': 'main.js'
},
packages: _cliSystemConfig
});
test/karma.config.ts
+4 -2
View File
@@ -20,10 +20,12 @@ export function config(config) {
],
files: [
{pattern: 'dist/vendor/core-js/client/core.js', included: true, watched: false},
{pattern: 'dist/vendor/hammerjs/hammer.min.js', included: true, watched: false},
{pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false},
{pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false},
{pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false},
{pattern: 'dist/vendor/zone.js/dist/proxy.js', included: true, watched: false},
{pattern: 'dist/vendor/zone.js/dist/sync-test.js', included: true, watched: false},
{pattern: 'dist/vendor/zone.js/dist/jasmine-patch.js', included: true, watched: false},
{pattern: 'dist/vendor/zone.js/dist/async-test.js', included: true, watched: false},
{pattern: 'dist/vendor/zone.js/dist/fake-async-test.js', included: true, watched: false},
{pattern: 'dist/vendor/hammerjs/hammer.min.js', included: true, watched: false},
@@ -43,7 +45,7 @@ export function config(config) {
{pattern: 'dist/**/*.js.map', included: false, watched: false}
],
proxies: {
// required for component assests fetched by Angular's compiler
// required for component assets fetched by Angular's compiler
'/components/': '/base/dist/components/',
'/core/': '/base/dist/core/',
},