diff --git a/package.json b/package.json
index b9a358c..b0ca893 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-datocms",
   "version": "1.6.2",
-  "types": "dist/index.d.ts",
+  "types": "dist/types/index.d.ts",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -16,8 +16,6 @@
   "author": "Stefano Verna <s.verna@datocms.com>",
   "homepage": "https://github.com/datocms/react-datocms",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
     "@types/enzyme": "^3.10.8",
     "@types/enzyme-to-json": "^1.5.4",
     "@types/jest": "^26.0.22",
@@ -35,13 +33,11 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.45.2",
-    "rollup-plugin-typescript2": "^0.30.0",
     "ts-jest": "^26.5.5",
     "typescript": "^4.2.4"
   },
   "scripts": {
-    "build": "rimraf dist && rollup -c rollup.config.ts",
+    "build": "rimraf dist && tsc && tsc --project ./tsconfig.esnext.json",
     "watch": "rimraf dist && tsc --watch",
     "prepare": "npm run test && npm run build",
     "test": "jest --coverage",
diff --git a/tsconfig.esnext.json b/tsconfig.esnext.json
index de130a3..2589d43 100644
--- a/tsconfig.esnext.json
+++ b/tsconfig.esnext.json
@@ -4,8 +4,6 @@
     "module": "esnext",
     "outDir": "./dist/esm",
     "declarationDir": "./dist/esm",
-    "noEmitHelpers": true,
-    "importHelpers": true,
     "isolatedModules": true,
   },
 }
diff --git a/tsconfig.json b/tsconfig.json
index 5c6c31d..532e5eb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "declarationDir": "./dist/cjs",
+    "declarationDir": "./dist/types",
     "module": "commonjs",
     "noImplicitAny": true,
     "lib": ["es2017", "es7", "es6", "dom"],