Produced by Araxis Merge on 2/9/2017 12:58:01 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Genisis2Services-2.0.zip\Genisis2Client-master | Gruntfile.js | Thu Jan 26 17:08:50 2017 UTC |
| 2 | Genisis2Services-2.0.zip\Genisis2Client-master | Gruntfile.js | Wed Feb 8 16:21:12 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 456 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | 'use stric t'; | |
| 2 | ||
| 3 | module.exp orts = fun ction(grun t) { | |
| 4 | ||
| 5 | grunt.in itConfig({ | |
| 6 | pkg: g runt.file. readJSON(' package.js on'), | |
| 7 | GENISI S_ENV: pro cess.env.G ENISIS_ENV || 'devel opment', | |
| 8 | concat : { | |
| 9 | opti ons: { | |
| 10 | se parator: ' \n' | |
| 11 | }, | |
| 12 | js: { | |
| 13 | sr c: [ | |
| 14 | 'node_modu les/angula r/angular. js', | |
| 15 | 'node_modu les/angula r-route/an gular-rout e.js', | |
| 16 | 'node_modu les/angula r-cookies/ angular-co okies.js', | |
| 17 | 'node_modu les/jquery /dist/jque ry.js', | |
| 18 | 'node_modu les/bootst rap/dist/j s/bootstra p.js', | |
| 19 | //'env/<%= GENISIS_E NV %>.js', | |
| 20 | 'src/**/*. js', | |
| 21 | '!src/**/* .spec.js' | |
| 22 | ], | |
| 23 | de st: 'dist/ js/genisis .js' | |
| 24 | }, | |
| 25 | css: { | |
| 26 | sr c: [ | |
| 27 | 'node_modu les/bootst rap/dist/c ss/bootstr ap.css', | |
| 28 | 'src/css/* */*.css' | |
| 29 | ], | |
| 30 | de st: 'dist/ css/genisi s.css' | |
| 31 | } | |
| 32 | }, | |
| 33 | copy: { | |
| 34 | srcT oDist: { | |
| 35 | no null: true , | |
| 36 | fi les: [ | |
| 37 | { | |
| 38 | expand: true, | |
| 39 | cwd: 'sr c', | |
| 40 | src: [ | |
| 41 | '**/*. html', | |
| 42 | '**/*. jpg', | |
| 43 | '**/*. png', | |
| 44 | '**/*. gif', | |
| 45 | '**/*. svg', | |
| 46 | '**/*. ttf', | |
| 47 | '**/*. eot', | |
| 48 | '**/*. woff', | |
| 49 | '**/*. woff2' | |
| 50 | ], | |
| 51 | dest: 'd ist/', | |
| 52 | filter: 'isFile' | |
| 53 | }, | |
| 54 | ] | |
| 55 | } | |
| 56 | }, | |
| 57 | uglify : { | |
| 58 | opti ons: { | |
| 59 | ba nner: '/*! <%= pkg.n ame %> <%= pkg.versi on %> ' + | |
| 60 | '<%= grunt .template. today(\'dd -mm-yyyy\' ) %> */\n' | |
| 61 | }, | |
| 62 | dist : { | |
| 63 | fi les: { | |
| 64 | 'dist/js/g enisis.min .js': ['<% = concat.j s.dest %>' ] | |
| 65 | } | |
| 66 | } | |
| 67 | }, | |
| 68 | jasmin e: { | |
| 69 | src: [ | |
| 70 | 'n ode_module s/angular/ angular.mi n.js', | |
| 71 | 'n ode_module s/angular- route/angu lar-route. min.js', | |
| 72 | 'n ode_module s/angular- cookies/an gular-cook ies.min.js ', | |
| 73 | 'n ode_module s/angular- mocks/angu lar-mocks. js', | |
| 74 | 'n ode_module s/jquery/d ist/jquery .js', | |
| 75 | 'n ode_module s/bootstra p/dist/js/ bootstrap. min.js', | |
| 76 | // 'env/<%= G ENISIS_ENV %>.js', | |
| 77 | 'd ist/js/env .js', | |
| 78 | 's rc/**/*.js ' | |
| 79 | ] | |
| 80 | }, | |
| 81 | jshint : { | |
| 82 | file s: [ | |
| 83 | 'G runtfile.j s', | |
| 84 | // 'env/<%= G ENISIS_ENV %>.js', | |
| 85 | 'd ist/js/env .js', | |
| 86 | 's rc/**/*.js ' | |
| 87 | ], | |
| 88 | opti ons: { | |
| 89 | // options h ere to ove rride JSHi nt default s | |
| 90 | js hintrc: tr ue | |
| 91 | } | |
| 92 | }, | |
| 93 | htmlhi nt: { | |
| 94 | opti ons: { | |
| 95 | ht mlhintrc: '.htmlhint rc' | |
| 96 | }, | |
| 97 | html : { | |
| 98 | sr c: [ | |
| 99 | 'src/**/*. html', | |
| 100 | 'index.htm l' | |
| 101 | ] | |
| 102 | } | |
| 103 | }, | |
| 104 | csslin t: { | |
| 105 | opti ons: { | |
| 106 | cs slintrc: ' .csslintrc ' | |
| 107 | }, | |
| 108 | stri ct: { | |
| 109 | sr c: ['src/* */*.css'] | |
| 110 | } | |
| 111 | }, | |
| 112 | jsbeau tifier: { | |
| 113 | 'js' : { | |
| 114 | sr c: [ | |
| 115 | 'src/**/*. js' | |
| 116 | ], | |
| 117 | op tions: { | |
| 118 | config: '. jsbeautify js' | |
| 119 | } | |
| 120 | }, | |
| 121 | 'htm l': { | |
| 122 | sr c: [ | |
| 123 | 'src/**/*. html', | |
| 124 | 'index.htm l' | |
| 125 | ], | |
| 126 | op tions: { | |
| 127 | config: '. jsbeautify html' | |
| 128 | } | |
| 129 | }, | |
| 130 | 'css ': { | |
| 131 | sr c: ['src/* */*.css'], | |
| 132 | op tions: { | |
| 133 | config: '. jsbeautify css' | |
| 134 | } | |
| 135 | } | |
| 136 | }, | |
| 137 | watch: { | |
| 138 | file s: [ | |
| 139 | '< %= jshint. files %>', | |
| 140 | '< %= htmlhin t.html.src %>', | |
| 141 | '< %= csslint .strict.sr c %>', | |
| 142 | '! _SpecRunne r.html', | |
| 143 | '! .grunt' | |
| 144 | ], | |
| 145 | task s: ['jshin t', 'htmlh int', 'css lint', 'ja smine', 'b uild'], | |
| 146 | opti ons: { | |
| 147 | de bounceDela y: 250, | |
| 148 | re load: true , | |
| 149 | da teFormat: function(t ime) { | |
| 150 | grunt.log. writeln('T he watch f inished in ' + time + 'ms at ' + | |
| 151 | (new Dat e()).toStr ing()); | |
| 152 | grunt.log. writeln('W aiting for more chan ges...'); | |
| 153 | } | |
| 154 | }, | |
| 155 | }, | |
| 156 | maven : { | |
| 157 | opti ons : { | |
| 158 | groupI d : 'gov.v a.genisis2 ', | |
| 159 | artifa ctId : 'Ge nisisAngul arWebApp', | |
| 160 | debug : true | |
| 161 | }, | |
| 162 | depl oy : { | |
| 163 | option s : { | |
| 164 | url : 'htt p:// IP /nexus/con tent/repos itories' + | |
| 165 | '/snapshot s', | |
| 166 | reposito ryId : 'ne xus' | |
| 167 | }, | |
| 168 | src : 'dist/**', | |
| 169 | dot : true | |
| 170 | }, | |
| 171 | rele ase : { | |
| 172 | option s : { | |
| 173 | url : 'htt p:// IP /nexus/con tent/repos itories' + | |
| 174 | '/releases /', | |
| 175 | reposito ryId : 'ne xus', | |
| 176 | mode : ' minor' | |
| 177 | }, | |
| 178 | src : 'dist/**' | |
| 179 | } | |
| 180 | }, | |
| 181 | fileExis ts: { | |
| 182 | script s: ['dist/ js/env.js' ] | |
| 183 | } | |
| 184 | }); | |
| 185 | ||
| 186 | //Copyin g files | |
| 187 | grunt.lo adNpmTasks ('grunt-co ntrib-copy '); | |
| 188 | ||
| 189 | //Minifi cation | |
| 190 | grunt.lo adNpmTasks ('grunt-co ntrib-conc at'); //co ncatenate files toge ther | |
| 191 | grunt.lo adNpmTasks ('grunt-co ntrib-ugli fy'); //mi nify js fi les | |
| 192 | //@TODO minify css files (ht tps://gith ub.com/gru ntjs/grunt -contrib-c ssmin) | |
| 193 | ||
| 194 | //Check to see if the dist/j s/env.js f ile exists | |
| 195 | grunt.lo adNpmTasks ('grunt-fi le-exists' ); | |
| 196 | ||
| 197 | //Javasc ript | |
| 198 | grunt.lo adNpmTasks ('grunt-co ntrib-jshi nt'); //ch eck files js for err ors | |
| 199 | ||
| 200 | //Format ting | |
| 201 | grunt.lo adNpmTasks ('grunt-js beautifier '); //clea n up forma t | |
| 202 | ||
| 203 | //Testin g | |
| 204 | grunt.lo adNpmTasks ('grunt-co ntrib-jasm ine'); //r un tests | |
| 205 | ||
| 206 | //Grunt | |
| 207 | grunt.lo adNpmTasks ('grunt-co ntrib-watc h'); //sta rt grunt w atch | |
| 208 | ||
| 209 | //HTML | |
| 210 | grunt.lo adNpmTasks ('grunt-ht mlhint'); //check fo r html err ors | |
| 211 | ||
| 212 | //CSS | |
| 213 | grunt.lo adNpmTasks ('grunt-co ntrib-cssl int'); //c heck for c ss errors | |
| 214 | ||
| 215 | //maven tasks used to releas e and depl oy to Jenk ins | |
| 216 | grunt.lo adNpmTasks ('grunt-ma ven-tasks' ); | |
| 217 | ||
| 218 | //Tasks | |
| 219 | grunt.re gisterTask ('envExist s', ['file Exists']); | |
| 220 | grunt.re gisterTask ('format', ['jsbeaut ifier']); | |
| 221 | grunt.re gisterTask ('lint', [ 'jshint', 'htmlhint' , 'csslint ']); | |
| 222 | grunt.re gisterTask ('test', [ 'envExists ', 'format ', 'lint', 'jasmine' ]); | |
| 223 | grunt.re gisterTask ('build', | |
| 224 | ['envE xists', 'f ormat', 'l int', 'con cat', 'ugl ify', 'cop y'] | |
| 225 | ); | |
| 226 | grunt.re gisterTask ('default' , ['test', 'concat', 'uglify', 'copy']); | |
| 227 | grunt.re gisterTask ('jenkinsB uild', | |
| 228 | ['test ','concat' , 'uglify' , 'copy',' maven:depl oy'] | |
| 229 | ); | |
| 230 | }; |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.