From 0f113d68a22dd919877279d32d8d12058ec06cee Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Tue, 18 Apr 2023 20:52:04 +0200
Subject: [PATCH] fix: fix sonarcloud analysis
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 .eslintrc.json     | 4 ++--
 docker/Dockerfile  | 2 +-
 rollup.config.mjs  | 2 +-
 tsconfig-base.json | 6 ++++++
 tsconfig-orm.json  | 2 +-
 tsconfig.json      | 1 -
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 tsconfig-base.json

diff --git a/.eslintrc.json b/.eslintrc.json
index c6ce61da..fe42d4cb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -14,7 +14,7 @@
   "settings": {
     "import/resolver": {
       "typescript": {
-        "project": "./tsconfig.json"
+        "project": "./tsconfig-base.json"
       }
     }
   },
@@ -142,7 +142,7 @@
       "files": ["**/*.ts"],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "project": "./tsconfig.json"
+        "project": "./tsconfig-base.json"
       },
       "plugins": ["@typescript-eslint", "eslint-plugin-tsdoc"],
       "extends": [
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b86faa3c..14926f00 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM node:lts-alpine as builder
 
 # Build simulator
 WORKDIR /usr/builder
-COPY .npmrc package.json pnpm-lock.yaml tsconfig.json rollup.config.mjs build-requirements.mjs skip-preinstall.cjs prepare.cjs ./
+COPY .npmrc package.json pnpm-lock.yaml tsconfig.json tsconfig-base.json rollup.config.mjs build-requirements.mjs skip-preinstall.cjs prepare.cjs ./
 COPY src ./src
 COPY docker/config.json ./src/assets/config.json
 COPY docker/idtags.json ./src/assets/idtags.json
diff --git a/rollup.config.mjs b/rollup.config.mjs
index 0b43e8f8..1e9c26b8 100644
--- a/rollup.config.mjs
+++ b/rollup.config.mjs
@@ -57,7 +57,7 @@ export default {
   plugins: [
     json(),
     typescript({
-      tsconfig: 'tsconfig.json',
+      tsconfig: 'tsconfig-base.json',
     }),
     del({
       targets: [
diff --git a/tsconfig-base.json b/tsconfig-base.json
new file mode 100644
index 00000000..de296721
--- /dev/null
+++ b/tsconfig-base.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": true
+  }
+}
diff --git a/tsconfig-orm.json b/tsconfig-orm.json
index 2c7b2841..36852caa 100644
--- a/tsconfig-orm.json
+++ b/tsconfig-orm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig-base.json",
   "compilerOptions": {
     "module": "commonjs"
   }
diff --git a/tsconfig.json b/tsconfig.json
index b8078fc3..f255c6c4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,7 +23,6 @@
     "importHelpers": true,                    /* Import emit helpers from 'tslib'. */
     // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-    "verbatimModuleSyntax": true,
 
     /* Strict Type-Checking Options */
     // "strict": true,                        /* Enable all strict type-checking options. */
-- 
2.34.1