From 724d59daba6a1b12b7854cfb535df9f39791a469 Mon Sep 17 00:00:00 2001
From: Alice Gaudon <alice@gaudon.pro>
Date: Wed, 8 Jul 2020 11:09:27 +0200
Subject: [PATCH] Fix core version grabbing

---
 package.json                        |  2 +-
 src/components/NunjucksComponent.ts | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7d04bfe..b17fd94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wms-core",
-  "version": "0.10.21",
+  "version": "0.10.22",
   "description": "Node web framework",
   "repository": "git@gitlab.com:ArisuOngaku/wms-core.git",
   "author": "Alice Gaudon <alice@gaudon.pro>",
diff --git a/src/components/NunjucksComponent.ts b/src/components/NunjucksComponent.ts
index ce356e8..f49c860 100644
--- a/src/components/NunjucksComponent.ts
+++ b/src/components/NunjucksComponent.ts
@@ -14,6 +14,16 @@ export default class NunjucksComponent extends ApplicationComponent<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, {
             autoescape: true,
             express: app,
@@ -26,7 +36,7 @@ export default class NunjucksComponent extends ApplicationComponent<void> {
                 return path;
             })
             .addGlobal('app_version', this.app!.getVersion())
-            .addGlobal('core_version', require('../../package.json').version)
+            .addGlobal('core_version', coreVersion)
             .addFilter('hex', (v: number) => {
                 return v.toString(16);
             });