diff --git a/core/test/utils/fixtures/themes/valid.zip b/core/test/utils/fixtures/themes/valid.zip index 853f135f54..4cd9e644d7 100644 Binary files a/core/test/utils/fixtures/themes/valid.zip and b/core/test/utils/fixtures/themes/valid.zip differ diff --git a/package.json b/package.json index 092fff9701..91bb21f7bc 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ghost-storage-base": "0.0.3", "glob": "5.0.15", "got": "8.3.2", - "gscan": "2.5.0", + "gscan": "2.6.0", "html-to-text": "4.0.0", "image-size": "0.6.3", "intl": "1.2.5", diff --git a/yarn.lock b/yarn.lock index 7bc459b3f5..94316d6998 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1246,6 +1246,11 @@ commander@~2.17.1: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" +common-tags@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" + integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== + compare-ver@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/compare-ver/-/compare-ver-2.0.2.tgz#8ecb8eb9dbf23ff2d87c56e74cbbb2cb7ffd9d7a" @@ -2535,16 +2540,14 @@ fs-extra@3.0.1, fs-extra@^3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" -fs-extra@^0.30.0: - version "0.30.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" - integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A= +fs-extra@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== dependencies: graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - path-is-absolute "^1.0.0" - rimraf "^2.2.8" + jsonfile "^4.0.0" + universalify "^0.1.0" fs-minipass@^1.2.5: version "1.2.5" @@ -2843,7 +2846,7 @@ got@^7.1.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -graceful-fs@^4.1.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.1.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" @@ -3015,25 +3018,26 @@ grunt@1.0.3: path-is-absolute "~1.0.0" rimraf "~2.6.2" -gscan@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/gscan/-/gscan-2.5.0.tgz#9203fe36cb219a22d5fbd0e3aa98e3ebd07f5e32" - integrity sha512-M2igaOAPaUZXEVASPAqZBQZL/W4cXChKOsrMs5W6a0QcyodvBsZxNZj1otFdeZALM23JHWIZ70Llryy478LTcQ== +gscan@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/gscan/-/gscan-2.6.0.tgz#3fbbcefa9fcdb386cc1bf6fcc93e3f86d07fbd2c" + integrity sha512-qMzGiVUDXpJABqLw0OXbKfBuyLMDSc5XMFD5qE1Ri9F3HGuR7xl1XT3sD0u9WIu8nFlYwM3tk42PHDvmKPyQtg== dependencies: "@tryghost/extract-zip" "1.6.6" "@tryghost/pretty-cli" "1.2.1" bluebird "^3.4.6" - chalk "^1.1.1" + chalk "^2.0.0" + common-tags "^1.8.0" express "^4.16.2" express-hbs "1.1.1" - fs-extra "^0.30.0" + fs-extra "^7.0.0" ghost-ignition "3.1.0" glob "^7.0.5" lodash "^4.17.11" multer "^1.1.0" pluralize "^7.0.0" require-dir "^1.0.0" - semver "^5.3.0" + semver "^6.0.0" upath "^1.1.0" uuid "^3.0.0" validator "^6.3.0" @@ -3771,18 +3775,19 @@ json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0. version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + jsonpath@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/jsonpath/-/jsonpath-1.0.0.tgz#45cd9d4c4d0d6825d90bd7e40f83f1182b13dd07" @@ -3901,12 +3906,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - optionalDependencies: - graceful-fs "^4.1.9" - knex-migrator@3.2.5: version "3.2.5" resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-3.2.5.tgz#bf5649f5b3ca55d50d0dd634027863c9e10e408d" @@ -6148,7 +6147,7 @@ rewire@4.0.1: dependencies: eslint "^4.19.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2: +rimraf@2, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" dependencies: @@ -6249,6 +6248,11 @@ secure-keys@^1.0.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" +semver@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65" + integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ== + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"