From b15179f8049eabe958a2f5f5cdf57d3399bb3069 Mon Sep 17 00:00:00 2001
From: Anton Golub <antongolub@antongolub.com>
Date: Wed, 27 Nov 2024 10:42:56 +0300
Subject: [PATCH] build: use reexport to bind esm and cjs bundles (#958)

* build: use reexport to bind esm and cjs bundles

closes #957

* chore: update esbuild-hybrid-plugin to v0.3.1
---
 package-lock.json    | 8 ++++----
 package.json         | 2 +-
 scripts/build-js.mjs | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f405197938..311a116d6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
         "esbuild-node-externals": "^1.15.0",
         "esbuild-plugin-entry-chunks": "^0.1.15",
         "esbuild-plugin-extract-helpers": "^0.0.6",
-        "esbuild-plugin-hybrid-export": "^0.2.5",
+        "esbuild-plugin-hybrid-export": "^0.3.1",
         "esbuild-plugin-resolve": "^2.0.0",
         "esbuild-plugin-transform-hook": "^0.1.1",
         "esbuild-plugin-utils": "^0.1.0",
@@ -2181,9 +2181,9 @@
       }
     },
     "node_modules/esbuild-plugin-hybrid-export": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/esbuild-plugin-hybrid-export/-/esbuild-plugin-hybrid-export-0.2.5.tgz",
-      "integrity": "sha512-kFNXwtTDf2Ebi2tRaqV3k/XXGpf/FkTzqTn+FcSn/PjhqdFdt8j5fsCvN1zXx8JonFo+Fj3Kl8E3K6XJaYpcOA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/esbuild-plugin-hybrid-export/-/esbuild-plugin-hybrid-export-0.3.1.tgz",
+      "integrity": "sha512-5lnPXHYueI1yJRx140mJxLmXeFGyoDMSeJzJTekmGOlDhwNwS+hKZvO87wy+go1rJmxGie3f0W08ThSl8Tt11w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index f834c0bed3..72e8ac8b46 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "esbuild-node-externals": "^1.15.0",
     "esbuild-plugin-entry-chunks": "^0.1.15",
     "esbuild-plugin-extract-helpers": "^0.0.6",
-    "esbuild-plugin-hybrid-export": "^0.2.5",
+    "esbuild-plugin-hybrid-export": "^0.3.1",
     "esbuild-plugin-resolve": "^2.0.0",
     "esbuild-plugin-transform-hook": "^0.1.1",
     "esbuild-plugin-utils": "^0.1.0",
diff --git a/scripts/build-js.mjs b/scripts/build-js.mjs
index 509a5a2abc..b1e4c880ca 100644
--- a/scripts/build-js.mjs
+++ b/scripts/build-js.mjs
@@ -85,7 +85,7 @@ if (bundle === 'src') {
 if (hybrid) {
   plugins.push(
     hybridExportPlugin({
-      loader: 'require',
+      loader: 'reexport',
       to: 'build',
       toExt: '.js',
     })
@@ -100,7 +100,7 @@ plugins.push(
         if: !hybrid,
         pattern: /\.js$/,
         transform(contents) {
-          return injectCode(contents, `import { require } from './deno.js'`)
+          return injectCode(contents, `import './deno.js'`)
         },
       },
       {