From 2ef3a5266e2f903aab2f8c9d43437151d7da0122 Mon Sep 17 00:00:00 2001
From: Filip Skokan <panva.ip@gmail.com>
Date: Sun, 20 Oct 2024 22:57:08 +0200
Subject: [PATCH] Revert "refactor(build): simplify package exports"

This reverts commit 4783f7fcb0282c2e24479758614a82e3d7c0e627.
---
 package.json              | 360 ++++++++++++++++++++++----------------
 tools/publish-browser.js  |   8 +-
 tools/publish-node-cjs.js |  11 +-
 tools/publish-node-esm.js |  10 +-
 4 files changed, 220 insertions(+), 169 deletions(-)

diff --git a/package.json b/package.json
index f8dcf8a2d1..4333a3393c 100644
--- a/package.json
+++ b/package.json
@@ -78,243 +78,303 @@
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
-      "node": {
-        "import": "./dist/node/esm/index.js",
-        "require": "./dist/node/cjs/index.js"
-      },
-      "default": "./dist/browser/index.js"
+      "bun": "./dist/browser/index.js",
+      "deno": "./dist/browser/index.js",
+      "browser": "./dist/browser/index.js",
+      "worker": "./dist/browser/index.js",
+      "workerd": "./dist/browser/index.js",
+      "import": "./dist/node/esm/index.js",
+      "require": "./dist/node/cjs/index.js"
     },
     "./jwk/embedded": {
       "types": "./dist/types/jwk/embedded.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwk/embedded.js",
-        "require": "./dist/node/cjs/jwk/embedded.js"
-      },
-      "default": "./dist/browser/jwk/embedded.js"
+      "bun": "./dist/browser/jwk/embedded.js",
+      "deno": "./dist/browser/jwk/embedded.js",
+      "browser": "./dist/browser/jwk/embedded.js",
+      "worker": "./dist/browser/jwk/embedded.js",
+      "workerd": "./dist/browser/jwk/embedded.js",
+      "import": "./dist/node/esm/jwk/embedded.js",
+      "require": "./dist/node/cjs/jwk/embedded.js"
     },
     "./jwk/thumbprint": {
       "types": "./dist/types/jwk/thumbprint.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwk/thumbprint.js",
-        "require": "./dist/node/cjs/jwk/thumbprint.js"
-      },
-      "default": "./dist/browser/jwk/thumbprint.js"
+      "bun": "./dist/browser/jwk/thumbprint.js",
+      "deno": "./dist/browser/jwk/thumbprint.js",
+      "browser": "./dist/browser/jwk/thumbprint.js",
+      "worker": "./dist/browser/jwk/thumbprint.js",
+      "workerd": "./dist/browser/jwk/thumbprint.js",
+      "import": "./dist/node/esm/jwk/thumbprint.js",
+      "require": "./dist/node/cjs/jwk/thumbprint.js"
     },
     "./key/import": {
       "types": "./dist/types/key/import.d.ts",
-      "node": {
-        "import": "./dist/node/esm/key/import.js",
-        "require": "./dist/node/cjs/key/import.js"
-      },
-      "default": "./dist/browser/key/import.js"
+      "bun": "./dist/browser/key/import.js",
+      "deno": "./dist/browser/key/import.js",
+      "browser": "./dist/browser/key/import.js",
+      "worker": "./dist/browser/key/import.js",
+      "workerd": "./dist/browser/key/import.js",
+      "import": "./dist/node/esm/key/import.js",
+      "require": "./dist/node/cjs/key/import.js"
     },
     "./key/export": {
       "types": "./dist/types/key/export.d.ts",
-      "node": {
-        "import": "./dist/node/esm/key/export.js",
-        "require": "./dist/node/cjs/key/export.js"
-      },
-      "default": "./dist/browser/key/export.js"
+      "bun": "./dist/browser/key/export.js",
+      "deno": "./dist/browser/key/export.js",
+      "browser": "./dist/browser/key/export.js",
+      "worker": "./dist/browser/key/export.js",
+      "workerd": "./dist/browser/key/export.js",
+      "import": "./dist/node/esm/key/export.js",
+      "require": "./dist/node/cjs/key/export.js"
     },
     "./key/generate/keypair": {
       "types": "./dist/types/key/generate_key_pair.d.ts",
-      "node": {
-        "import": "./dist/node/esm/key/generate_key_pair.js",
-        "require": "./dist/node/cjs/key/generate_key_pair.js"
-      },
-      "default": "./dist/browser/key/generate_key_pair.js"
+      "bun": "./dist/browser/key/generate_key_pair.js",
+      "deno": "./dist/browser/key/generate_key_pair.js",
+      "browser": "./dist/browser/key/generate_key_pair.js",
+      "worker": "./dist/browser/key/generate_key_pair.js",
+      "workerd": "./dist/browser/key/generate_key_pair.js",
+      "import": "./dist/node/esm/key/generate_key_pair.js",
+      "require": "./dist/node/cjs/key/generate_key_pair.js"
     },
     "./key/generate/secret": {
       "types": "./dist/types/key/generate_secret.d.ts",
-      "node": {
-        "import": "./dist/node/esm/key/generate_secret.js",
-        "require": "./dist/node/cjs/key/generate_secret.js"
-      },
-      "default": "./dist/browser/key/generate_secret.js"
+      "bun": "./dist/browser/key/generate_secret.js",
+      "deno": "./dist/browser/key/generate_secret.js",
+      "browser": "./dist/browser/key/generate_secret.js",
+      "worker": "./dist/browser/key/generate_secret.js",
+      "workerd": "./dist/browser/key/generate_secret.js",
+      "import": "./dist/node/esm/key/generate_secret.js",
+      "require": "./dist/node/cjs/key/generate_secret.js"
     },
     "./jwks/remote": {
       "types": "./dist/types/jwks/remote.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwks/remote.js",
-        "require": "./dist/node/cjs/jwks/remote.js"
-      },
-      "default": "./dist/browser/jwks/remote.js"
+      "bun": "./dist/browser/jwks/remote.js",
+      "deno": "./dist/browser/jwks/remote.js",
+      "browser": "./dist/browser/jwks/remote.js",
+      "worker": "./dist/browser/jwks/remote.js",
+      "workerd": "./dist/browser/jwks/remote.js",
+      "import": "./dist/node/esm/jwks/remote.js",
+      "require": "./dist/node/cjs/jwks/remote.js"
     },
     "./jwks/local": {
       "types": "./dist/types/jwks/local.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwks/local.js",
-        "require": "./dist/node/cjs/jwks/local.js"
-      },
-      "default": "./dist/browser/jwks/local.js"
+      "bun": "./dist/browser/jwks/local.js",
+      "deno": "./dist/browser/jwks/local.js",
+      "browser": "./dist/browser/jwks/local.js",
+      "worker": "./dist/browser/jwks/local.js",
+      "workerd": "./dist/browser/jwks/local.js",
+      "import": "./dist/node/esm/jwks/local.js",
+      "require": "./dist/node/cjs/jwks/local.js"
     },
     "./jwt/sign": {
       "types": "./dist/types/jwt/sign.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwt/sign.js",
-        "require": "./dist/node/cjs/jwt/sign.js"
-      },
-      "default": "./dist/browser/jwt/sign.js"
+      "bun": "./dist/browser/jwt/sign.js",
+      "deno": "./dist/browser/jwt/sign.js",
+      "browser": "./dist/browser/jwt/sign.js",
+      "worker": "./dist/browser/jwt/sign.js",
+      "workerd": "./dist/browser/jwt/sign.js",
+      "import": "./dist/node/esm/jwt/sign.js",
+      "require": "./dist/node/cjs/jwt/sign.js"
     },
     "./jwt/verify": {
       "types": "./dist/types/jwt/verify.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwt/verify.js",
-        "require": "./dist/node/cjs/jwt/verify.js"
-      },
-      "default": "./dist/browser/jwt/verify.js"
+      "bun": "./dist/browser/jwt/verify.js",
+      "deno": "./dist/browser/jwt/verify.js",
+      "browser": "./dist/browser/jwt/verify.js",
+      "worker": "./dist/browser/jwt/verify.js",
+      "workerd": "./dist/browser/jwt/verify.js",
+      "import": "./dist/node/esm/jwt/verify.js",
+      "require": "./dist/node/cjs/jwt/verify.js"
     },
     "./jwt/encrypt": {
       "types": "./dist/types/jwt/encrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwt/encrypt.js",
-        "require": "./dist/node/cjs/jwt/encrypt.js"
-      },
-      "default": "./dist/browser/jwt/encrypt.js"
+      "bun": "./dist/browser/jwt/encrypt.js",
+      "deno": "./dist/browser/jwt/encrypt.js",
+      "browser": "./dist/browser/jwt/encrypt.js",
+      "worker": "./dist/browser/jwt/encrypt.js",
+      "workerd": "./dist/browser/jwt/encrypt.js",
+      "import": "./dist/node/esm/jwt/encrypt.js",
+      "require": "./dist/node/cjs/jwt/encrypt.js"
     },
     "./jwt/decrypt": {
       "types": "./dist/types/jwt/decrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwt/decrypt.js",
-        "require": "./dist/node/cjs/jwt/decrypt.js"
-      },
-      "default": "./dist/browser/jwt/decrypt.js"
+      "bun": "./dist/browser/jwt/decrypt.js",
+      "deno": "./dist/browser/jwt/decrypt.js",
+      "browser": "./dist/browser/jwt/decrypt.js",
+      "worker": "./dist/browser/jwt/decrypt.js",
+      "workerd": "./dist/browser/jwt/decrypt.js",
+      "import": "./dist/node/esm/jwt/decrypt.js",
+      "require": "./dist/node/cjs/jwt/decrypt.js"
     },
     "./jwt/unsecured": {
       "types": "./dist/types/jwt/unsecured.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwt/unsecured.js",
-        "require": "./dist/node/cjs/jwt/unsecured.js"
-      },
-      "default": "./dist/browser/jwt/unsecured.js"
+      "bun": "./dist/browser/jwt/unsecured.js",
+      "deno": "./dist/browser/jwt/unsecured.js",
+      "browser": "./dist/browser/jwt/unsecured.js",
+      "worker": "./dist/browser/jwt/unsecured.js",
+      "workerd": "./dist/browser/jwt/unsecured.js",
+      "import": "./dist/node/esm/jwt/unsecured.js",
+      "require": "./dist/node/cjs/jwt/unsecured.js"
     },
     "./jwt/decode": {
       "types": "./dist/types/util/decode_jwt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/util/decode_jwt.js",
-        "require": "./dist/node/cjs/util/decode_jwt.js"
-      },
-      "default": "./dist/browser/util/decode_jwt.js"
+      "bun": "./dist/browser/util/decode_jwt.js",
+      "deno": "./dist/browser/util/decode_jwt.js",
+      "browser": "./dist/browser/util/decode_jwt.js",
+      "worker": "./dist/browser/util/decode_jwt.js",
+      "workerd": "./dist/browser/util/decode_jwt.js",
+      "import": "./dist/node/esm/util/decode_jwt.js",
+      "require": "./dist/node/cjs/util/decode_jwt.js"
     },
     "./decode/protected_header": {
       "types": "./dist/types/util/decode_protected_header.d.ts",
-      "node": {
-        "import": "./dist/node/esm/util/decode_protected_header.js",
-        "require": "./dist/node/cjs/util/decode_protected_header.js"
-      },
-      "default": "./dist/browser/util/decode_protected_header.js"
+      "bun": "./dist/browser/util/decode_protected_header.js",
+      "deno": "./dist/browser/util/decode_protected_header.js",
+      "browser": "./dist/browser/util/decode_protected_header.js",
+      "worker": "./dist/browser/util/decode_protected_header.js",
+      "workerd": "./dist/browser/util/decode_protected_header.js",
+      "import": "./dist/node/esm/util/decode_protected_header.js",
+      "require": "./dist/node/cjs/util/decode_protected_header.js"
     },
     "./jws/compact/sign": {
       "types": "./dist/types/jws/compact/sign.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jws/compact/sign.js",
-        "require": "./dist/node/cjs/jws/compact/sign.js"
-      },
-      "default": "./dist/browser/jws/compact/sign.js"
+      "bun": "./dist/browser/jws/compact/sign.js",
+      "deno": "./dist/browser/jws/compact/sign.js",
+      "browser": "./dist/browser/jws/compact/sign.js",
+      "worker": "./dist/browser/jws/compact/sign.js",
+      "workerd": "./dist/browser/jws/compact/sign.js",
+      "import": "./dist/node/esm/jws/compact/sign.js",
+      "require": "./dist/node/cjs/jws/compact/sign.js"
     },
     "./jws/compact/verify": {
       "types": "./dist/types/jws/compact/verify.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jws/compact/verify.js",
-        "require": "./dist/node/cjs/jws/compact/verify.js"
-      },
-      "default": "./dist/browser/jws/compact/verify.js"
+      "bun": "./dist/browser/jws/compact/verify.js",
+      "deno": "./dist/browser/jws/compact/verify.js",
+      "browser": "./dist/browser/jws/compact/verify.js",
+      "worker": "./dist/browser/jws/compact/verify.js",
+      "workerd": "./dist/browser/jws/compact/verify.js",
+      "import": "./dist/node/esm/jws/compact/verify.js",
+      "require": "./dist/node/cjs/jws/compact/verify.js"
     },
     "./jws/flattened/sign": {
       "types": "./dist/types/jws/flattened/sign.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jws/flattened/sign.js",
-        "require": "./dist/node/cjs/jws/flattened/sign.js"
-      },
-      "default": "./dist/browser/jws/flattened/sign.js"
+      "bun": "./dist/browser/jws/flattened/sign.js",
+      "deno": "./dist/browser/jws/flattened/sign.js",
+      "browser": "./dist/browser/jws/flattened/sign.js",
+      "worker": "./dist/browser/jws/flattened/sign.js",
+      "workerd": "./dist/browser/jws/flattened/sign.js",
+      "import": "./dist/node/esm/jws/flattened/sign.js",
+      "require": "./dist/node/cjs/jws/flattened/sign.js"
     },
     "./jws/flattened/verify": {
       "types": "./dist/types/jws/flattened/verify.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jws/flattened/verify.js",
-        "require": "./dist/node/cjs/jws/flattened/verify.js"
-      },
-      "default": "./dist/browser/jws/flattened/verify.js"
+      "bun": "./dist/browser/jws/flattened/verify.js",
+      "deno": "./dist/browser/jws/flattened/verify.js",
+      "browser": "./dist/browser/jws/flattened/verify.js",
+      "worker": "./dist/browser/jws/flattened/verify.js",
+      "workerd": "./dist/browser/jws/flattened/verify.js",
+      "import": "./dist/node/esm/jws/flattened/verify.js",
+      "require": "./dist/node/cjs/jws/flattened/verify.js"
     },
     "./jws/general/sign": {
       "types": "./dist/types/jws/general/sign.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jws/general/sign.js",
-        "require": "./dist/node/cjs/jws/general/sign.js"
-      },
-      "default": "./dist/browser/jws/general/sign.js"
+      "bun": "./dist/browser/jws/general/sign.js",
+      "deno": "./dist/browser/jws/general/sign.js",
+      "browser": "./dist/browser/jws/general/sign.js",
+      "worker": "./dist/browser/jws/general/sign.js",
+      "workerd": "./dist/browser/jws/general/sign.js",
+      "import": "./dist/node/esm/jws/general/sign.js",
+      "require": "./dist/node/cjs/jws/general/sign.js"
     },
     "./jws/general/verify": {
       "types": "./dist/types/jws/general/verify.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jws/general/verify.js",
-        "require": "./dist/node/cjs/jws/general/verify.js"
-      },
-      "default": "./dist/browser/jws/general/verify.js"
+      "bun": "./dist/browser/jws/general/verify.js",
+      "deno": "./dist/browser/jws/general/verify.js",
+      "browser": "./dist/browser/jws/general/verify.js",
+      "worker": "./dist/browser/jws/general/verify.js",
+      "workerd": "./dist/browser/jws/general/verify.js",
+      "import": "./dist/node/esm/jws/general/verify.js",
+      "require": "./dist/node/cjs/jws/general/verify.js"
     },
     "./jwe/compact/encrypt": {
       "types": "./dist/types/jwe/compact/encrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwe/compact/encrypt.js",
-        "require": "./dist/node/cjs/jwe/compact/encrypt.js"
-      },
-      "default": "./dist/browser/jwe/compact/encrypt.js"
+      "bun": "./dist/browser/jwe/compact/encrypt.js",
+      "deno": "./dist/browser/jwe/compact/encrypt.js",
+      "browser": "./dist/browser/jwe/compact/encrypt.js",
+      "worker": "./dist/browser/jwe/compact/encrypt.js",
+      "workerd": "./dist/browser/jwe/compact/encrypt.js",
+      "import": "./dist/node/esm/jwe/compact/encrypt.js",
+      "require": "./dist/node/cjs/jwe/compact/encrypt.js"
     },
     "./jwe/compact/decrypt": {
       "types": "./dist/types/jwe/compact/decrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwe/compact/decrypt.js",
-        "require": "./dist/node/cjs/jwe/compact/decrypt.js"
-      },
-      "default": "./dist/browser/jwe/compact/decrypt.js"
+      "bun": "./dist/browser/jwe/compact/decrypt.js",
+      "deno": "./dist/browser/jwe/compact/decrypt.js",
+      "browser": "./dist/browser/jwe/compact/decrypt.js",
+      "worker": "./dist/browser/jwe/compact/decrypt.js",
+      "workerd": "./dist/browser/jwe/compact/decrypt.js",
+      "import": "./dist/node/esm/jwe/compact/decrypt.js",
+      "require": "./dist/node/cjs/jwe/compact/decrypt.js"
     },
     "./jwe/flattened/encrypt": {
       "types": "./dist/types/jwe/flattened/encrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwe/flattened/encrypt.js",
-        "require": "./dist/node/cjs/jwe/flattened/encrypt.js"
-      },
-      "default": "./dist/browser/jwe/flattened/encrypt.js"
+      "bun": "./dist/browser/jwe/flattened/encrypt.js",
+      "deno": "./dist/browser/jwe/flattened/encrypt.js",
+      "browser": "./dist/browser/jwe/flattened/encrypt.js",
+      "worker": "./dist/browser/jwe/flattened/encrypt.js",
+      "workerd": "./dist/browser/jwe/flattened/encrypt.js",
+      "import": "./dist/node/esm/jwe/flattened/encrypt.js",
+      "require": "./dist/node/cjs/jwe/flattened/encrypt.js"
     },
     "./jwe/flattened/decrypt": {
       "types": "./dist/types/jwe/flattened/decrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwe/flattened/decrypt.js",
-        "require": "./dist/node/cjs/jwe/flattened/decrypt.js"
-      },
-      "default": "./dist/browser/jwe/flattened/decrypt.js"
+      "bun": "./dist/browser/jwe/flattened/decrypt.js",
+      "deno": "./dist/browser/jwe/flattened/decrypt.js",
+      "browser": "./dist/browser/jwe/flattened/decrypt.js",
+      "worker": "./dist/browser/jwe/flattened/decrypt.js",
+      "workerd": "./dist/browser/jwe/flattened/decrypt.js",
+      "import": "./dist/node/esm/jwe/flattened/decrypt.js",
+      "require": "./dist/node/cjs/jwe/flattened/decrypt.js"
     },
     "./jwe/general/encrypt": {
       "types": "./dist/types/jwe/general/encrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwe/general/encrypt.js",
-        "require": "./dist/node/cjs/jwe/general/encrypt.js"
-      },
-      "default": "./dist/browser/jwe/general/encrypt.js"
+      "bun": "./dist/browser/jwe/general/encrypt.js",
+      "deno": "./dist/browser/jwe/general/encrypt.js",
+      "browser": "./dist/browser/jwe/general/encrypt.js",
+      "worker": "./dist/browser/jwe/general/encrypt.js",
+      "workerd": "./dist/browser/jwe/general/encrypt.js",
+      "import": "./dist/node/esm/jwe/general/encrypt.js",
+      "require": "./dist/node/cjs/jwe/general/encrypt.js"
     },
     "./jwe/general/decrypt": {
       "types": "./dist/types/jwe/general/decrypt.d.ts",
-      "node": {
-        "import": "./dist/node/esm/jwe/general/decrypt.js",
-        "require": "./dist/node/cjs/jwe/general/decrypt.js"
-      },
-      "default": "./dist/browser/jwe/general/decrypt.js"
+      "bun": "./dist/browser/jwe/general/decrypt.js",
+      "deno": "./dist/browser/jwe/general/decrypt.js",
+      "browser": "./dist/browser/jwe/general/decrypt.js",
+      "worker": "./dist/browser/jwe/general/decrypt.js",
+      "workerd": "./dist/browser/jwe/general/decrypt.js",
+      "import": "./dist/node/esm/jwe/general/decrypt.js",
+      "require": "./dist/node/cjs/jwe/general/decrypt.js"
     },
     "./errors": {
       "types": "./dist/types/util/errors.d.ts",
-      "node": {
-        "import": "./dist/node/esm/util/errors.js",
-        "require": "./dist/node/cjs/util/errors.js"
-      },
-      "default": "./dist/browser/util/errors.js"
+      "bun": "./dist/browser/util/errors.js",
+      "deno": "./dist/browser/util/errors.js",
+      "browser": "./dist/browser/util/errors.js",
+      "worker": "./dist/browser/util/errors.js",
+      "workerd": "./dist/browser/util/errors.js",
+      "import": "./dist/node/esm/util/errors.js",
+      "require": "./dist/node/cjs/util/errors.js"
     },
     "./base64url": {
       "types": "./dist/types/util/base64url.d.ts",
-      "node": {
-        "import": "./dist/node/esm/util/base64url.js",
-        "require": "./dist/node/cjs/util/base64url.js"
-      },
-      "default": "./dist/browser/util/base64url.js"
+      "bun": "./dist/browser/util/base64url.js",
+      "deno": "./dist/browser/util/base64url.js",
+      "browser": "./dist/browser/util/base64url.js",
+      "worker": "./dist/browser/util/base64url.js",
+      "workerd": "./dist/browser/util/base64url.js",
+      "import": "./dist/node/esm/util/base64url.js",
+      "require": "./dist/node/cjs/util/base64url.js"
     },
     "./package.json": "./package.json"
   },
diff --git a/tools/publish-browser.js b/tools/publish-browser.js
index b7b4e440ee..913e6b0909 100755
--- a/tools/publish-browser.js
+++ b/tools/publish-browser.js
@@ -6,12 +6,12 @@ pkg.devDependencies = undefined
 pkg.scripts = undefined
 pkg.imports = undefined
 pkg.description = undefined
-pkg.main = pkg.browser
+pkg.main = undefined
 pkg.keywords = undefined
 for (const exportPath of Object.keys(pkg.exports)) {
-  if (typeof pkg.exports[exportPath] === 'object') {
-    delete pkg.exports[exportPath].node
-  }
+  pkg.exports[exportPath].import = undefined
+  pkg.exports[exportPath].require = undefined
+  pkg.exports[exportPath].node = pkg.exports[exportPath].browser
 }
 
 pkg.files.push('!dist/**/package.json')
diff --git a/tools/publish-node-cjs.js b/tools/publish-node-cjs.js
index b0f5e559fd..4d0c1dfcae 100755
--- a/tools/publish-node-cjs.js
+++ b/tools/publish-node-cjs.js
@@ -8,22 +8,17 @@ pkg.imports = undefined
 pkg.description = undefined
 pkg.browser = undefined
 pkg.deno = undefined
-pkg.main = pkg.exports['.'].node.require
 for (const exportPath of Object.keys(pkg.exports)) {
-  if (typeof pkg.exports[exportPath] === 'object') {
-    const {
-      types,
-      node: { require: entrypoint },
-    } = pkg.exports[exportPath]
-    pkg.exports[exportPath] = { types, default: entrypoint }
+  for (const runtime of ['browser', 'deno', 'import', 'bun', 'worker', 'workerd']) {
+    pkg.exports[exportPath][runtime] = undefined
   }
 }
 pkg.keywords = undefined
 
 pkg.files.push('!dist/browser/**/*')
 pkg.files.push('!dist/node/esm/**/*')
+pkg.main = pkg.exports['.'].require
 pkg.name = 'jose-node-cjs-runtime'
-pkg.type = 'commonjs'
 
 writeFileSync('./package.json', `${JSON.stringify(pkg, null, 2)}\n`)
 unlinkSync('./CHANGELOG.md')
diff --git a/tools/publish-node-esm.js b/tools/publish-node-esm.js
index f90d43641d..b0a5913c87 100755
--- a/tools/publish-node-esm.js
+++ b/tools/publish-node-esm.js
@@ -8,14 +8,9 @@ pkg.imports = undefined
 pkg.description = undefined
 pkg.browser = undefined
 pkg.deno = undefined
-pkg.main = pkg.exports['.'].node.import
 for (const exportPath of Object.keys(pkg.exports)) {
-  if (typeof pkg.exports[exportPath] === 'object') {
-    const {
-      types,
-      node: { import: entrypoint },
-    } = pkg.exports[exportPath]
-    pkg.exports[exportPath] = { types, default: entrypoint }
+  for (const runtime of ['browser', 'deno', 'require', 'bun', 'worker', 'workerd']) {
+    pkg.exports[exportPath][runtime] = undefined
   }
 }
 pkg.keywords = undefined
@@ -23,6 +18,7 @@ pkg.keywords = undefined
 pkg.files.push('!dist/**/package.json')
 pkg.files.push('!dist/browser/**/*')
 pkg.files.push('!dist/node/cjs/**/*')
+pkg.main = pkg.exports['.'].import
 pkg.name = 'jose-node-esm-runtime'
 pkg.type = 'module'