gscan 4.30.0 → 4.31.0

package/lib/checks/001-deprecations.js

@@ -17,9 +17,9 @@ const checkDeprecations = function checkDeprecations(theme, options) {
 
     _.each(ruleSet, function (check, ruleCode) {
         _.each(theme.files, function (themeFile) {
-            const template = themeFile.file.match(/[^/\\]+\.hbs$/);
+            const template = themeFile.file.match(/^.+\.hbs$/);
             const skipTemplateCheck = check.notValidIn && check.notValidIn.match(template);
-            let css = themeFile.file.match(/\.css/);
+            let css = themeFile.file.match(/\.css$/);
             let cssDeprecations;
 
             if (template && !check.css && !skipTemplateCheck) {

package/lib/checks/002-comment-id.js

@@ -16,7 +16,7 @@ const checkCommentID = function checkCommentID(theme, options) {
     });
     _.each(ruleSet, function (check, ruleCode) {
         _.each(theme.files, function (themeFile) {
-            var template = themeFile.file.match(/[^/\\]+.hbs$/);
+            var template = themeFile.file.match(/\.hbs$/);
 
             if (template) {
                 if (themeFile.content.match(check.regex)) {

package/lib/checks/005-template-compile.js

@@ -114,7 +114,7 @@ const checkTemplatesCompile = function checkTemplatesCompile(theme, options) {
         });
 
         _.each(theme.files, function (themeFile) {
-            let templateTest = themeFile.file.match(/^[^/\\]+.hbs$/);
+            let templateTest = themeFile.file.match(/(?<!partials\/.+?)\.hbs$/);
 
             if (templateTest) {
                 processFile(linter, themeFile);

package/lib/checks/080-helper-usage.js

@@ -17,7 +17,7 @@ module.exports = function checkUsage(theme, options) {
     });
     _.each(ruleSet, function (check, ruleCode) {
         _.each(theme.files, function (themeFile) {
-            var template = themeFile.file.match(/[^/\\]+.hbs$/);
+            var template = themeFile.file.match(/\.hbs$/);
             const validApi = check.validInAPI ? check.validInAPI.includes(targetApiVersion) : true;
             if (template) {
                 if (validApi && themeFile.content.match(check.regex)) {

package/lib/checks/090-template-syntax.js

@@ -78,7 +78,7 @@ const checkTemplatesCompile = function checkTemplatesCompile(theme, options) {
         });
 
         _.each(theme.files, function (themeFile) {
-            let templateTest = themeFile.file.match(/^[^/\\]+.hbs$/);
+            let templateTest = themeFile.file.match(/(?<!partials\/.+?)\.hbs$/);
 
             if (templateTest) {
                 processFile(linter, themeFile);

package/lib/checks/100-custom-template-settings-usage.js

@@ -123,7 +123,7 @@ const ruleImplementations = {
             result.customThemeSettings = new Set();
         },
         eachFile: ({file, theme, log, result}) => {
-            let templateTest = file.file.match(/^[^/\\]+.hbs$/);
+            let templateTest = file.file.match(/(?<!partials\/.+?)\.hbs$/);
 
             if (templateTest) {
                 parseWithAST({file, theme, rules: {

package/lib/read-zip.js

@@ -15,7 +15,7 @@ const resolveBaseDir = (zipPath) => {
 
             if (!err && !_.isEmpty(matches)) {
                 debug('Found matches', matches);
-                matchedPath = matches[0].replace(/index.hbs$/, '');
+                matchedPath = matches[0].replace(/index\.hbs$/, '');
                 zipPath = path.join(zipPath, matchedPath).replace(/\/$/, '');
             }
 

package/lib/specs/canary.js

@@ -78,7 +78,7 @@ let rules = {
     'GS090-NO-PRICE-DATA-CURRENCY-GLOBAL': {
         level: 'error',
         fatal: true,
-        rule: 'Replace <code>@price.currency</code> with <code>{{#get "tiers"}}</code> and <code>{{currency}}</code> or <code>{{#foreach @member.subscriptions}}</code> and <code>{{plan.currency}}</code>',
+        rule: 'Replace <code>{{@price.currency}}</code> with <code>{{#get "tiers"}}</code> and <code>{{currency}}</code> or <code>{{#foreach @member.subscriptions}}</code> and <code>{{plan.currency}}</code>',
         details: oneLineTrim`There is no longer a global <code>@price</code> object. You need to use either <code>{{#get "tiers"}}</code> to fetch all tiers and use the <code>{{currency}}</code> property of a tier<br>
         or use <code>{{#foreach @member.subscriptions}}</code> to fetch an individual member's subscriptions, and use the <code>{{plan.currency}}</code> property from the subscription.<br>
         Find more information about the <code>{{price}}</code> helper <a href="${docsBaseUrl}members/price/" target=_blank>here</a>.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.30.0",
+  "version": "4.31.0",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",
@@ -43,11 +43,11 @@
     "@sentry/node": "6.19.7",
     "@tryghost/config": "0.2.2",
     "@tryghost/debug": "0.1.11",
-    "@tryghost/errors": "1.2.12",
-    "@tryghost/logging": "2.1.8",
+    "@tryghost/errors": "1.2.13",
+    "@tryghost/logging": "2.2.2",
     "@tryghost/pretty-cli": "1.2.28",
     "@tryghost/server": "0.1.4",
-    "@tryghost/zip": "1.1.25",
+    "@tryghost/zip": "1.1.26",
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
     "common-tags": "1.8.2",