From 1f6142dd8fa0d733c3f8da389b4e7810ce869747 Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Wed, 12 Feb 2025 15:14:43 +0000
Subject: [PATCH] Chore: Remove betterer:merge and revert previous changes to
 betterer:stats (#98609)

---
 package.json                                          |  3 +--
 ...reportBettererStats.mjs => reportBettererStats.ts} | 11 +++++------
 scripts/cli/tsconfig.json                             |  5 ++++-
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename scripts/cli/{reportBettererStats.mjs => reportBettererStats.ts} (74%)

diff --git a/package.json b/package.json
index 189fc00835e..45e0a3fc92d 100644
--- a/package.json
+++ b/package.json
@@ -56,8 +56,7 @@
     "ci:test-frontend": "yarn run test:ci",
     "i18n:stats": "node ./scripts/cli/reportI18nStats.mjs",
     "betterer": "betterer --tsconfig ./scripts/cli/tsconfig.json",
-    "betterer:merge": "betterer merge --tsconfig ./scripts/cli/tsconfig.json",
-    "betterer:stats": "node ./scripts/cli/reportBettererStats.mjs",
+    "betterer:stats": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/reportBettererStats.ts",
     "betterer:issues": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateBettererIssues.ts",
     "plugin:build": "nx run-many -t build --projects='tag:scope:plugin'",
     "plugin:build:commit": "nx run-many -t build:commit --projects='tag:scope:plugin'",
diff --git a/scripts/cli/reportBettererStats.mjs b/scripts/cli/reportBettererStats.ts
similarity index 74%
rename from scripts/cli/reportBettererStats.mjs
rename to scripts/cli/reportBettererStats.ts
index 0f1eda1d646..135f98c7752 100644
--- a/scripts/cli/reportBettererStats.mjs
+++ b/scripts/cli/reportBettererStats.ts
@@ -1,8 +1,7 @@
-// @ts-check
 import { betterer } from '@betterer/betterer';
-import _ from 'lodash';
+import { camelCase } from 'lodash';
 
-function logStat(name, value) {
+function logStat(name: string, value: number) {
   // Note that this output format must match the parsing in ci-frontend-metrics.sh
   // which expects the two values to be separated by a space
   console.log(`${name} ${value}`);
@@ -13,11 +12,11 @@ async function main() {
 
   for (const testResults of results.resultSummaries) {
     const countByMessage = {};
-    const name = _.camelCase(testResults.name);
+    const name = camelCase(testResults.name);
     Object.values(testResults.details)
       .flatMap((v) => v)
       .forEach((detail) => {
-        const message = _.camelCase(detail.message);
+        const message = camelCase(detail.message);
         const metricName = `${name}_${message}`;
         if (metricName in countByMessage) {
           countByMessage[metricName]++;
@@ -26,7 +25,7 @@ async function main() {
         }
       });
 
-    for (const [metricName, count] of Object.entries(countByMessage)) {
+    for (const [metricName, count] of Object.entries<number>(countByMessage)) {
       logStat(metricName, count);
     }
   }
diff --git a/scripts/cli/tsconfig.json b/scripts/cli/tsconfig.json
index 9ad59a649d1..0d18e875c5e 100644
--- a/scripts/cli/tsconfig.json
+++ b/scripts/cli/tsconfig.json
@@ -6,6 +6,9 @@
   "extends": "../../tsconfig.json",
   "ts-node": {
     "transpileOnly": true,
-    "swc": true
+    "swc": true,
+    "compilerOptions": {
+      "module": "commonjs"
+    }
   }
 }