From 36299f8c93ed2f5081180737d8a36caeda265924 Mon Sep 17 00:00:00 2001
From: mathuo <6710312+mathuo@users.noreply.github.com>
Date: Mon, 3 Apr 2023 21:53:40 +0100
Subject: [PATCH] feat: tsconfig adjustments

---
 module-build/tsconfig.esm.json                | 25 ------------------
 packages/dockview-core/rollup.config.js       |  1 +
 packages/dockview-core/tsconfig.esm.json      |  5 +++-
 packages/dockview-core/tsconfig.json          |  4 +--
 packages/dockview/rollup.config.js            |  1 +
 packages/dockview/tsconfig.esm.json           |  5 +++-
 packages/dockview/tsconfig.json               |  4 +--
 .../tsconfig.json => tsconfig.base.json       | 26 +++++++++----------
 tsconfig.eslint.json                          | 14 +++++-----
 9 files changed, 34 insertions(+), 51 deletions(-)
 delete mode 100644 module-build/tsconfig.esm.json
 rename module-build/tsconfig.json => tsconfig.base.json (73%)

diff --git a/module-build/tsconfig.esm.json b/module-build/tsconfig.esm.json
deleted file mode 100644
index 1520dd78c..000000000
--- a/module-build/tsconfig.esm.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "ES2020",
-        "declaration": true,
-        "target": "es6",
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "downlevelIteration": true,
-        "incremental": true,
-        "noImplicitReturns": true,
-        "noImplicitAny": true,
-        "allowUnreachableCode": false,
-        "forceConsistentCasingInFileNames": true,
-        "strict": true,
-        "declarationMap": true,
-        "lib": [
-          "ES2015",
-          "ES2016.Array.Include",
-          "ES2017.String",
-          "ES2018.Promise",
-          "ES2019",
-          "DOM",
-		  ]
-    }
-}
diff --git a/packages/dockview-core/rollup.config.js b/packages/dockview-core/rollup.config.js
index ad925e4ff..7c8a12d45 100644
--- a/packages/dockview-core/rollup.config.js
+++ b/packages/dockview-core/rollup.config.js
@@ -55,6 +55,7 @@ function createBundle(format, options) {
             ` * @license ${license}`,
             ` */`,
         ].join('\n'),
+        sourcemap: true,
     };
 
     const plugins = [
diff --git a/packages/dockview-core/tsconfig.esm.json b/packages/dockview-core/tsconfig.esm.json
index b48538b62..156f7d124 100644
--- a/packages/dockview-core/tsconfig.esm.json
+++ b/packages/dockview-core/tsconfig.esm.json
@@ -1,6 +1,9 @@
 {
-    "extends": "../../module-build/tsconfig.esm.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
+        "module": "ES2020",
+        "moduleResolution": "node",
+        "target": "es6",
         "outDir": "dist/esm",
         "tsBuildInfoFile": ".build/tsconfig.tsbuildinfo.esm",
         "jsx": "react",
diff --git a/packages/dockview-core/tsconfig.json b/packages/dockview-core/tsconfig.json
index 9ff78cef1..023097d12 100644
--- a/packages/dockview-core/tsconfig.json
+++ b/packages/dockview-core/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../../module-build/tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
         "outDir": "dist/cjs",
         "tsBuildInfoFile": ".build/tsconfig.tsbuildinfo.cjs",
@@ -8,4 +8,4 @@
     },
     "include": ["src"],
     "exclude": ["**/node_modules", "src/__tests__"]
-}
\ No newline at end of file
+}
diff --git a/packages/dockview/rollup.config.js b/packages/dockview/rollup.config.js
index ba0fb90fd..b522bd0c0 100644
--- a/packages/dockview/rollup.config.js
+++ b/packages/dockview/rollup.config.js
@@ -56,6 +56,7 @@ function createBundle(format, options) {
             ` * @license ${license}`,
             ` */`,
         ].join('\n'),
+        sourcemap: true,
     };
 
     const plugins = [
diff --git a/packages/dockview/tsconfig.esm.json b/packages/dockview/tsconfig.esm.json
index b48538b62..156f7d124 100644
--- a/packages/dockview/tsconfig.esm.json
+++ b/packages/dockview/tsconfig.esm.json
@@ -1,6 +1,9 @@
 {
-    "extends": "../../module-build/tsconfig.esm.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
+        "module": "ES2020",
+        "moduleResolution": "node",
+        "target": "es6",
         "outDir": "dist/esm",
         "tsBuildInfoFile": ".build/tsconfig.tsbuildinfo.esm",
         "jsx": "react",
diff --git a/packages/dockview/tsconfig.json b/packages/dockview/tsconfig.json
index 932770600..f1a6f570c 100644
--- a/packages/dockview/tsconfig.json
+++ b/packages/dockview/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../../module-build/tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
         "outDir": "dist/cjs",
         "tsBuildInfoFile": ".build/tsconfig.tsbuildinfo.cjs",
@@ -7,7 +7,7 @@
         "rootDir": "src"
     },
     "paths": {
-      "dockview-core": "../dockview-core"
+        "dockview-core": "../dockview-core"
     },
     "include": ["src"],
     "exclude": ["**/node_modules", "src/__tests__"]
diff --git a/module-build/tsconfig.json b/tsconfig.base.json
similarity index 73%
rename from module-build/tsconfig.json
rename to tsconfig.base.json
index e89bd96f9..77f0e8b99 100644
--- a/module-build/tsconfig.json
+++ b/tsconfig.base.json
@@ -1,25 +1,25 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "declaration": true,
         "target": "es5",
+        "declaration": true,
+        "declarationMap": true,
+        "sourceMap": true,
+        "strict": true,
+        "allowUnreachableCode": false,
+        "forceConsistentCasingInFileNames": true,
         "esModuleInterop": true,
         "downlevelIteration": true,
         "incremental": true,
-        "sourceMap": true,
         "noImplicitReturns": true,
         "noImplicitAny": true,
-        "allowUnreachableCode": false,
-        "forceConsistentCasingInFileNames": true,
-        "strict": true,
-        "declarationMap": true,
         "lib": [
-          "ES2015",
-          "ES2016.Array.Include",
-          "ES2017.String",
-          "ES2018.Promise",
-          "ES2019",
-          "DOM",
-		  ]
+            "ES2015",
+            "ES2016.Array.Include",
+            "ES2017.String",
+            "ES2018.Promise",
+            "ES2019",
+            "DOM"
+        ]
     }
 }
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 4343d501d..0703d75a7 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -1,9 +1,9 @@
 {
-  "compilerOptions": {
-    "types": ["@types/node"],
-    "noEmit": true,
-    "allowJs": true
-  },
-  "extends": "./module-build/tsconfig.esm.json",
-  "include": ["tests/**/*.ts", "tools/**/*.ts", ".eslintrc.js"]
+    "compilerOptions": {
+        "types": ["@types/node"],
+        "noEmit": true,
+        "allowJs": true
+    },
+    "extends": "./tsconfig.base.json",
+    "include": ["tests/**/*.ts", "tools/**/*.ts", ".eslintrc.js"]
 }