From 87d864f57d41cb94b09e91c52eb4ad09c9019482 Mon Sep 17 00:00:00 2001
From: Dennis Kigen <kigen.work@gmail.com>
Date: Wed, 21 Aug 2024 13:51:44 +0300
Subject: [PATCH] Useful tweaks

---
 .eslintignore                                 |  3 ++-
 .prettierignore                               |  2 --
 packages/esm-home-app/jest.config.js          |  2 ++
 packages/esm-home-app/package.json            |  2 +-
 .../page-illustration.component.tsx           | 24 -------------------
 packages/esm-home-app/src/root.scss           |  0
 packages/esm-home-app/translations/en.json    |  3 +--
 packages/esm-home-app/tsconfig.json           |  3 +--
 tsconfig.json                                 | 19 ++++++++-------
 9 files changed, 17 insertions(+), 41 deletions(-)
 delete mode 100644 packages/esm-home-app/src/page-header/page-illustration.component.tsx
 delete mode 100644 packages/esm-home-app/src/root.scss

diff --git a/.eslintignore b/.eslintignore
index d85985e336..a71cfb2871 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,3 @@
 src/**/*.test.tsx
-**/*.d.tsx
\ No newline at end of file
+**/*.d.tsx
+node_modules
diff --git a/.prettierignore b/.prettierignore
index c7dfbe655d..714b8524e3 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +1,5 @@
 dist/
 node_modules/
-**/*.css
-**/*.scss
 **/*.md
 **/*.json
 yarn.lock
diff --git a/packages/esm-home-app/jest.config.js b/packages/esm-home-app/jest.config.js
index 3ff53b2bf5..343c83490b 100644
--- a/packages/esm-home-app/jest.config.js
+++ b/packages/esm-home-app/jest.config.js
@@ -1,4 +1,6 @@
+/** @type {import('jest').Config} */
 module.exports = {
+  clearMocks: true,
   transform: {
     '^.+\\.tsx?$': '@swc/jest',
   },
diff --git a/packages/esm-home-app/package.json b/packages/esm-home-app/package.json
index 5d4d98ffce..77cef0d3f5 100644
--- a/packages/esm-home-app/package.json
+++ b/packages/esm-home-app/package.json
@@ -12,7 +12,7 @@
     "debug": "npm run serve",
     "build": "webpack --mode production",
     "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "cross-env TIMING=1 eslint src --ext ts,tsx --fix --max-warnings=0 --color",
+    "lint": "cross-env eslint src --ext ts,tsx --fix --max-warnings=0 --color",
     "typescript": "tsc",
     "verify": "turbo lint typescript test --color",
     "extract-translations": "i18next 'src/**/*.{component.tsx,tsx}' 'src/index.ts' --config ../../tools/i18next-parser.config.js",
diff --git a/packages/esm-home-app/src/page-header/page-illustration.component.tsx b/packages/esm-home-app/src/page-header/page-illustration.component.tsx
deleted file mode 100644
index 54126cbea0..0000000000
--- a/packages/esm-home-app/src/page-header/page-illustration.component.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-const HomepageIllustration: React.FC = () => {
-  const { t } = useTranslation();
-  return (
-    <svg width="92" height="94" viewBox="0 0 92 94" xmlns="http://www.w3.org/2000/svg">
-      <title>{t('homepageIllustration', 'Homepage illustration')}</title>
-      <g fill="none" fillRule="evenodd">
-        <path fill="#FFF" d="M0 0h92v94H0z" />
-        <path
-          d="M40 32c.84-.602 1.12-1.797 1-3 .12-5.005-3.96-9-9-9s-9.12 3.995-9 9c-.12 3.572 2.1 6.706 5 8-6.76 1.741-12 7.91-12 15v15h28V32h-4zM76 67V52c0-7.09-5.24-13.278-12-15 2.9-1.294 5.12-4.428 5-8 .12-5.005-3.96-9-9-9s-9.12 3.995-9 9c-.12 1.203.14 2.398 1 3h-4v35h28z"
-          fill="#CEE6E5"
-        />
-        <path
-          d="M32 75V60.312c0-7.402 5.24-13.59 12.3-15.216-3.2-1.39-5.42-4.523-5.42-8.166 0-4.935 4.08-8.93 9.12-8.93 5.04 0 9.12 3.995 9.12 8.93 0 3.642-2.22 6.776-5.42 8.166C58.76 46.741 64 52.91 64 60.313V75"
-          fill="#7BBCB9"
-        />
-      </g>
-    </svg>
-  );
-};
-
-export default HomepageIllustration;
diff --git a/packages/esm-home-app/src/root.scss b/packages/esm-home-app/src/root.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/esm-home-app/translations/en.json b/packages/esm-home-app/translations/en.json
index f6522ef8b7..ecacb6f183 100644
--- a/packages/esm-home-app/translations/en.json
+++ b/packages/esm-home-app/translations/en.json
@@ -1,4 +1,3 @@
 {
-  "home": "Home",
-  "homepageIllustration": "Homepage illustration"
+  "home": "Home"
 }
diff --git a/packages/esm-home-app/tsconfig.json b/packages/esm-home-app/tsconfig.json
index 54ce28cfa5..45140220ed 100644
--- a/packages/esm-home-app/tsconfig.json
+++ b/packages/esm-home-app/tsconfig.json
@@ -1,5 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx"]
+  "include": ["src/**/*", "./setupTests.ts", "./jest.config.js"],
 }
diff --git a/tsconfig.json b/tsconfig.json
index c696757b73..1a1d142880 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,8 @@
 {
   "compilerOptions": {
-    "esModuleInterop": true,
-    "module": "esnext",
     "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
     "jsx": "react",
-    "skipLibCheck": true,
-    "moduleResolution": "node",
     "lib": [
       "dom",
       "es5",
@@ -15,16 +12,20 @@
       "es2016.array.include",
       "es2018",
       "es2020",
-      "es2021"
+      "es2021",
+      "es2022"
     ],
-    "resolveJsonModule": true,
-    "strictNullChecks": true,
+    "module": "esnext",
+    "moduleResolution": "node",
     "noEmit": true,
-    "target": "esnext",
     "paths": {
       "@openmrs/*": ["./node_modules/@openmrs/*"],
       "__mocks__": ["./__mocks__"],
       "tools": ["./tools"],
-    }
+    },
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strictNullChecks": true,
+    "target": "esnext",
   }
 }