From 4281d2ca53080d21c1a61d2041b299ac19e0ff57 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 2 Aug 2023 00:21:59 +0200
Subject: [PATCH] Build types and shared-core

---
 packages/shared-core/package.json        | 2 +-
 packages/shared-core/tsconfig.build.json | 2 +-
 packages/shared-core/tsconfig.json       | 6 +++---
 packages/types/tsconfig.build.json       | 2 +-
 packages/types/tsconfig.json             | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index aaf59023df..838b8c0bea 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -6,7 +6,7 @@
   "types": "src/index.ts",
   "exports": {
     ".": {
-      "import": "./dist/src/index.js"
+      "import": "./dist/index.js"
     }
   },
   "author": "Budibase",
diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json
index 9d3bffe235..8b73754a43 100644
--- a/packages/shared-core/tsconfig.build.json
+++ b/packages/shared-core/tsconfig.build.json
@@ -11,7 +11,7 @@
     "sourceMap": true,
     "declaration": true,
     "types": ["node"],
-    "outDir": "dist/src",
+    "outDir": "dist",
     "skipLibCheck": true
   },
   "include": ["**/*.js", "**/*.ts"],
diff --git a/packages/shared-core/tsconfig.json b/packages/shared-core/tsconfig.json
index 3f32e2adb8..29825689c8 100644
--- a/packages/shared-core/tsconfig.json
+++ b/packages/shared-core/tsconfig.json
@@ -1,12 +1,12 @@
 {
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
-    "composite": true,
     "baseUrl": ".",
+    "rootDir": "./src",
+    "composite": true,
     "paths": {
-      "@budibase/types": ["../types/src"]
+      "@budibase/types": ["../../types/src"]
     }
   },
-  "include": ["**/*.js", "**/*.ts"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json
index f2c4c7667b..8df63fac57 100644
--- a/packages/types/tsconfig.build.json
+++ b/packages/types/tsconfig.build.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "es6",
-    "moduleResolution": "node",
+    "module": "commonjs",
     "lib": ["es2020"],
     "strict": true,
     "noImplicitAny": true,
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index ad5356c2dc..a2fd5207b4 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -1,6 +1,8 @@
 {
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "./src",
     "composite": true
   },
   "exclude": ["node_modules", "dist"]