Repository: incubator-zeppelin Updated Branches: refs/heads/master b6768c6de -> eeeff235b
Replace ngMin by ngAnnotate Improve Grunt Build, by replacing ngMin with ngAnnotate ngMin is deprecated and ngAnnotate is its replacement. Zeppelin-web compilation time got a 50-70% boost thanks to that change Author: Damien Corneau <[email protected]> Closes #18 from corneadoug/improve/GruntBuild and squashes the following commits: b8be86e [Damien Corneau] Replace ngMin by ngAnnotate Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/eeeff235 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/eeeff235 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/eeeff235 Branch: refs/heads/master Commit: eeeff235b26c8679bb266d4a8ace008ab7f20fdf Parents: b6768c6 Author: Damien Corneau <[email protected]> Authored: Tue Mar 31 19:37:31 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu Apr 2 22:24:16 2015 +0900 ---------------------------------------------------------------------- zeppelin-web/Gruntfile.js | 28 +++++++++++++--------------- zeppelin-web/package.json | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/eeeff235/zeppelin-web/Gruntfile.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js index 0b513f9..77900b1 100644 --- a/zeppelin-web/Gruntfile.js +++ b/zeppelin-web/Gruntfile.js @@ -27,6 +27,18 @@ module.exports = function (grunt) { // Project settings yeoman: appConfig, + // use ngAnnotate instead og ngMin + ngAnnotate: { + dist: { + files: [{ + expand: true, + cwd: '.tmp/concat/scripts', + src: '*.js', + dest: '.tmp/concat/scripts' + }] + } + }, + // Watches files for changes and runs tasks based on the changed files watch: { bower: { @@ -265,20 +277,6 @@ module.exports = function (grunt) { } }, - // ngmin tries to make the code safe for minification automatically by - // using the Angular long form for dependency injection. It doesn't work on - // things like resolve or inject so those have to be done manually. - ngmin: { - dist: { - files: [{ - expand: true, - cwd: '.tmp/concat/scripts', - src: '*.js', - dest: '.tmp/concat/scripts' - }] - } - }, - // Copies remaining files to places other tasks can use copy: { dist: { @@ -388,7 +386,7 @@ module.exports = function (grunt) { 'concurrent:dist', 'autoprefixer', 'concat', - 'ngmin', + 'ngAnnotate', 'copy:dist', 'cssmin', 'uglify', http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/eeeff235/zeppelin-web/package.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index 209cc38..78a6b41 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -18,7 +18,7 @@ "grunt-contrib-watch": "^0.6.1", "grunt-filerev": "^0.2.1", "grunt-newer": "^0.7.0", - "grunt-ngmin": "^0.0.3", + "grunt-ng-annotate": "^0.10.0", "grunt-svgmin": "^0.4.0", "grunt-usemin": "^2.1.1", "grunt-wiredep": "~2.0.0",
