From c6dd3f8fbedde7fd9b56ef14b8f11bf87f4efb77 Mon Sep 17 00:00:00 2001
From: Raphael Flechtner <raphael@kilt.io>
Date: Tue, 23 May 2023 14:00:41 +0200
Subject: [PATCH 1/2] fix: make sure config is singleton

---
 packages/config/package.json        | 17 +++++++++--------
 packages/config/src/index.mts       | 12 ++++++++++++
 packages/config/tsconfig.build.json |  4 ++--
 packages/config/tsconfig.esm.json   |  8 ++++++--
 4 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 packages/config/src/index.mts

diff --git a/packages/config/package.json b/packages/config/package.json
index 3c2d23a9d..d2e255817 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -2,13 +2,14 @@
   "name": "@kiltprotocol/config",
   "version": "0.32.1-6",
   "description": "",
-  "main": "./lib/cjs/index.js",
-  "module": "./lib/esm/index.js",
-  "types": "./lib/cjs/index.d.ts",
+  "type": "commonjs",
+  "main": "./lib/index.js",
+  "module": "./lib/index.mjs",
+  "types": "./lib/index.d.ts",
   "exports": {
     ".": {
-      "import": "./lib/esm/index.js",
-      "require": "./lib/cjs/index.js"
+      "import": "./lib/index.mjs",
+      "require": "./lib/index.js"
     }
   },
   "files": [
@@ -17,9 +18,9 @@
   "scripts": {
     "clean": "rimraf ./lib",
     "build": "yarn clean && yarn build:ts",
-    "build:ts": "yarn build:cjs && yarn build:esm",
-    "build:cjs": "tsc --declaration -p tsconfig.build.json && echo '{\"type\":\"commonjs\"}' > ./lib/cjs/package.json",
-    "build:esm": "tsc --declaration -p tsconfig.esm.json && echo '{\"type\":\"module\"}' > ./lib/esm/package.json"
+    "build:ts": "yarn build:esm && yarn build:cjs",
+    "build:cjs": "tsc --declaration -p tsconfig.build.json",
+    "build:esm": "tsc --declaration -p tsconfig.esm.json"
   },
   "repository": "github:kiltprotocol/sdk-js",
   "engines": {
diff --git a/packages/config/src/index.mts b/packages/config/src/index.mts
new file mode 100644
index 000000000..bc58062c7
--- /dev/null
+++ b/packages/config/src/index.mts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2018-2023, BOTLabs GmbH.
+ *
+ * This source code is licensed under the BSD 4-Clause "Original" license
+ * found in the LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @module @kiltprotocol/config
+ */
+
+export * as ConfigService from './ConfigService.js'
diff --git a/packages/config/tsconfig.build.json b/packages/config/tsconfig.build.json
index 8af083c78..0eb1133ec 100644
--- a/packages/config/tsconfig.build.json
+++ b/packages/config/tsconfig.build.json
@@ -3,11 +3,11 @@
 
   "compilerOptions": {
     "module": "CommonJS",
-    "outDir": "./lib/cjs"
+    "outDir": "./lib"
   },
 
   "include": [
-    "src/**/*.ts", "src/**/*.js"
+    "src/**/*.ts"
   ],
 
   "exclude": [
diff --git a/packages/config/tsconfig.esm.json b/packages/config/tsconfig.esm.json
index e1f3b73b6..9f6dbb2d5 100644
--- a/packages/config/tsconfig.esm.json
+++ b/packages/config/tsconfig.esm.json
@@ -2,6 +2,10 @@
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
     "module": "ES6",
-    "outDir": "./lib/esm"
-  }
+    "outDir": "./lib"
+  },
+  "include": [
+    "src/**/*.mts"
+  ],
+
 }

From a519cbda66f6df04f16a9ce0b26a1a34d8f29902 Mon Sep 17 00:00:00 2001
From: Raphael Flechtner <raphael@kilt.io>
Date: Tue, 23 May 2023 14:25:55 +0200
Subject: [PATCH 2/2] chore: build esm index from index.ts

---
 packages/config/package.json      |  7 ++++---
 packages/config/src/index.mts     | 12 ------------
 packages/config/tsconfig.esm.json |  8 ++------
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 packages/config/src/index.mts

diff --git a/packages/config/package.json b/packages/config/package.json
index d2e255817..58cc7e7fe 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -9,7 +9,8 @@
   "exports": {
     ".": {
       "import": "./lib/index.mjs",
-      "require": "./lib/index.js"
+      "require": "./lib/index.js",
+      "types": "./lib/index.d.ts"
     }
   },
   "files": [
@@ -18,9 +19,9 @@
   "scripts": {
     "clean": "rimraf ./lib",
     "build": "yarn clean && yarn build:ts",
-    "build:ts": "yarn build:esm && yarn build:cjs",
+    "build:ts": "yarn build:cjs && yarn build:esm",
     "build:cjs": "tsc --declaration -p tsconfig.build.json",
-    "build:esm": "tsc --declaration -p tsconfig.esm.json"
+    "build:esm": "tsc --declaration -p tsconfig.esm.json && yarn exec cp -f ./lib/esm/index.js ./lib/index.mjs && rimraf ./lib/esm"
   },
   "repository": "github:kiltprotocol/sdk-js",
   "engines": {
diff --git a/packages/config/src/index.mts b/packages/config/src/index.mts
deleted file mode 100644
index bc58062c7..000000000
--- a/packages/config/src/index.mts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) 2018-2023, BOTLabs GmbH.
- *
- * This source code is licensed under the BSD 4-Clause "Original" license
- * found in the LICENSE file in the root directory of this source tree.
- */
-
-/**
- * @module @kiltprotocol/config
- */
-
-export * as ConfigService from './ConfigService.js'
diff --git a/packages/config/tsconfig.esm.json b/packages/config/tsconfig.esm.json
index 9f6dbb2d5..e1f3b73b6 100644
--- a/packages/config/tsconfig.esm.json
+++ b/packages/config/tsconfig.esm.json
@@ -2,10 +2,6 @@
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
     "module": "ES6",
-    "outDir": "./lib"
-  },
-  "include": [
-    "src/**/*.mts"
-  ],
-
+    "outDir": "./lib/esm"
+  }
 }