mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
chore(angular): update to angular 2.0.0-rc.1
This commit is contained in:
@@ -42,12 +42,43 @@
|
||||
<script>
|
||||
System.config({
|
||||
map: {
|
||||
'angular2': '/angular2',
|
||||
'@angular': '/node_modules/@angular',
|
||||
'ionic-angular': '/ionic'
|
||||
},
|
||||
packages: {
|
||||
'ionic-angular': {
|
||||
main: 'index'
|
||||
},
|
||||
'@angular/core': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'@angular/compiler': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'@angular/common': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'@angular/http': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'@angular/platform-browser': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'@angular/platform-browser-dynamic': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'@angular/router': {
|
||||
main: 'index.js',
|
||||
defaultExtension: 'js'
|
||||
},
|
||||
'rxjs': {
|
||||
defaultExtension: 'js'
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -4,24 +4,21 @@ module.exports = {
|
||||
'ionic/ionic': {
|
||||
commonjs2: 'ionic/ionic'
|
||||
},
|
||||
'angular2/core': {
|
||||
'@angular/core': {
|
||||
commonjs2: ['angular2', 'core']
|
||||
},
|
||||
'angular2/common': {
|
||||
'@angular/common': {
|
||||
commonjs2: ['angular2', 'common']
|
||||
},
|
||||
'angular2/router' : {
|
||||
'@angular/router' : {
|
||||
commonjs2: ['angular2', 'router']
|
||||
},
|
||||
'angular2/http': {
|
||||
'@angular/http': {
|
||||
commonjs2: ['angular2', 'http']
|
||||
},
|
||||
'angular2/platform/browser': {
|
||||
'@angular/platform-browser-dynamic': {
|
||||
commonjs2: ['angular2', 'platform', 'browser']
|
||||
},
|
||||
'angular2/instrumentation': {
|
||||
commonjs2: ['angular2', 'instrumentation']
|
||||
},
|
||||
}
|
||||
],
|
||||
module: {
|
||||
|
||||
@@ -9,24 +9,21 @@ module.exports = {
|
||||
},
|
||||
externals: [
|
||||
{
|
||||
'angular2/core': {
|
||||
'@angular/core': {
|
||||
commonjs2: ['angular2', 'core']
|
||||
},
|
||||
'angular2/common': {
|
||||
'@angular/common': {
|
||||
commonjs2: ['angular2', 'common']
|
||||
},
|
||||
'angular2/router' : {
|
||||
'@angular/router' : {
|
||||
commonjs2: ['angular2', 'router']
|
||||
},
|
||||
'angular2/http': {
|
||||
'@angular/http': {
|
||||
commonjs2: ['angular2', 'http']
|
||||
},
|
||||
'angular2/platform/browser': {
|
||||
'@angular/platform-browser': {
|
||||
commonjs2: ['angular2', 'platform', 'browser']
|
||||
},
|
||||
'angular2/instrumentation': {
|
||||
commonjs2: ['angular2', 'instrumentation']
|
||||
},
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
@@ -16,6 +16,12 @@
|
||||
"q": "1.4.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"angular2": "^<%= angularVersion %>"
|
||||
"@angular/common": "^<%= angularVersion %>",
|
||||
"@angular/compiler": "^<%= angularVersion %>",
|
||||
"@angular/core": "^<%= angularVersion %>",
|
||||
"@angular/platform-browser": "^<%= angularVersion %>",
|
||||
"@angular/platform-browser-dynamic": "^<%= angularVersion %>",
|
||||
"@angular/http": "^<%= angularVersion %>",
|
||||
"@angular/router": "^<%= angularVersion %>"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,10 +20,10 @@ module.exports = function(gulp, argv, buildConfig) {
|
||||
});
|
||||
|
||||
gulp.task('snapshot', ['e2e', 'protractor-server'], function(done) {
|
||||
snapshot(done);
|
||||
snapshot(done, false);
|
||||
});
|
||||
|
||||
gulp.task('snapshot-quick', ['e2e', 'protractor-server'], function(done) {
|
||||
gulp.task('snapshot.quick', ['e2e', 'protractor-server'], function(done) {
|
||||
snapshot(done, true);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user