diff --git a/package.json b/package.json index 3a2ccd866e..dc57a65b72 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "body-parser": "1.18.2", "bookshelf": "0.13.3", "bookshelf-relations": "0.2.0", - "brute-knex": "https://github.com/cobbspur/brute-knex/tarball/4feff38ad2e4ccd8d9de05f04a2ad7a5eb3e0ac1", + "brute-knex": "3.0.0", "bson-objectid": "1.2.2", "chalk": "1.1.3", "cheerio": "0.22.0", diff --git a/yarn.lock b/yarn.lock index 3aab11b3cd..5f9130cfbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -605,14 +605,14 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -"brute-knex@https://github.com/cobbspur/brute-knex/tarball/4feff38ad2e4ccd8d9de05f04a2ad7a5eb3e0ac1": - version "2.0.0" - resolved "https://github.com/cobbspur/brute-knex/tarball/4feff38ad2e4ccd8d9de05f04a2ad7a5eb3e0ac1#80eb9c3d1d101477c36d081d63e03b8ff74ac7b6" +brute-knex@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/brute-knex/-/brute-knex-3.0.0.tgz#47e0bda1725473ce44be49e4890d686b93aed740" dependencies: - express "^4.14.0" + eslint "4.19.1" express-brute "^1.0.0" - knex "^0.14.2" - lodash "^4.16.3" + knex "0.14.6" + should "^13.2.1" bson-objectid@1.2.2: version "1.2.2" @@ -761,7 +761,7 @@ chalk@2.3.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" -chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2: +chalk@2.3.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" dependencies: @@ -956,7 +956,7 @@ commander@2.9.0: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.13.0, commander@^2.9.0, commander@~2.15.0: +commander@^2.13.0, commander@^2.15.1, commander@^2.9.0, commander@~2.15.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" @@ -1600,7 +1600,7 @@ eslint@4.19.0: table "4.0.2" text-table "~0.2.0" -eslint@^4.0.0: +eslint@4.19.1, eslint@^4.0.0: version "4.19.1" resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" dependencies: @@ -1747,7 +1747,7 @@ express-hbs@1.0.4, express-hbs@^1.0.3: js-beautify "1.6.8" readdirp "2.1.0" -express@4.16.3, express@^4.14.0, express@^4.16.2: +express@4.16.3, express@^4.16.2: version "4.16.3" resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53" dependencies: @@ -3362,6 +3362,29 @@ knex@0.14.4, knex@^0.14.2: uuid "^3.2.1" v8flags "^3.0.1" +knex@0.14.6: + version "0.14.6" + resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e" + dependencies: + babel-runtime "^6.26.0" + bluebird "^3.5.1" + chalk "2.3.2" + commander "^2.15.1" + debug "3.1.0" + inherits "~2.0.3" + interpret "^1.1.0" + liftoff "2.5.0" + lodash "^4.17.5" + minimist "1.2.0" + mkdirp "^0.5.1" + pg-connection-string "2.0.0" + readable-stream "2.3.6" + safe-buffer "^5.1.1" + tarn "^1.1.4" + tildify "1.2.0" + uuid "^3.2.1" + v8flags "^3.0.2" + lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" @@ -3557,7 +3580,7 @@ lodash@4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" -lodash@4.17.5, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.2, lodash@^4.16.3, lodash@^4.16.4, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.7.0, lodash@^4.8.0, lodash@~4.17.4, lodash@~4.17.5: +lodash@4.17.5, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.14.2, lodash@^4.16.4, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.7.0, lodash@^4.8.0, lodash@~4.17.4, lodash@~4.17.5: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" @@ -4954,6 +4977,18 @@ readable-stream@2.3.3: string_decoder "~1.0.3" util-deprecate "~1.0.1" +readable-stream@2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" @@ -5340,7 +5375,7 @@ should-util@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.0.tgz#c98cda374aa6b190df8ba87c9889c2b4db620063" -should@13.2.1: +should@13.2.1, should@^13.2.1: version "13.2.1" resolved "https://registry.yarnpkg.com/should/-/should-13.2.1.tgz#84e6ebfbb145c79e0ae42307b25b3f62dcaf574e" dependencies: @@ -5622,6 +5657,12 @@ string_decoder@~1.0.3: dependencies: safe-buffer "~5.1.0" +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + dependencies: + safe-buffer "~5.1.0" + stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -5775,7 +5816,7 @@ tar@^4: safe-buffer "^5.1.1" yallist "^3.0.2" -tarn@^1.1.2: +tarn@^1.1.2, tarn@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/tarn/-/tarn-1.1.4.tgz#aeeb85964b1afa0bbf381359c1167df237c27b6a" @@ -6063,7 +6104,7 @@ uuid@3.2.1, uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" -v8flags@^3.0.1: +v8flags@^3.0.1, v8flags@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.0.2.tgz#ad6a78a20a6b23d03a8debc11211e3cc23149477" dependencies: