Fix cjs usage of libraries (#256)

* Fix cjs usage of libraries * add changeset and clean up project.json files --------- Co-authored-by: Youssef Gaber <1728215+Gabrola@users.noreply.github.com>
ts-rest · Jun 3, 2023 · 81560d4 · 81560d4 · vercel · Jun 3, 2023
1 parent 3598bd1
commit 81560d4
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 16 deletions.
diff --git a/.changeset/moody-falcons-confess.md b/.changeset/moody-falcons-confess.md
@@ -0,0 +1,12 @@
+---
+'@ts-rest/core': patch
+'@ts-rest/express': patch
+'@ts-rest/fastify': patch
+'@ts-rest/nest': patch
+'@ts-rest/next': patch
+'@ts-rest/open-api': patch
+'@ts-rest/react-query': patch
+'@ts-rest/solid-query': patch
+---
+
+Fix ESM/CJS issues in package.json
diff --git a/libs/ts-rest/core/project.json b/libs/ts-rest/core/project.json
@@ -27,8 +27,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "publish": {

diff --git a/libs/ts-rest/express/project.json b/libs/ts-rest/express/project.json
@@ -27,8 +27,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "publish": {

diff --git a/libs/ts-rest/fastify/project.json b/libs/ts-rest/fastify/project.json
@@ -27,8 +27,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "publish": {

diff --git a/libs/ts-rest/nest/project.json b/libs/ts-rest/nest/project.json
@@ -27,8 +27,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "publish": {

diff --git a/libs/ts-rest/next/project.json b/libs/ts-rest/next/project.json
@@ -27,8 +27,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "publish": {

diff --git a/libs/ts-rest/open-api/project.json b/libs/ts-rest/open-api/project.json
@@ -27,8 +27,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "publish": {

diff --git a/libs/ts-rest/react-query/project.json b/libs/ts-rest/react-query/project.json
@@ -28,8 +28,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "lint": {

diff --git a/libs/ts-rest/solid-query/project.json b/libs/ts-rest/solid-query/project.json
@@ -28,8 +28,7 @@
         "format": ["esm", "cjs"],
         "compiler": "tsc",
         "rollupConfig": "tools/scripts/rollup.config.js",
-        "generateExportsField": true,
-        "skipTypeField": true
+        "generateExportsField": true
       }
     },
     "lint": {

diff --git a/tools/scripts/fix-esm.mjs b/tools/scripts/fix-esm.mjs
@@ -18,6 +18,8 @@ for (const lib of libs) {
     ...JSON.parse(packageJson),
     module: './index.mjs',
     main: './index.js',
+    // Ensure that esm is not forced due to "type": "module" being added.
+    type: undefined,
     exports: {
       '.': {
         types: './src/index.d.ts',