From afd670bc89bb88cdadf304494588a5169990bc52 Mon Sep 17 00:00:00 2001 From: Andrew Joslin Date: Fri, 23 May 2014 08:40:31 -0600 Subject: [PATCH] chore(gulp): properly build ionic.bundle.js if dist is different --- config/build.config.js | 12 ++++++------ gulpfile.js | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/config/build.config.js b/config/build.config.js index 4b714ba505..539d56ee99 100644 --- a/config/build.config.js +++ b/config/build.config.js @@ -96,12 +96,12 @@ module.exports = { ], ionicBundleFiles: [ - 'dist/js/ionic.js', - 'dist/js/angular/angular.js', - 'dist/js/angular/angular-animate.js', - 'dist/js/angular/angular-sanitize.js', - 'dist/js/angular-ui/angular-ui-router.js', - 'dist/js/ionic-angular.js' + 'js/ionic.js', + 'js/angular/angular.js', + 'js/angular/angular-animate.js', + 'js/angular/angular-sanitize.js', + 'js/angular-ui/angular-ui-router.js', + 'js/ionic-angular.js' ], //Exclamation can be no longer than 14 chars diff --git a/gulpfile.js b/gulpfile.js index b8861e5d3d..7eb3d1a4e3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -116,7 +116,10 @@ gulp.task('bundle', [ .pipe(concat('ionic.bundle.min.js')) .pipe(gulp.dest(buildConfig.dist + '/js')); - return gulp.src(buildConfig.ionicBundleFiles) + return gulp.src(buildConfig.ionicBundleFiles, { + base: buildConfig.dist, + cwd: buildConfig.dist + }) .pipe(header(buildConfig.bundleBanner)) .pipe(concat('ionic.bundle.js')) .pipe(gulp.dest(buildConfig.dist + '/js'));