From f7d1a8612265def3b9bb3a5cdac5a343aaa004ab Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Sun, 10 Nov 2024 12:24:14 +0100
Subject: [PATCH] feat(plugin-configs): put back commit hash to versioning

---
 packages/grafana-plugin-configs/package.json     | 1 -
 packages/grafana-plugin-configs/rspack.config.ts | 2 +-
 yarn.lock                                        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json
index 9cd2097f6c4..3ed4a849e44 100644
--- a/packages/grafana-plugin-configs/package.json
+++ b/packages/grafana-plugin-configs/package.json
@@ -8,7 +8,6 @@
   },
   "devDependencies": {
     "@grafana/tsconfig": "^2.0.0",
-    "@rspack/cli": "^1.0.0",
     "@rspack/core": "^1.0.0",
     "@swc/core": "1.10.12",
     "@types/eslint": "9.6.1",
diff --git a/packages/grafana-plugin-configs/rspack.config.ts b/packages/grafana-plugin-configs/rspack.config.ts
index cf49e542b6a..c11d4282f71 100644
--- a/packages/grafana-plugin-configs/rspack.config.ts
+++ b/packages/grafana-plugin-configs/rspack.config.ts
@@ -191,7 +191,7 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
           rules: [
             {
               search: /\%VERSION\%/g,
-              replace: getPackageJson().version,
+              replace: env.commit ? `${getPackageJson().version}-${env.commit}` : getPackageJson().version,
             },
             {
               search: /\%TODAY\%/g,
diff --git a/yarn.lock b/yarn.lock
index 7583354ca04..a1f900c62c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3536,7 +3536,6 @@ __metadata:
   resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs"
   dependencies:
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@rspack/cli": "npm:^1.0.0"
     "@rspack/core": "npm:^1.0.0"
     "@swc/core": "npm:1.10.12"
     "@types/eslint": "npm:9.6.1"