gscan 4.25.0 → 4.25.3

package/app/index.js

@@ -4,7 +4,7 @@ const hbs = require('express-hbs');
 const multer = require('multer');
 const server = require('@tryghost/server');
 const config = require('@tryghost/config');
-const errors = require('@tryghost/ignition-errors');
+const errors = require('@tryghost/errors');
 const gscan = require('../lib');
 const fs = require('fs-extra');
 const logRequest = require('./middlewares/log-request');

package/app/middlewares/upload-validation.js

@@ -1,7 +1,7 @@
 // NOTE: this middleware was extracted from Ghost core validation for theme uploads
 //       might be useful to unify this logic in the future if it's extracted to separate module
 const path = require('path');
-const errors = require('@tryghost/ignition-errors');
+const errors = require('@tryghost/errors');
 
 const checkFileExists = function checkFileExists(fileData) {
     return !!(fileData.mimetype && fileData.path);

package/lib/checker.js

@@ -1,7 +1,7 @@
 const Promise = require('bluebird');
 const _ = require('lodash');
 const requireDir = require('require-dir');
-const errors = require('@tryghost/ignition-errors');
+const errors = require('@tryghost/errors');
 const versions = require('./utils').versions;
 
 // An object containing helpers as keys and their labs flag as values
@@ -92,7 +92,7 @@ const checkZip = async function checkZip(path, options) {
             return theme;
         }
     } catch (error) {
-        if (!errors.utils.isIgnitionError(error)) {
+        if (!errors.utils.isGhostError(error)) {
             throw new errors.ValidationError({
                 message: 'Failed to check zip file',
                 help: 'Your zip file might be corrupted, try unzipping and zipping again.',

package/lib/read-zip.js

@@ -4,7 +4,7 @@ const Promise = require('bluebird');
 const os = require('os');
 const glob = require('glob');
 const {extract} = require('@tryghost/zip');
-const errors = require('@tryghost/ignition-errors');
+const errors = require('@tryghost/errors');
 const uuid = require('uuid');
 const _ = require('lodash');
 

package/lib/specs/canary.js

@@ -8,7 +8,7 @@ const prevDocsBaseUrlRegEx = new RegExp(prevDocsBaseUrl, 'g');
 
 const previousKnownHelpers = previousSpec.knownHelpers;
 const previousTemplates = previousSpec.templates;
-const previousRules = previousSpec.rules;
+const previousRules = _.cloneDeep(previousSpec.rules);
 
 // assign new or overwrite existing knownHelpers, templates, or rules here:
 let knownHelpers = [];

package/lib/specs/v4.js

@@ -8,7 +8,7 @@ const prevDocsBaseUrlRegEx = new RegExp(prevDocsBaseUrl, 'g');
 
 const previousKnownHelpers = previousSpec.knownHelpers;
 const previousTemplates = previousSpec.templates;
-const previousRules = previousSpec.rules;
+const previousRules = _.cloneDeep(previousSpec.rules);
 
 function cssCardRule(cardName, className) {
     return {
@@ -192,7 +192,7 @@ let rules = {
         level: 'warning',
         rule: 'The <code>{{@product}}</code> data helper should be replaces with <code>{{#get "tiers"}}</code>',
         details: oneLineTrim`The <code>{{@product}}</code> data helper has been deprecated in favor of <code>{{#get "tiers"}}</code><br>
-        The <code>{{@product}}</code> data helper was removed in Ghost v5 and should not be used.
+        The <code>{{@product}}</code> data helper will be removed in Ghost v5 and should not be used.
         Find more information about the <code>{{#get "tiers"}}</code> property <a href="${docsBaseUrl}helpers/tiers/" target=_blank>here</a>.`,
         helper: '{{@product}}'
     },
@@ -200,7 +200,7 @@ let rules = {
         level: 'warning',
         rule: 'The <code>{{@products}}</code> data helper should be replaces with <code>{{#get "tiers"}}</code>',
         details: oneLineTrim`The <code>{{@products}}</code> data helper has been deprecated in favor of <code>{{#get "tiers"}}</code><br>
-        The <code>{{@products}}</code> data helper was removed in Ghost v5 and should not be used.
+        The <code>{{@products}}</code> data helper will be removed in Ghost v5 and should not be used.
         Find more information about the <code>{{#get "tiers"}}</code> property <a href="${docsBaseUrl}helpers/tiers/" target=_blank>here</a>.`,
         helper: '{{@products}}'
     },
@@ -320,7 +320,11 @@ templates = _.union(previousTemplates, templates);
 // as well as adding any new rule to the spec.
 // Furthermore, replace the usage of the old doc URLs that we're linking to, with the
 // new version.
-rules = _.each(_.merge({}, previousRules, rules), function replaceDocsUrl(value) {
+delete previousRules['GS002-DISQUS-ID'];
+delete previousRules['GS002-ID-HELPER'];
+
+rules = _.merge({}, previousRules, rules);
+rules = _.each(rules, function replaceDocsUrl(value) {
     value.details = value.details.replace(prevDocsBaseUrlRegEx, docsBaseUrl);
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.25.0",
+  "version": "4.25.3",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",
@@ -43,11 +43,11 @@
     "@sentry/node": "6.19.2",
     "@tryghost/config": "0.2.2",
     "@tryghost/debug": "0.1.11",
-    "@tryghost/ignition-errors": "0.1.8",
-    "@tryghost/logging": "2.1.0",
+    "@tryghost/errors": "1.2.7",
+    "@tryghost/logging": "2.1.1",
     "@tryghost/pretty-cli": "1.2.24",
     "@tryghost/server": "0.1.4",
-    "@tryghost/zip": "1.1.20",
+    "@tryghost/zip": "1.1.22",
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
     "common-tags": "1.8.2",