From 0bee38d5864f042e9710ae916b5296c566d7e5f1 Mon Sep 17 00:00:00 2001 From: Naz Gargol Date: Mon, 16 Sep 2019 18:22:49 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A1Bumped=20gscan=20version=20to=202.8?= =?UTF-8?q?.0=20(#11134)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no issue - This version contains --canary flag and new rules that come with it - The theme checks will be run against canary rules by default --- core/frontend/services/themes/validate.js | 10 +++++++--- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/frontend/services/themes/validate.js b/core/frontend/services/themes/validate.js index dd95224f02..e81da7eaec 100644 --- a/core/frontend/services/themes/validate.js +++ b/core/frontend/services/themes/validate.js @@ -17,16 +17,20 @@ const check = function check(theme, isZip) { if (isZip) { checkPromise = gscan.checkZip(theme, { - keepExtractedDir: true + keepExtractedDir: true, + checkVersion: 'canary' }); } else { - checkPromise = gscan.check(theme.path); + checkPromise = gscan.check(theme.path, { + checkVersion: 'canary' + }); } return checkPromise .then(function resultHandler(checkedTheme) { checkedTheme = gscan.format(checkedTheme, { - onlyFatalErrors: config.get('env') === 'production' + onlyFatalErrors: config.get('env') === 'production', + checkVersion: 'canary' }); return checkedTheme; diff --git a/package.json b/package.json index 182c459ece..01964de902 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ghost-storage-base": "0.0.3", "glob": "7.1.4", "got": "9.6.0", - "gscan": "2.7.0", + "gscan": "2.8.0", "html-to-text": "5.1.1", "image-size": "0.7.5", "intl": "1.2.5", diff --git a/yarn.lock b/yarn.lock index 83c8ba6a29..fbef9aa878 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3674,10 +3674,10 @@ grunt@1.0.4: path-is-absolute "~1.0.0" rimraf "~2.6.2" -gscan@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/gscan/-/gscan-2.7.0.tgz#c4ae05a4ca4ac9f178b060622b3531b39024bee4" - integrity sha512-FiweUbRoaVp9v8tVYsMKKoJWh3ycBIA/kev4YOgO4SwPEbYVk90MXTuvdp9pzUXwaJ+3BR76foBOkCNRnQgUgw== +gscan@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/gscan/-/gscan-2.8.0.tgz#e17cde875a0f4404588d52e7c60829b09c158ff9" + integrity sha512-kPHdwO6zkiRXdM/WvnsKQigjohZCtadfJMiqcX1LvnAx2VmvLwXpORgVjjHajXeZqB7XAPFdsQoKtlrEMgc6lQ== dependencies: "@tryghost/extract-zip" "1.6.6" "@tryghost/pretty-cli" "1.2.1"