Merge pull request #287 from dcastil/breaking-feature/126/transpile-l…

…ib-to-modern-js Transpile lib to more modern JS
dcastil · Aug 19, 2023 · f31447b · f31447b
2 parents df30d7a + 530a12b
commit f31447b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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/,

diff --git 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,