Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Merged v5.74.5 into main

Browse source
This commit is contained in:
Ghost CI 2023-11-28 12:58:26 +00:00
commit be6916f066
5 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/admin/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "ghost-admin", "name": "ghost-admin",
"version": "5.74.4", "version": "5.74.5",
"description": "Ember.js admin client for Ghost", "description": "Ember.js admin client for Ghost",
"author": "Ghost Foundation", "author": "Ghost Foundation",
"homepage": "http://ghost.org", "homepage": "http://ghost.org",

2
ghost/core/core/frontend/services/theme-engine/active.js
View file

@ -112,7 +112,7 @@ class ActiveTheme {
siteApp.cache = {}; siteApp.cache = {};
// Set the views and engine // Set the views and engine
siteApp.set('views', this.path); siteApp.set('views', this.path);
siteApp.engine('hbs', engine.configure(this.partialsPath)); siteApp.engine('hbs', engine.configure(this.partialsPath, this.path));
this._mounted = true; this._mounted = true;
} }

5
ghost/core/core/frontend/services/theme-engine/engine.js
View file

@ -9,12 +9,13 @@ if (config.get('env') !== 'production') {
instance.escapeExpression = instance.handlebars.Utils.escapeExpression; instance.escapeExpression = instance.handlebars.Utils.escapeExpression;
instance.configure = function configure(partialsPath) { instance.configure = function configure(partialsPath, themePath) {
const hbsOptions = { const hbsOptions = {
partialsDir: [config.get('paths').helperTemplates], partialsDir: [config.get('paths').helperTemplates],
onCompile: function onCompile(exhbs, source) { onCompile: function onCompile(exhbs, source) {
return exhbs.handlebars.compile(source, {preventIndent: true}); return exhbs.handlebars.compile(source, {preventIndent: true});
} },
restrictLayoutsTo: themePath
}; };
if (partialsPath) { if (partialsPath) {

4
ghost/core/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "ghost", "name": "ghost",
"version": "5.74.4", "version": "5.74.5",
"description": "The professional publishing platform", "description": "The professional publishing platform",
"author": "Ghost Foundation", "author": "Ghost Foundation",
"homepage": "https://ghost.org", "homepage": "https://ghost.org",
@ -178,7 +178,7 @@
"downsize": "0.0.8", "downsize": "0.0.8",
"express": "4.18.2", "express": "4.18.2",
"express-brute": "1.0.1", "express-brute": "1.0.1",
"express-hbs": "2.4.2", "express-hbs": "2.5.0",
"express-jwt": "8.4.1", "express-jwt": "8.4.1",
"express-lazy-router": "1.0.6", "express-lazy-router": "1.0.6",
"express-query-boolean": "2.0.0", "express-query-boolean": "2.0.0",

13
yarn.lock
View file

@ -17331,7 +17331,18 @@ express-brute@1.0.1, express-brute@^1.0.1:
long-timeout "~0.1.1" long-timeout "~0.1.1"
underscore "~1.8.3" underscore "~1.8.3"
express-hbs@2.4.2, express-hbs@^2.4.2: express-hbs@2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/express-hbs/-/express-hbs-2.5.0.tgz#28ed0b8507bb7bcceb102b63fe863585f13a4d89"
integrity sha512-i2O1ZBwKO32KF0MePnkgYHsAAILr9H9Sp5GoGp9JWz/qhsBfTMSq9VF1pN109DHysPX6YO88y7B+f6xnEEF/mg==
dependencies:
handlebars "^4.7.7"
lodash "^4.17.21"
readdirp "^3.6.0"
optionalDependencies:
js-beautify "^1.13.11"
express-hbs@^2.4.2:
version "2.4.2" version "2.4.2"
resolved "https://registry.yarnpkg.com/express-hbs/-/express-hbs-2.4.2.tgz#9bc18a08d89eea2aaea94b2e5c38859e86a99019" resolved "https://registry.yarnpkg.com/express-hbs/-/express-hbs-2.4.2.tgz#9bc18a08d89eea2aaea94b2e5c38859e86a99019"
integrity sha512-lFtWrsAGprvzPrVlfNE6WGJnyE+o/UxsTpl2CWcJt1CRYaUwht9+BkfKOWqs+xG0zhhRAm/bsYEyQ4EwA+ovSw== integrity sha512-lFtWrsAGprvzPrVlfNE6WGJnyE+o/UxsTpl2CWcJt1CRYaUwht9+BkfKOWqs+xG0zhhRAm/bsYEyQ4EwA+ovSw==