diff --git a/package.json b/package.json index 7d44ed6c7..a39f62b65 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,6 @@ "fast-csv": "2.4.1", "file-tail": "0.3.0", "fs-extra": "7.0.1", - "grunt": "1.0.3", - "grunt-contrib-cssmin": "3.0.0", - "grunt-contrib-uglify": "3.4.0", - "grunt-sass": "3.0.1", - "grunt-shell": "2.1.0", "handlebars": "4.0.12", "imap": "0.8.19", "imports-loader": "0.8.0", @@ -91,7 +86,6 @@ "uglify-js": "3.4.9", "unzipper": "0.9.10", "util": "0.11.1", - "webpack": "4.29.0", "winston": "2.4.4" }, "devDependencies": { @@ -106,8 +100,8 @@ "babel-eslint": "10.0.1", "babel-loader": "8.0.5", "chai": "*", - "codacy-coverage": "^3.0.0", - "cross-env": "^5.2.0", + "codacy-coverage": "3.0.0", + "cross-env": "5.2.0", "css-loader": "2.1.0", "eslint": "5.12.1", "eslint-config-angular": "0.5.0", @@ -122,6 +116,11 @@ "eslint-plugin-standard": "4.0.0", "exports-loader": "0.7.0", "expose-loader": "0.7.5", + "grunt": "1.0.3", + "grunt-contrib-cssmin": "3.0.0", + "grunt-contrib-uglify": "3.4.0", + "grunt-sass": "3.0.1", + "grunt-shell": "2.1.0", "grunt-contrib-watch": "1.1.0", "grunt-express-server": "0.5.4", "grunt-htmlhint": "0.9.13", @@ -142,6 +141,7 @@ "superagent": "4.1.0", "supertest": "3.4.1", "terser-webpack-plugin": "1.2.1", + "webpack": "4.29.0", "webpack-cli": "3.2.1" }, "release": { diff --git a/yarn.lock b/yarn.lock index f0d0c6087..268ce2cf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2848,19 +2848,18 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -codacy-coverage@^3.0.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/codacy-coverage/-/codacy-coverage-3.4.0.tgz#196af70844c4e4179718f7a7f9d96b921b4b3a67" - integrity sha512-A0ats3/gZtOw76muu++HZ6QrInztWjjLefkLJmmBpjPfyn6nNwNLoApmGmj3F3dfgl2+o6u5GwPnUBkKdfKXTQ== +codacy-coverage@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/codacy-coverage/-/codacy-coverage-3.0.0.tgz#d4a0286b01aa0dfa10195b9bcff69c345de996b0" + integrity sha512-hQJIMhBM5JYeIpu9gKHRmIK5uj9zWDtWBDGtW7PnWRYHMr1Wp93B+l5s82d6XymFJDCZENSp0uWY9zfR1meBwQ== dependencies: bluebird "^3.5.x" commander "^2.x" - jacoco-parse "^2.x" joi "^13.x" lcov-parse "^1.x" lodash "^4.17.4" log-driver "^1.x" - request "^2.88.0" + request "^2.83.0" request-promise "^4.x" code-point-at@^1.0.0: @@ -3325,7 +3324,7 @@ cron@^1.3: dependencies: moment-timezone "^0.5.x" -cross-env@^5.2.0: +cross-env@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg== @@ -6803,14 +6802,6 @@ istanbul@0.4.5: which "^1.1.1" wordwrap "^1.0.0" -jacoco-parse@^2.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/jacoco-parse/-/jacoco-parse-2.0.0.tgz#8684576497a1eddf6d766afa6546aef7b1036f29" - integrity sha512-bKneBFwHF+afsH1ByniUyjDCwiYhb2RYk7aovcNgOKqbayVgDQ1U9h5Fy/PMGI9/iJwIuc3yqpZvEtqY6s81lQ== - dependencies: - mocha "^5.2.0" - xml2js "^0.4.9" - java-properties@^0.2.9: version "0.2.10" resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-0.2.10.tgz#2551560c25fa1ad94d998218178f233ad9b18f60" @@ -8249,7 +8240,7 @@ mocha-lcov-reporter@1.3.0: resolved "https://registry.yarnpkg.com/mocha-lcov-reporter/-/mocha-lcov-reporter-1.3.0.tgz#469bdef4f8afc9a116056f079df6182d0afb0384" integrity sha1-Rpve9PivyaEWBW8HnfYYLQr7A4Q= -mocha@5.2.0, mocha@^5.2.0: +mocha@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== @@ -10697,7 +10688,7 @@ request-promise@^4.x: stealthy-require "^1.1.0" tough-cookie ">=2.3.3" -request@2.88.0, request@^2.74.0, request@^2.78.0, request@^2.87.0, request@^2.88.0: +request@2.88.0, request@^2.74.0, request@^2.78.0, request@^2.83.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -13314,7 +13305,7 @@ xdg-basedir@^3.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= -xml2js@^0.4.17, xml2js@^0.4.9: +xml2js@^0.4.17: version "0.4.19" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==