From 457d292b0e259daa6855a29bddc41ab537df9059 Mon Sep 17 00:00:00 2001
From: Dominik Broj <dominik.broj@grafana.com>
Date: Fri, 26 Jul 2024 17:59:55 +0200
Subject: [PATCH] fix tests and types generator (#4746)

# What this PR does
Fix unit tests from irm run
Fix types generator after Node.js upgrade

## Which issue(s) this PR closes

Related to https://github.com/grafana/irm/issues/25

<!--
*Note*: If you want the issue to be auto-closed once the PR is merged,
change "Related to" to "Closes" in the line above.
If you have more than one GitHub issue that this PR closes, be sure to
preface
each issue link with a [closing
keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
This ensures that the issue(s) are auto-closed once the PR has been
merged.
-->

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [x] Added the relevant release notes label (see labels prefixed w/
`release:`). These labels dictate how your PR will
    show up in the autogenerated release notes.
---
 grafana-plugin/jest.config.js                                 | 4 ----
 grafana-plugin/package.json                                   | 1 +
 .../src/network/oncall-api/types-generator/package.json       | 2 +-
 .../{types-generator.tsconfig.json => tsconfig.json}          | 4 +++-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename grafana-plugin/src/network/oncall-api/types-generator/{types-generator.tsconfig.json => tsconfig.json} (65%)

diff --git a/grafana-plugin/jest.config.js b/grafana-plugin/jest.config.js
index ba7f8e43..7caeae3e 100644
--- a/grafana-plugin/jest.config.js
+++ b/grafana-plugin/jest.config.js
@@ -1,5 +1,3 @@
-const esModules = ['@grafana', 'uplot', 'ol', 'd3', 'react-colorful', 'uuid', 'openapi-fetch'].join('|');
-
 module.exports = {
   ...require('./.config/jest.config'),
   testEnvironment: 'jsdom',
@@ -7,8 +5,6 @@ module.exports = {
   moduleDirectories: ['node_modules', 'src'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'd.ts', 'cjs'],
 
-  transformIgnorePatterns: [`/node_modules/(?!${esModules})`],
-
   moduleNameMapper: {
     'grafana/app/(.*)': '<rootDir>/src/jest/grafanaMock.ts',
     'openapi-fetch': '<rootDir>/src/jest/openapiFetchMock.ts',
diff --git a/grafana-plugin/package.json b/grafana-plugin/package.json
index 4a11325e..5bc1b554 100644
--- a/grafana-plugin/package.json
+++ b/grafana-plugin/package.json
@@ -14,6 +14,7 @@
     "test-utc": "TZ=UTC jest --verbose --testNamePattern '^((?!@london-tz).)*$'",
     "test-london-tz": "TZ=Europe/London jest --verbose --testNamePattern '@london-tz'",
     "test": "yarn test-utc && yarn test-london-tz",
+    "test:ci": "yarn test",
     "test:report": "HTML_REPORT_ENABLED=true yarn test",
     "test:silent": "yarn test --silent",
     "test:e2e": "yarn playwright test --grep-invert @expensive",
diff --git a/grafana-plugin/src/network/oncall-api/types-generator/package.json b/grafana-plugin/src/network/oncall-api/types-generator/package.json
index a31b8f43..322f187c 100644
--- a/grafana-plugin/src/network/oncall-api/types-generator/package.json
+++ b/grafana-plugin/src/network/oncall-api/types-generator/package.json
@@ -1,6 +1,6 @@
 {
   "type": "module",
   "scripts": {
-    "generate": "npx ts-node-esm -P ./types-generator.tsconfig.json ./generate-types.ts && prettier --write ../autogenerated-api.types.d.ts"
+    "generate": "node --loader ts-node/esm ./generate-types.ts && prettier --write ../autogenerated-api.types.d.ts"
   }
 }
diff --git a/grafana-plugin/src/network/oncall-api/types-generator/types-generator.tsconfig.json b/grafana-plugin/src/network/oncall-api/types-generator/tsconfig.json
similarity index 65%
rename from grafana-plugin/src/network/oncall-api/types-generator/types-generator.tsconfig.json
rename to grafana-plugin/src/network/oncall-api/types-generator/tsconfig.json
index cc9765a6..19e86925 100644
--- a/grafana-plugin/src/network/oncall-api/types-generator/types-generator.tsconfig.json
+++ b/grafana-plugin/src/network/oncall-api/types-generator/tsconfig.json
@@ -1,7 +1,9 @@
 {
   "compilerOptions": {
     "module": "ESNext",
+    "target": "ESNext",
     "moduleResolution": "node",
     "esModuleInterop": true
-  }
+  },
+  "ts-node": { "esm": true }
 }