From bfcbc8cc8a588eca267c75bfb5a20369d6b7decf Mon Sep 17 00:00:00 2001
From: rozetko <rozetko@corpglory.com>
Date: Fri, 10 Feb 2023 15:53:50 +0300
Subject: [PATCH] fix missing version in release version

---
 build/webpack.base.conf.js | 6 ++++++
 src/globals.d.ts           | 1 +
 src/routes/connect.ts      | 4 ++--
 src/routes/status.ts       | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 src/globals.d.ts

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 488cafe..1561037 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -1,3 +1,4 @@
+const webpack = require('webpack');
 const path = require('path');
 
 
@@ -21,6 +22,11 @@ module.exports = {
   resolve: {
     extensions: [".ts", ".js"]
   },
+  plugins: [
+    new webpack.DefinePlugin({
+      __VERSION__: JSON.stringify(require(resolve('./package.json')).version)
+    })
+  ],
   module: {
     rules: [
       {
diff --git a/src/globals.d.ts b/src/globals.d.ts
new file mode 100644
index 0000000..415c2c8
--- /dev/null
+++ b/src/globals.d.ts
@@ -0,0 +1 @@
+declare const __VERSION__: string;
diff --git a/src/routes/connect.ts b/src/routes/connect.ts
index 0e71fe8..03f7111 100644
--- a/src/routes/connect.ts
+++ b/src/routes/connect.ts
@@ -21,7 +21,7 @@ async function checkConnection(req, res) {
     return;
   }
 
-  res.status(200).send({ version: process.env.npm_package_version });
+  res.status(200).send({ version: __VERSION__ });
 }
 
 async function connectPlugin(req, res) {
@@ -44,7 +44,7 @@ async function connectPlugin(req, res) {
 
   console.log(`Grafana at ${grafanaUrl} is connected`);
 
-  res.status(200).send({ version: process.env.npm_package_version });
+  res.status(200).send({ version: __VERSION__ });
 }
 
 export const router = express.Router();
diff --git a/src/routes/status.ts b/src/routes/status.ts
index 65016a5..4200c73 100644
--- a/src/routes/status.ts
+++ b/src/routes/status.ts
@@ -2,7 +2,7 @@ import * as express from 'express'
 
 
 async function getStatus(req, res) {
-  res.status(200).send({ version: process.env.npm_package_version });
+  res.status(200).send({ version: __VERSION__ });
 }
 
 export const router = express.Router();