Build process cleanup

- sort files/folder for grunt:compress
- sort bower dependencies
- move saucelabs to devDependencies

Gruntfile.js

@@ -67,45 +67,45 @@ module.exports = function (grunt) {
  files: [
  {
  src: [
+ '*.md',
+ 'app.js',
+ 'server.js',
+ 'package.json',
  'app/index.html',
- 'app/dist/juice-shop.min.js',
+ 'app/bower_components/**',
  'app/css/*.css',
  'app/css/geo-bootstrap/**',
- 'app/bower_components/**',
- 'app/public/**',
- 'app/private/**',
+ 'app/dist/juice-shop.min.js',
  'app/i18n/*.json',
+ 'app/private/**',
+ 'app/public/**',
+ 'data/*.js',
  'ftp/**',
- 'server.js',
- 'app.js',
+ 'lib/*.js',
  'models/*.js',
  'routes/*.js',
- 'data/*.js',
- 'lib/*.js',
- 'package.json',
- '*.md',
- 'node_modules/sequelize/**',
- 'node_modules/sqlite3/**',
- 'node_modules/express/**',
- 'node_modules/errorhandler/**',
- 'node_modules/cookie-parser/**',
- 'node_modules/serve-index/**',
- 'node_modules/serve-favicon/**',
  'node_modules/body-parser/**',
+ 'node_modules/colors/**',
+ 'node_modules/cookie-parser/**',
  'node_modules/cors/**',
- 'node_modules/sequelize-restful/**',
- 'node_modules/morgan/**',
- 'node_modules/multer/**',
- 'node_modules/sanitize-html/**',
+ 'node_modules/errorhandler/**',
+ 'node_modules/express/**',
  'node_modules/express-jwt/**',
- 'node_modules/jsonwebtoken/**',
+ 'node_modules/glob/**',
+ 'node_modules/hashids/**',
  'node_modules/helmet/**',
+ 'node_modules/jsonwebtoken/**',
+ 'node_modules/morgan/**',
+ 'node_modules/multer/**',
  'node_modules/pdfkit/**',
- 'node_modules/z85/**',
- 'node_modules/glob/**',
- 'node_modules/colors/**',
+ 'node_modules/sanitize-html/**',
+ 'node_modules/sequelize/**',
+ 'node_modules/sequelize-restful/**',
+ 'node_modules/serve-favicon/**',
+ 'node_modules/serve-index/**',
  'node_modules/socket.io/**',
- 'node_modules/hashids/**'
+ 'node_modules/sqlite3/**',
+ 'node_modules/z85/**'
  ]
  }
  ]

bower.json

@@ -1,30 +1,30 @@
 {
  "name": "juice-shop",
  "description": "An intentionally insecure Javascript Web Application",
- "version": "2.15.0",
+ "version": "2.16.0",
  "private": true,
  "dependencies": {
  "angular": "~1.5",
- "angular-route": "~1.5",
- "angular-loader": "~1.5",
- "angular-cookies": "~1.5",
- "angular-touch": "~1.5",
  "angular-animate": "~1.5",
  "angular-bootstrap": "~2.1",
- "ng-file-upload": "~12.2",
+ "angular-cookies": "~1.5",
+ "angular-loader": "~1.5",
+ "angular-route": "~1.5",
+ "angular-touch": "~1.5",
+ "angular-socket-io": "~0.7",
+ "angular-translate": "~2.12",
+ "angular-translate-loader-static-files": "~2.12",
  "bootstrap": "~3.3",
  "bootswatch": "~3.3",
+ "flag-icon-css": "~2.5",
+ "fontawesome": "~4.6",
+ "github-fork-ribbon-css": "~0.1",
  "jquery": "~2.1",
- "underscore": "~1.8",
- "string": "~3.3",
  "moment": "~2.15",
- "github-fork-ribbon-css": "~0.1",
- "fontawesome": "~4.6",
- "angular-translate": "~2.12",
- "angular-translate-loader-static-files": "~2.12",
- "flag-icon-css": "~2.5",
- "angular-socket-io": "~0.7",
- "ngclipboard": "~1.1"
+ "ng-file-upload": "~12.2",
+ "ngclipboard": "~1.1",
+ "string": "~3.3",
+ "underscore": "~1.8"
  },
  "devDependencies": {
  "angular-mocks": "~1.5",

package.json

@@ -1,6 +1,6 @@
 {
  "name": "juice-shop",
- "version": "2.15.0",
+ "version": "2.16.0",
  "description": "An intentionally insecure Javascript Web Application",
  "homepage": "https://www.owasp.org/index.php/OWASP_Juice_Shop_Project",
  "author": "Bjoern Kimminich <[email protected]> (https://www.owasp.org/index.php/User:Bjoern_Kimminich)",
@@ -37,7 +37,6 @@
  "multer": "~1.2",
  "pdfkit": "~0.8",
  "sanitize-html": "1.4.2",
- "saucelabs": "~1.3",
  "sequelize": "~1.7",
  "sequelize-restful": "~0.4",
  "serve-favicon": "~2.3",
@@ -76,8 +75,9 @@
  "lcov-result-merger": "~1.2",
  "phantomjs-prebuilt": "~2.1",
  "protractor": "~4.0",
+ "saucelabs": "~1.3",
  "shelljs": "~0.7",
- "socket.io-client": "^1.5.0",
+ "socket.io-client": "~1.5",
  "standard": "^8.0.0",
  "stryker": "~0.4",
  "stryker-api": "~0.2",