From 19f9d45e92fb7e3486d9ddc170b32711af018f6b Mon Sep 17 00:00:00 2001
From: Dany Castillo <31006608+dcastil@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:29:49 +0200
Subject: [PATCH 1/2] transpile lib to more modern JS

---
 scripts/rollup.config.mjs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/rollup.config.mjs b/scripts/rollup.config.mjs
index 591b67b5..de4a3f16 100644
--- a/scripts/rollup.config.mjs
+++ b/scripts/rollup.config.mjs
@@ -18,16 +18,12 @@ export default defineConfig([
             getOutputConfig({
                 file: pkg.exports['.'].import,
                 format: 'esm',
-                targets: 'supports es5',
-                // To be enabled in https://github.com/dcastil/tailwind-merge/issues/126
-                // targets: '> 0.5%, last 2 versions, Firefox ESR, not dead, maintained node versions',
+                targets: '> 0.5%, last 2 versions, Firefox ESR, not dead, maintained node versions',
             }),
             getOutputConfig({
                 file: pkg.exports['.'].require,
                 format: 'cjs',
-                targets: 'supports es5',
-                // To be enabled in https://github.com/dcastil/tailwind-merge/issues/126
-                // targets: '> 0.5%, last 2 versions, Firefox ESR, not dead, maintained node versions',
+                targets: '> 0.5%, last 2 versions, Firefox ESR, not dead, maintained node versions',
             }),
         ],
         external: /node_modules/,

From 530a12b7b17138dd7f9660de3da0b1edbd6469e7 Mon Sep 17 00:00:00 2001
From: Dany Castillo <31006608+dcastil@users.noreply.github.com>
Date: Sat, 19 Aug 2023 14:16:39 +0200
Subject: [PATCH 2/2] fix incorrect sourcemap paths

---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index abc22bc0..30f54f75 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,7 +13,7 @@
         // Emit
         "declaration": true,
         "noEmit": true,
-        "outDir": "dist/types",
+        "outDir": "types",
         "sourceMap": true,
         // Interop Constraints
         "esModuleInterop": true,