Repository: ode-console Updated Branches: refs/heads/master 40059acfe -> 36e187ad8
upgraded gulp plugins to make it work on nodejs 4.5 Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/6eb13983 Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/6eb13983 Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/6eb13983 Branch: refs/heads/master Commit: 6eb1398379624a02cb21df22bbea1ca21339257b Parents: 40059ac Author: sathwik <[email protected]> Authored: Wed Aug 24 13:20:12 2016 +0530 Committer: sathwik <[email protected]> Committed: Wed Aug 24 13:20:12 2016 +0530 ---------------------------------------------------------------------- gulp/build.js | 22 +++++------ package.json | 69 +++++++++++++++++---------------- src/app/process/process.service.js | 5 ++- src/index.html | 6 +-- 4 files changed, 50 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/gulp/build.js ---------------------------------------------------------------------- diff --git a/gulp/build.js b/gulp/build.js index bef1ccf..46d438c 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -69,7 +69,7 @@ gulp.task('injector:js', ['jshint', 'injector:css'], function () { gulp.task('partials', function () { return gulp.src('src/{app,components}/**/*.html') - .pipe($.minifyHtml({ + .pipe($.htmlmin({ empty: true, spare: true, quotes: true @@ -81,10 +81,9 @@ gulp.task('partials', function () { }); gulp.task('html', ['wiredep', 'injector:css', 'injector:js', 'partials'], function () { - var htmlFilter = $.filter('*.html'); - var jsFilter = $.filter('**/*.js'); - var cssFilter = $.filter('**/*.css'); - var assets; + var htmlFilter = $.filter('*.html',{restore: true}); + var jsFilter = $.filter('**/*.js',{restore: true}); + var cssFilter = $.filter('**/*.css',{restore: true}); return gulp.src('src/*.html') .pipe($.inject(gulp.src('.tmp/inject/templateCacheHtml.js', {read: false}), { @@ -92,26 +91,25 @@ gulp.task('html', ['wiredep', 'injector:css', 'injector:js', 'partials'], functi ignorePath: '.tmp', addRootSlash: false })) - .pipe(assets = $.useref.assets()) + .pipe($.useref()) .pipe($.rev()) .pipe(jsFilter) .pipe($.ngAnnotate()) .pipe($.uglify({preserveComments: $.uglifySaveLicense})) - .pipe(jsFilter.restore()) + .pipe(jsFilter.restore) .pipe(cssFilter) .pipe($.replace('bower_components/bootstrap-sass-official/assets/fonts/bootstrap','fonts')) .pipe($.csso()) - .pipe(cssFilter.restore()) - .pipe(assets.restore()) + .pipe(cssFilter.restore) .pipe($.useref()) .pipe($.revReplace()) .pipe(htmlFilter) - .pipe($.minifyHtml({ + .pipe($.htmlmin({ empty: true, spare: true, quotes: true })) - .pipe(htmlFilter.restore()) + .pipe(htmlFilter.restore) .pipe(gulp.dest('dist/')) .pipe($.size({ title: 'dist/', showFiles: true })); }); @@ -139,7 +137,7 @@ gulp.task('misc', function () { }); gulp.task('clean', function (done) { - $.del(['dist/', '.tmp/'], done); + $.del.sync(['dist/', '.tmp/'], done); }); gulp.task('build', ['html', 'images', 'fonts', 'misc']); http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index a80c0bc..e86bcdd 100644 --- a/package.json +++ b/package.json @@ -3,40 +3,41 @@ "version": "0.1.0", "dependencies": {}, "devDependencies": { - "gulp": "~3.8.10", - "gulp-autoprefixer": "~2.0.0", - "gulp-cache": "~0.2.4", - "gulp-angular-templatecache": "~1.4.2", - "del": "~0.1.3", - "gulp-csso": "~0.2.9", - "gulp-filter": "~1.0.2", - "gulp-flatten": "~0.0.4", - "gulp-imagemin": "~2.0.0", - "gulp-jshint": "~1.9.0", - "gulp-load-plugins": "~0.7.1", - "gulp-size": "~1.1.0", - "gulp-uglify": "~1.0.1", - "gulp-useref": "~1.0.2", - "gulp-ng-annotate": "~0.5.0", - "gulp-replace": "~0.5.0", - "gulp-rev": "~2.0.1", - "gulp-rev-replace": "~0.3.1", - "gulp-minify-html": "~0.1.7", - "gulp-inject": "~1.0.2", - "gulp-protractor": "~0.0.12", - "gulp-karma": "~0.0.4", - "gulp-sass": "~1.1.0", - "main-bower-files": "~2.4.0", - "jshint-stylish": "~1.0.0", - "wiredep": "~2.2.0", - "karma-jasmine": "~0.3.1", - "karma-phantomjs-launcher": "~0.1.4", - "require-dir": "~0.1.0", - "browser-sync": "~1.7.1", - "http-proxy": "~1.7.0", - "chalk": "~0.5.1", - "protractor": "~1.8.0", - "uglify-save-license": "~0.4.1" + "gulp": "~3.9.1", + "gulp-autoprefixer": "~3.1.1", + "gulp-cache": "~0.4.5", + "gulp-angular-templatecache": "~2.0.0", + "del": "~2.2.2", + "gulp-csso": "~2.0.0", + "gulp-filter": "~4.0.0", + "gulp-flatten": "~0.3.1", + "gulp-imagemin": "~3.0.3", + "gulp-jshint": "~2.0.1", + "gulp-load-plugins": "~1.2.4", + "gulp-size": "~2.1.0", + "gulp-uglify": "~2.0.0", + "gulp-useref": "~3.1.0", + "gulp-ng-annotate": "~2.0.0", + "gulp-replace": "~0.5.4", + "gulp-rev": "~7.1.2", + "gulp-rev-replace": "~0.4.3", + "gulp-htmlmin": "~2.0.0", + "gulp-inject": "~4.1.0", + "gulp-protractor": "~3.0.0", + "karma": "~1.2.0", + "gulp-sass": "~2.3.2", + "main-bower-files": "~2.13.1", + "jshint-stylish": "~2.2.1", + "wiredep": "~4.0.0", + "karma-jasmine": "~1.0.2", + "karma-phantomjs-launcher": "~1.0.1", + "require-dir": "~0.3.0", + "browser-sync": "~2.14.0", + "http-proxy": "~1.14.0", + "chalk": "~1.1.3", + "protractor": "~4.0.3", + "uglify-save-license": "~0.4.1", + "jshint": "~2.9.3" }, "engines": { "node": ">=0.10.0" http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/src/app/process/process.service.js ---------------------------------------------------------------------- diff --git a/src/app/process/process.service.js b/src/app/process/process.service.js index 938e2c1..5c633f6 100644 --- a/src/app/process/process.service.js +++ b/src/app/process/process.service.js @@ -100,6 +100,9 @@ angular.module('odeConsole') return result; }; + /** public functions **/ + var ps = {}; + var updateStats = function(packages) { ps.summary = {}; ps.summary.packages = 0; @@ -135,8 +138,6 @@ angular.module('odeConsole') }); }; - /** public functions **/ - var ps = {}; ps.getPackages = function() { var deferred = $q.defer(); http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/src/index.html ---------------------------------------------------------------------- diff --git a/src/index.html b/src/index.html index 33dd76d..08c36bc 100644 --- a/src/index.html +++ b/src/index.html @@ -24,9 +24,6 @@ <!-- endinject --> <!-- endbuild --> - <!-- build:js scripts/modernizr.js --> - <script src="../bower_components/modernizr/modernizr.js"></script> - <!-- endbuild --> </head> <body> <!--[if lt IE 10]> @@ -39,13 +36,14 @@ <!-- build:js scripts/vendor.js --> <!-- bower:js --> + <script src="../bower_components/modernizr/modernizr.js"></script> <script src="../bower_components/jquery/dist/jquery.js"></script> <script src="../bower_components/angular/angular.js"></script> <script src="../bower_components/angular-animate/angular-animate.js"></script> <script src="../bower_components/angular-sanitize/angular-sanitize.js"></script> <script src="../bower_components/angular-route/angular-route.js"></script> <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script> - <script src="../bower_components/angular-smart-table/dist/smart-table.min.js"></script> + <script src="../bower_components/angular-smart-table/dist/smart-table.js"></script> <script src="../bower_components/angular-xml/angular-xml.js"></script> <script src="../bower_components/angular-poller/angular-poller.min.js"></script> <script src="../bower_components/moment/moment.js"></script>
