javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into windows-mode

Browse Source 
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2016-02-29 19:02:55 -05:00
parent a5945317d5 9b8d5bc55a
commit 02da18b311
69 changed files with 2677 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gulpfile.js
View File

@ -31,7 +31,8 @@ function getTscOptions(name) {
experimentalDecorators: true,
target: "es5",
module: "commonjs",
isolatedModules: true
isolatedModules: true,
typescript: require('typescript')
}
if (name === "typecheck") {
@ -251,7 +252,6 @@ function tsCompile(options, cacheName){
.pipe(tsc(options, undefined, tscReporter))
.on('error', function(error) {
console.log(error.message);
this.emit('end');
});
}
@ -334,7 +334,8 @@ gulp.task('copy.libs', function() {
var merge = require('merge2');
var extModules = gulp.src([
'node_modules/es6-shim/es6-shim.min.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js', //npm2
'node_modules/es6-module-loader/dist/es6-module-loader.src.js', //npm3
'node_modules/systemjs/dist/system.src.js',
'node_modules/angular2/bundles/angular2-polyfills.js',
'node_modules/angular2/bundles/angular2.dev.js',
@ -409,7 +410,6 @@ gulp.task('e2e.build', function() {
.pipe(tsc(getTscOptions(), undefined, tscReporter))
.on('error', function(error) {
console.log(error.message);
this.emit('end');
})
.pipe(gulpif(/index.js$/, createIndexHTML()))
.pipe(gulpif(/e2e.js$/, createPlatformTests()))
@ -593,7 +593,6 @@ gulp.task('build.demos', function() {
.pipe(tsc(getTscOptions(), undefined, tscReporter))
.on('error', function(error) {
console.log(error.message);
this.emit('end');
})
.pipe(gulpif(/index.js$/, createIndexHTML())) //TSC changes .ts to .js