diff --git a/package.json b/package.json index 21396240a3..4cf1d14021 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "bluebird": "3.5.1", "body-parser": "1.18.2", "bookshelf": "0.10.3", - "bookshelf-relations": "0.1.4", + "bookshelf-relations": "0.1.5", "brute-knex": "https://github.com/cobbspur/brute-knex/tarball/8979834383c7d3ee868d9e18d9ee6f71976dfec4", "bson-objectid": "1.2.2", "chalk": "1.1.3", @@ -52,7 +52,7 @@ "extract-zip": "1.6.6", "fs-extra": "3.0.1", "ghost-gql": "0.0.8", - "ghost-ignition": "2.8.17", + "ghost-ignition": "2.8.18", "ghost-storage-base": "0.0.1", "glob": "5.0.15", "got": "7.1.0", @@ -83,13 +83,13 @@ "passport-oauth2-client-password": "0.1.2", "path-match": "1.2.4", "rss": "1.2.2", - "sanitize-html": "1.16.3", - "semver": "5.4.1", + "sanitize-html": "1.17.0", + "semver": "5.5.0", "simple-dom": "0.3.2", "simple-html-tokenizer": "0.4.3", "superagent": "3.8.2", "unidecode": "0.1.8", - "uuid": "3.1.0", + "uuid": "3.2.1", "validator": "6.3.0", "xml": "1.0.1" }, @@ -97,7 +97,7 @@ "sqlite3": "3.1.13" }, "devDependencies": { - "eslint": "4.15.0", + "eslint": "4.16.0", "grunt": "1.0.1", "grunt-bg-shell": "2.3.3", "grunt-cli": "1.2.0", @@ -122,9 +122,9 @@ "mocha": "4.1.0", "nock": "9.1.6", "rewire": "3.0.2", - "should": "13.2.0", + "should": "13.2.1", "should-http": "0.1.1", - "sinon": "4.1.4", + "sinon": "4.2.1", "supertest": "3.0.0", "tmp": "0.0.33" }, diff --git a/yarn.lock b/yarn.lock index 5c72fe43d2..78fad44c1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -538,9 +538,9 @@ body-parser@~1.14.0: raw-body "~2.1.5" type-is "~1.6.10" -bookshelf-relations@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-0.1.4.tgz#b4ec82cff35b371747e4fc30d8c2acc2e333bc48" +bookshelf-relations@0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/bookshelf-relations/-/bookshelf-relations-0.1.5.tgz#514b3b83874113540634430b15a8d8ac7e203fe1" dependencies: bluebird "^3.4.1" ghost-ignition "^2.8.16" @@ -1382,7 +1382,7 @@ docker@~0.2.10: pygmentize-bundled "~2.1.0" watchr "~2.3.3" -doctrine@^2.0.2: +doctrine@^2.0.2, doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" dependencies: @@ -1559,7 +1559,49 @@ eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@4.15.0, eslint@^4.0.0: +eslint@4.16.0: + version "4.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.16.0.tgz#934ada9e98715e1d7bbfd6f6f0519ed2fab35cc1" + dependencies: + ajv "^5.3.0" + babel-code-frame "^6.22.0" + chalk "^2.1.0" + concat-stream "^1.6.0" + cross-spawn "^5.1.0" + debug "^3.1.0" + doctrine "^2.1.0" + eslint-scope "^3.7.1" + eslint-visitor-keys "^1.0.0" + espree "^3.5.2" + esquery "^1.0.0" + esutils "^2.0.2" + file-entry-cache "^2.0.0" + functional-red-black-tree "^1.0.1" + glob "^7.1.2" + globals "^11.0.1" + ignore "^3.3.3" + imurmurhash "^0.1.4" + inquirer "^3.0.6" + is-resolvable "^1.0.0" + js-yaml "^3.9.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.4" + minimatch "^3.0.2" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + path-is-inside "^1.0.2" + pluralize "^7.0.0" + progress "^2.0.0" + require-uncached "^1.0.3" + semver "^5.3.0" + strip-ansi "^4.0.0" + strip-json-comments "~2.0.1" + table "^4.0.1" + text-table "~0.2.0" + +eslint@^4.0.0: version "4.15.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.15.0.tgz#89ab38c12713eec3d13afac14e4a89e75ef08145" dependencies: @@ -2146,7 +2188,24 @@ ghost-gql@0.0.8: dependencies: lodash "^4.17.4" -ghost-ignition@2.8.17, ghost-ignition@^2.8.16: +ghost-ignition@2.8.18: + version "2.8.18" + resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-2.8.18.tgz#00ebdac98c3eb4be66741c6cb18398c224bdac3a" + dependencies: + bunyan "1.8.5" + bunyan-loggly "^1.3.1" + caller "1.0.1" + debug "^2.6.9" + find-root "1.0.0" + fs-extra "^3.0.1" + json-stringify-safe "^5.0.1" + lodash "^4.16.4" + moment "^2.15.2" + nconf "^0.10.0" + prettyjson "^1.1.3" + uuid "^3.0.0" + +ghost-ignition@^2.8.16: version "2.8.17" resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-2.8.17.tgz#0a43ca2dc084d6a816c566eccb73d028fa4de700" dependencies: @@ -4062,7 +4121,7 @@ natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" -nconf@0.10.0: +nconf@0.10.0, nconf@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2" dependencies: @@ -5257,10 +5316,11 @@ samsam@1.x: version "1.3.0" resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50" -sanitize-html@1.16.3: - version "1.16.3" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz#96c1b44a36ff7312e1c22a14b05274370ac8bd56" +sanitize-html@1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.17.0.tgz#5c95e57044604d4797367efd9152acaf5b087bb4" dependencies: + chalk "^2.3.0" htmlparser2 "^3.9.0" lodash.clonedeep "^4.5.0" lodash.escaperegexp "^4.1.2" @@ -5281,10 +5341,14 @@ secure-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca" -"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" +semver@5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -5400,9 +5464,9 @@ 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.0: - version "13.2.0" - resolved "https://registry.yarnpkg.com/should/-/should-13.2.0.tgz#e4a29009fa9de21b62e07cfacdf17b9a915da820" +should@13.2.1: + version "13.2.1" + resolved "https://registry.yarnpkg.com/should/-/should-13.2.1.tgz#84e6ebfbb145c79e0ae42307b25b3f62dcaf574e" dependencies: should-equal "^2.0.0" should-format "^3.0.3" @@ -5441,16 +5505,16 @@ simple-html-tokenizer@0.4.3: rai "~0.1.11" xoauth2 "~0.1.8" -sinon@4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.1.4.tgz#36bb237bae38ddf9cc92dcc1b16c51e7785bbc9c" +sinon@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.2.1.tgz#3664e90ea4bccec6ebde3c06e3da8179983371d9" dependencies: diff "^3.1.0" formatio "1.2.0" lodash.get "^4.4.2" lolex "^2.2.0" nise "^1.2.0" - supports-color "^4.4.0" + supports-color "^5.1.0" type-detect "^4.0.5" slash@^1.0.0: @@ -5756,7 +5820,7 @@ supports-color@^3.1.0, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^4.0.0, supports-color@^4.4.0: +supports-color@^4.0.0: version "4.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" dependencies: @@ -6127,7 +6191,11 @@ utils-merge@1.0.1, utils-merge@1.x.x: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" -uuid@3.1.0, 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" + +uuid@^3.0.0, uuid@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"