express-hbs 2.4.0 → 2.4.1

package/.github/workflows/test.yml

@@ -3,20 +3,20 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
       - 'renovate/*'
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/'))
     strategy:
       matrix:
-        node: [ '10', '12' ]
+        node: [ 14, 16, 18 ]
     name: Node ${{ matrix.node }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
       - run: yarn

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2021 Barc, Inc., Ghost Foundation
+Copyright (c) 2012-2023 Barc, Inc., Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -301,4 +301,4 @@ Big thanks to all [CONTRIBUTORS](https://github.com/TryGhost/express-hbs/contrib
 
 The MIT License (MIT)
 
-Copyright (c) 2012-2021 Barc, Inc., Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2012-2023 Barc, Inc., Ghost Foundation - Released under the [MIT license](LICENSE).

package/lib/resolver.js

@@ -5,11 +5,17 @@ var Promise = require('bluebird');
 var generateId = require('./generate-id');
 
 var ID_LENGTH = 8;
-var ID_PREFIX = '__aSyNcId_<_';
+var ID_PREFIX = '__aSyNcId__';
+
+// NOTE: We must include a character which is escaped by Handlebars in the "async id"
+// This is so that when using an async helper "inline", such as {{asyncHelper "foo"}}
+// the content is correctly escaped depending on whether double or triple braces.
+var ID_ESCAPED_STRING = '<_';
+
 var ID_SUFFIX = '__';
 
 function resolve(cache, fn, context) {
-  var id = ID_PREFIX + generateId(ID_LENGTH) + ID_SUFFIX;
+  var id = ID_PREFIX + ID_ESCAPED_STRING + generateId(ID_LENGTH) + ID_SUFFIX;
   cache[id] = new Promise(function(passed, failed) {
     try {
       fn(context, function(res) {
@@ -31,6 +37,9 @@ function done(cache, callback) {
 }
 
 function hasResolvers(text) {
+  // NOTE: We specifically search the text for the ID_PREFIX **NOT** including the escapable character
+  // This is because that character can be escaped in the text, and lead us to not finding unresolved
+  // async helper outputs.
   if (text.search(ID_PREFIX) > 0) {
     return true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-hbs",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Express handlebars template engine complete with multiple layouts, partials and blocks.",
   "keywords": [
     "express4",
@@ -29,14 +29,14 @@
   "author": "Mario Gutierrez <mario@barc.com>",
   "license": "MIT",
   "devDependencies": {
-    "cookie-parser": "1.4.5",
-    "eslint": "7.24.0",
-    "express": "4.17.1",
-    "i18n": "0.13.2",
-    "mocha": "8.3.2",
+    "cookie-parser": "1.4.6",
+    "eslint": "8.47.0",
+    "express": "4.18.2",
+    "i18n": "0.15.1",
+    "mocha": "10.2.0",
     "nyc": "15.1.0",
-    "rewire": "5.0.0",
-    "supertest": "6.1.3"
+    "rewire": "7.0.0",
+    "supertest": "6.3.3"
   },
   "dependencies": {
     "bluebird": "^3.5.3",