From c0d37c91d9c53f35143d5b383f2fb07fa8ac80bc Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Thu, 3 Sep 2015 14:18:03 -0500 Subject: [PATCH] speed up gulp, move requires to tasks --- gulpfile.js | 45 ++++++++++++++++------------------- scripts/build/ionic.dark.scss | 11 --------- 2 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 scripts/build/ionic.dark.scss diff --git a/gulpfile.js b/gulpfile.js index 9af4c42511..af0ecfabe8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,28 +1,15 @@ -var _ = require('lodash'); var buildConfig = require('./scripts/build/config'); -var fs = require('fs'); var gulp = require('gulp'); -var karma = require('karma').server; var path = require('path'); -var VinylFile = require('vinyl'); var argv = require('yargs').argv; -var concat = require('gulp-concat'); var del = require('del'); -var gulpif = require('gulp-if'); var rename = require('gulp-rename'); -var sass = require('gulp-sass'); -var autoprefixer = require('gulp-autoprefixer'); var through2 = require('through2'); var runSequence = require('run-sequence'); var watch = require('gulp-watch'); -var exec = require('child_process').exec; var babel = require('gulp-babel'); var tsc = require('gulp-typescript'); -var lazypipe = require('lazypipe'); var cache = require('gulp-cached'); -var connect = require('gulp-connect'); -var Dgeni = require('dgeni'); -var insert = require('gulp-insert'); var minimist = require('minimist'); function getBabelOptions(moduleName, moduleType) { @@ -133,6 +120,7 @@ gulp.task('watch', function(done) { }); gulp.task('serve', function() { + var connect = require('gulp-connect'); connect.server({ root: 'dist', port: flags.port, @@ -175,6 +163,9 @@ gulp.task('transpile.common', function() { gulp.task('transpile', ['transpile.system']); gulp.task('bundle.ionic', ['transpile'], function() { + var insert = require('gulp-insert'); + var concat = require('gulp-concat'); + return gulp.src([ 'dist/src/es5/system/ionic/**/*.js' ]) @@ -185,6 +176,8 @@ gulp.task('bundle.ionic', ['transpile'], function() { }); gulp.task('bundle', ['bundle.ionic'], function() { + var concat = require('gulp-concat'); + return gulp.src(buildConfig.scripts) .pipe(concat('ionic.bundle.js')) .pipe(gulp.dest('dist/js')); @@ -202,6 +195,12 @@ gulp.task('tests', function() { }) gulp.task('e2e', function() { + var gulpif = require('gulp-if'); + var lazypipe = require('lazypipe'); + var _ = require('lodash'); + var fs = require('fs'); + var VinylFile = require('vinyl'); + var buildTest = lazypipe() //.pipe(traceur, traceurOptions) .pipe(tsc, tscOptions, null, tscReporter) @@ -285,7 +284,9 @@ gulp.task('e2e', function() { } }); -gulp.task('sass', function(done) { +gulp.task('sass', function() { + var sass = require('gulp-sass'); + var autoprefixer = require('gulp-autoprefixer'); return gulp.src('ionic/ionic.scss') .pipe(sass() .on('error', sass.logError) @@ -294,15 +295,6 @@ gulp.task('sass', function(done) { .pipe(gulp.dest('dist/css/')); }); -gulp.task('sass.dark', function() { - return gulp.src('scripts/build/ionic.dark.scss') - .pipe(sass() - .on('error', sass.logError) - ) - .pipe(autoprefixer(buildConfig.autoprefixer)) - .pipe(gulp.dest('dist/css/')); -}); - gulp.task('fonts', function() { return gulp.src(['ionic/fonts/**/*.ttf', 'ionic/fonts/**/*.woff']) .pipe(gulp.dest('dist/fonts')); @@ -311,10 +303,12 @@ gulp.task('fonts', function() { require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig); gulp.task('karma', ['tests'], function() { + var karma = require('karma').server; return karma.start({ configFile: __dirname + '/scripts/karma/karma.conf.js' }) }); gulp.task('karma-watch', function() { + var karma = require('karma').server; return karma.start({ configFile: __dirname + '/scripts/karma/karma-watch.conf.js' }) }); @@ -365,6 +359,10 @@ gulp.task('publish', function(done) { return } + var exec = require('child_process').exec; + var _ = require('lodash'); + var fs = require('fs'); + runSequence( 'clean', ['bundle', 'sass', 'fonts', 'copy.ts', 'copy.scss'], @@ -375,7 +373,6 @@ gulp.task('publish', function(done) { fs.writeFileSync("dist/package.json", packageJSONContents); // publish to npm - var exec = require('child_process').exec; exec('cd dist && npm publish', function (err, stdout, stderr) { console.log(stdout); console.error(stderr); diff --git a/scripts/build/ionic.dark.scss b/scripts/build/ionic.dark.scss deleted file mode 100644 index 1ee8c86d4c..0000000000 --- a/scripts/build/ionic.dark.scss +++ /dev/null @@ -1,11 +0,0 @@ - -// Ionic Dark -// Sass file to create and demo the default dark theme - - -// Manually set to use the dark theme -@import "ionic/themes/dark"; - - -// Import Ionic SCSS -@import "ionic/ionic";