ashpie
/
swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Fix core version grabbing

This commit is contained in:
Alice Gaudon 2020-07-08 11:09:27 +02:00
parent afdfadd34e
commit 724d59daba
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "wms-core", "name": "wms-core",
"version": "0.10.21", "version": "0.10.22",
"description": "Node web framework", "description": "Node web framework",
"repository": "git@gitlab.com:ArisuOngaku/wms-core.git", "repository": "git@gitlab.com:ArisuOngaku/wms-core.git",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

12
src/components/NunjucksComponent.ts
View File

@ -14,6 +14,16 @@ export default class NunjucksComponent extends ApplicationComponent<void> {
} }
public async start(app: Express, router: Router): Promise<void> { public async start(app: Express, router: Router): Promise<void> {
let coreVersion = 'unknown';
try {
coreVersion = require('../../package.json').version;
} catch (e) {
try {
coreVersion = require('../package.json').version;
} catch (e) {
}
}
const env = nunjucks.configure(this.viewsPath, { const env = nunjucks.configure(this.viewsPath, {
autoescape: true, autoescape: true,
express: app, express: app,
@ -26,7 +36,7 @@ export default class NunjucksComponent extends ApplicationComponent<void> {
return path; return path;
}) })
.addGlobal('app_version', this.app!.getVersion()) .addGlobal('app_version', this.app!.getVersion())
.addGlobal('core_version', require('../../package.json').version) .addGlobal('core_version', coreVersion)
.addFilter('hex', (v: number) => { .addFilter('hex', (v: number) => {
return v.toString(16); return v.toString(16);
}); });