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

fixing merge conflict that I missed

Browse Source
This commit is contained in:
Brandy Carney
2015-12-10 18:10:07 -05:00
parent d2991cbde7
commit f545e3ba40
1 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gulpfile.js
View File

@ -136,35 +136,6 @@ gulp.task('transpile.no-typecheck', function(){
gulp.task('transpile.typecheck', function(){ gulp.task('transpile.typecheck', function(){
var merge = require('merge2'); var merge = require('merge2');
<<<<<<< HEAD
var result = tsResult(tscOptions);
// merge definition and source streams
return merge([
result.dts,
result.js
])
.pipe(gulp.dest('dist'));
})
gulp.task('transpile', ['transpile.no-typecheck']);
gulp.task('bundle', ['transpile'], function(done){
//TODO
// if (flags.animations == 'polyfill') {
// prepend.push('window.Element.prototype.animate=undefined;');
// }
var config = require('./scripts/npm/ionic.webpack.config.js');
bundle({
config: config,
cb: done,
stats: true
});
})
=======
var result = tsResult(tscOptions); var result = tsResult(tscOptions);
@ -199,7 +170,6 @@ gulp.task('bundle', ['transpile'], function(done){
} }
}) })
>>>>>>> master
function bundle(args) { function bundle(args) {
var webpack = require('webpack'); var webpack = require('webpack');
var path = require('path'); var path = require('path');