Repository: ambari Updated Branches: refs/heads/trunk 6e917d1f4 -> baa390918
AMBARI-7120. Current trunk won't build. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/baa39091 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/baa39091 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/baa39091 Branch: refs/heads/trunk Commit: baa390918f0db37ac0b4eb2137c6fbfa46a8a563 Parents: 6e917d1 Author: Yusaku Sako <[email protected]> Authored: Wed Sep 3 09:27:31 2014 -0700 Committer: Yusaku Sako <[email protected]> Committed: Wed Sep 3 09:27:31 2014 -0700 ---------------------------------------------------------------------- .../src/main/resources/ui/admin-web/gulpfile.js | 51 -------------------- .../main/resources/ui/admin-web/package.json | 9 ---- .../jobs/src/main/resources/ui/Gruntfile.js | 12 ----- .../jobs/src/main/resources/ui/package.json | 1 - 4 files changed, 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/baa39091/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js b/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js index 4cc129c..a4339b2 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js +++ b/ambari-admin/src/main/resources/ui/admin-web/gulpfile.js @@ -30,13 +30,6 @@ gulp.task('styles', function () { .pipe($.size()); }); -gulp.task('scripts', function () { - return gulp.src('app/scripts/**/*.js') - .pipe($.jshint()) - .pipe($.jshint.reporter(require('jshint-stylish'))) - .pipe($.size()); -}); - gulp.task('html', ['styles'], function () { var jsFilter = $.filter('**/*.js'); var cssFilter = $.filter('**/*.css'); @@ -48,7 +41,6 @@ gulp.task('html', ['styles'], function () { .pipe($.uglify()) .pipe(jsFilter.restore()) .pipe(cssFilter) - // .pipe($.csso()) .pipe(cssFilter.restore()) .pipe($.useref.restore()) .pipe($.useref()) @@ -63,11 +55,6 @@ gulp.task('views', function() { gulp.task('images', function () { return gulp.src('app/images/**/*') - .pipe($.cache($.imagemin({ - optimizationLevel: 3, - progressive: true, - interlaced: true - }))) .pipe(gulp.dest('dist/images')) .pipe($.size()); }); @@ -94,41 +81,3 @@ gulp.task('build', ['html', 'views', 'images', 'fonts', 'extras']); gulp.task('default', ['clean'], function () { gulp.start('build'); }); - -gulp.task('connect', function () { - var connect = require('connect'); - var app = connect() - .use(require('connect-livereload')({ port: 35729 })) - .use(connect.static('app')) - .use(connect.static('.tmp')) - .use(connect.directory('app')); - - require('http').createServer(app) - .listen(9000) - .on('listening', function () { - console.log('Started connect web server on http://localhost:9000'); - }); -}); - -gulp.task('serve', ['connect'], function () { - require('opn')('http://localhost:9000'); -}); - -gulp.task('watch', ['connect', 'serve'], function () { - var server = $.livereload(); - - // watch for changes - - gulp.watch([ - 'app/*.html', - '.tmp/styles/**/*.css', - 'app/scripts/**/*.js', - 'app/images/**/*' - ]).on('change', function (file) { - server.changed(file.path); - }); - - gulp.watch('app/styles/**/*.css', ['styles']); - gulp.watch('app/scripts/**/*.js', ['scripts']); - gulp.watch('app/images/**/*', ['images']); -}); http://git-wip-us.apache.org/repos/asf/ambari/blob/baa39091/ambari-admin/src/main/resources/ui/admin-web/package.json ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json index 85beb94..0dc99e8 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/package.json +++ b/ambari-admin/src/main/resources/ui/admin-web/package.json @@ -5,26 +5,17 @@ }, "devDependencies": { "bower": "1.3.8", - "connect": "^2.14.4", - "connect-livereload": "^0.4.0", - "express": "^4.4.5", "gulp": "^3.6.0", "gulp-autoprefixer": "^0.0.7", "gulp-bower-files": "^0.2.1", "gulp-cache": "^0.1.1", "gulp-clean": "^0.2.4", - "gulp-csso": "^0.2.6", "gulp-filter": "^0.4.1", "gulp-flatten": "^0.0.2", - "gulp-imagemin": "^1.0.1", - "gulp-jshint": "^1.5.3", - "gulp-livereload": "^1.2.0", "gulp-load-plugins": "^0.5.0", "gulp-size": "^0.3.0", "gulp-uglify": "^0.2.1", "gulp-useref": "^0.4.2", - "jshint-stylish": "^0.2.0", - "opn": "^0.1.1", "gulp-plumber": "*" }, "engines": { http://git-wip-us.apache.org/repos/asf/ambari/blob/baa39091/contrib/views/jobs/src/main/resources/ui/Gruntfile.js ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js index e955b61..185cd60 100644 --- a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js +++ b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js @@ -181,18 +181,6 @@ module.exports = function (grunt) { dirs: ['<%= yeoman.dist %>'] } }, - imagemin: { - dist: { - files: [ - { - expand: true, - cwd: '<%= yeoman.app %>/images', - src: '{,*/}*.{png,jpg,jpeg}', - dest: '<%= yeoman.dist %>/images' - } - ] - } - }, svgmin: { dist: { files: [ http://git-wip-us.apache.org/repos/asf/ambari/blob/baa39091/contrib/views/jobs/src/main/resources/ui/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/src/main/resources/ui/package.json b/contrib/views/jobs/src/main/resources/ui/package.json index 5ef01fc..dd723ca 100644 --- a/contrib/views/jobs/src/main/resources/ui/package.json +++ b/contrib/views/jobs/src/main/resources/ui/package.json @@ -14,7 +14,6 @@ "grunt-contrib-connect": "~0.3.0", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-htmlmin": "~0.1.3", - "grunt-contrib-imagemin": "~0.2.0", "grunt-contrib-watch": "~0.5.2", "grunt-rev": "~0.1.0", "grunt-usemin": "~0.1.12",
