diff --git a/package.json b/package.json
index a7d1865..016ed89 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,15 @@
   "source": "./dist/source/index.jsx",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
-  "exports": "./dist/esm/index.js",
+  "exports": {
+    "./": {
+      "solid": "./dist/source/index.jsx",
+      "import": "./dist/esm/index.js",
+      "node": "./dist/cjs/index.js",
+      "require": "./dist/cjs/index.js",
+      "browser": "./dist/esm/index.js"
+    }
+  },
   "types": "./dist/types/index.d.ts",
   "repository": {
     "type": "git",
@@ -15,8 +23,7 @@
     "build": "rollup -c && tsc",
     "format": "prettier -w \"**/*.{js,ts,tsx,json}\"",
     "check": "package-check",
-    "prepublishOnly": "pnpm build",
-    "prepack": "pnpm build"
+    "prepublishOnly": "pnpm check && pnpm build"
   },
   "files": [
     "dist"
@@ -31,15 +38,15 @@
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-typescript": "^7.12.7",
-    "@rollup/plugin-babel": "^5.2.2",
-    "@rollup/plugin-node-resolve": "^11.1.0",
+    "@rollup/plugin-babel": "^5.2.3",
+    "@rollup/plugin-node-resolve": "^11.1.1",
     "@skypack/package-check": "^0.2.2",
     "babel-preset-solid": "^0.23.8",
     "prettier": "^2.2.1",
-    "rollup": "^2.36.2",
+    "rollup": "^2.38.4",
     "rollup-plugin-analyzer": "^4.0.0",
     "rollup-plugin-delete": "^2.0.0",
-    "typescript": "^4.1.3"
+    "typescript": "^4.2.0-beta"
   },
   "dependencies": {
     "solid-js": "^0.23.11"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd4545c..a89f373 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3,15 +3,15 @@ dependencies:
 devDependencies:
   '@babel/core': 7.12.10
   '@babel/preset-typescript': 7.12.7_@babel+core@7.12.10
-  '@rollup/plugin-babel': 5.2.2_d291def3ad863a337509a274a4371b7e
-  '@rollup/plugin-node-resolve': 11.1.0_rollup@2.36.2
+  '@rollup/plugin-babel': 5.2.3_ea04a9b56e51bf4c210cb334fb82fcda
+  '@rollup/plugin-node-resolve': 11.1.1_rollup@2.38.4
   '@skypack/package-check': 0.2.2
   babel-preset-solid: 0.23.8_@babel+core@7.12.10
   prettier: 2.2.1
-  rollup: 2.36.2
+  rollup: 2.38.4
   rollup-plugin-analyzer: 4.0.0
   rollup-plugin-delete: 2.0.0
-  typescript: 4.1.3
+  typescript: 4.2.0-beta
 lockfileVersion: 5.2
 packages:
   /@babel/code-frame/7.12.11:
@@ -85,7 +85,7 @@ packages:
       integrity: sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
   /@babel/helper-module-imports/7.12.5:
     dependencies:
-      '@babel/types': 7.12.11
+      '@babel/types': 7.12.12
     dev: true
     resolution:
       integrity: sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
@@ -267,12 +267,12 @@ packages:
       node: '>= 8'
     resolution:
       integrity: sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
-  /@rollup/plugin-babel/5.2.2_d291def3ad863a337509a274a4371b7e:
+  /@rollup/plugin-babel/5.2.3_ea04a9b56e51bf4c210cb334fb82fcda:
     dependencies:
       '@babel/core': 7.12.10
       '@babel/helper-module-imports': 7.12.5
-      '@rollup/pluginutils': 3.1.0_rollup@2.36.2
-      rollup: 2.36.2
+      '@rollup/pluginutils': 3.1.0_rollup@2.38.4
+      rollup: 2.38.4
     dev: true
     engines:
       node: '>= 10.0.0'
@@ -284,29 +284,29 @@ packages:
       '@types/babel__core':
         optional: true
     resolution:
-      integrity: sha512-MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA==
-  /@rollup/plugin-node-resolve/11.1.0_rollup@2.36.2:
+      integrity: sha512-DOMc7nx6y5xFi86AotrFssQqCen6CxYn+zts5KSI879d4n1hggSb4TH3mjVgG17Vc3lZziWWfcXzrEmVdzPMdw==
+  /@rollup/plugin-node-resolve/11.1.1_rollup@2.38.4:
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.36.2
+      '@rollup/pluginutils': 3.1.0_rollup@2.38.4
       '@types/resolve': 1.17.1
       builtin-modules: 3.2.0
       deepmerge: 4.2.2
       is-module: 1.0.0
       resolve: 1.19.0
-      rollup: 2.36.2
+      rollup: 2.38.4
     dev: true
     engines:
       node: '>= 10.0.0'
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
     resolution:
-      integrity: sha512-ouBBppRdWJKCllDXGzJ7ZIkYbaq+5TmyP0smt1vdJCFfoZhLi31vhpmjLhyo8lreHf4RoeSNllaWrvSqHpHRog==
-  /@rollup/pluginutils/3.1.0_rollup@2.36.2:
+      integrity: sha512-zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg==
+  /@rollup/pluginutils/3.1.0_rollup@2.38.4:
     dependencies:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.2.2
-      rollup: 2.36.2
+      rollup: 2.38.4
     dev: true
     engines:
       node: '>= 8.0.0'
@@ -341,13 +341,13 @@ packages:
     dev: true
     resolution:
       integrity: sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
-  /@types/node/14.14.21:
+  /@types/node/14.14.22:
     dev: true
     resolution:
-      integrity: sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A==
+      integrity: sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
   /@types/resolve/1.17.1:
     dependencies:
-      '@types/node': 14.14.21
+      '@types/node': 14.14.22
     dev: true
     resolution:
       integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
@@ -536,8 +536,7 @@ packages:
     dev: true
     resolution:
       integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-  /fsevents/2.1.3:
-    deprecated: '"Please update to latest v2.3 or v2.2"'
+  /fsevents/2.3.1:
     dev: true
     engines:
       node: ^8.16.0 || ^10.6.0 || >=11.0.0
@@ -545,7 +544,7 @@ packages:
     os:
       - darwin
     resolution:
-      integrity: sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
+      integrity: sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
   /function-bind/1.1.1:
     dev: true
     resolution:
@@ -816,15 +815,15 @@ packages:
       node: '>=10'
     resolution:
       integrity: sha512-/VpLMtDy+8wwRlDANuYmDa9ss/knGsAgrDhM+tEwB1npHwNu4DYNmDfUL55csse/GHs9Q+SMT/rw9uiaZ3pnzA==
-  /rollup/2.36.2:
+  /rollup/2.38.4:
     dev: true
     engines:
       node: '>=10.0.0'
     hasBin: true
     optionalDependencies:
-      fsevents: 2.1.3
+      fsevents: 2.3.1
     resolution:
-      integrity: sha512-qjjiuJKb+/8n0EZyQYVW+gFU4bNRBcZaXVzUgSVrGw0HlQBlK2aWyaOMMs1Ufic1jV69b9kW3u3i9B+hISDm3A==
+      integrity: sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==
   /run-parallel/1.1.10:
     dev: true
     resolution:
@@ -876,13 +875,13 @@ packages:
       node: '>=8.0'
     resolution:
       integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  /typescript/4.1.3:
+  /typescript/4.2.0-beta:
     dev: true
     engines:
       node: '>=4.2.0'
     hasBin: true
     resolution:
-      integrity: sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
+      integrity: sha512-0nYjpkQ6bKjHoJTQkUHcDtGLNenqc5rfTcl3ISUnJXPkGa0115FcVJABmodfMKHLyDBmzDr8IGLbDv5m7sbYgw==
   /wrappy/1.0.2:
     dev: true
     resolution:
@@ -896,13 +895,13 @@ packages:
 specifiers:
   '@babel/core': ^7.12.10
   '@babel/preset-typescript': ^7.12.7
-  '@rollup/plugin-babel': ^5.2.2
-  '@rollup/plugin-node-resolve': ^11.1.0
+  '@rollup/plugin-babel': ^5.2.3
+  '@rollup/plugin-node-resolve': ^11.1.1
   '@skypack/package-check': ^0.2.2
   babel-preset-solid: ^0.23.8
   prettier: ^2.2.1
-  rollup: ^2.36.2
+  rollup: ^2.38.4
   rollup-plugin-analyzer: ^4.0.0
   rollup-plugin-delete: ^2.0.0
   solid-js: ^0.23.11
-  typescript: ^4.1.3
+  typescript: ^4.2.0-beta