remove hardcoded require

rescript-lang · Jul 2, 2024 · 1b852bc · 1b852bc
1 parent 15c7f0d
commit 1b852bc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
+## 0.12.3 [Unreleased]
+
+#### :bug: Bug Fix
+
+- Remove hardcoded `require` so it works in both common js and ES module modes. (https://github.com/rescript-lang/rescript-react/pull/117)
+
 ## 0.12.2
 
 - Fix incorrect usage of `@uncurry`.

diff --git a/src/RescriptReactErrorBoundary.bs.js b/src/RescriptReactErrorBoundary.bs.js
diff --git a/src/RescriptReactErrorBoundary.res b/src/RescriptReactErrorBoundary.res
@@ -10,8 +10,14 @@ type params<'error> = {
   info: info,
 }
 
+type reactComponentClass
+@module("react") external component: reactComponentClass = "Component"
+let noOp: reactComponentClass => unit = %raw(`function (_x) {}`)
+let reactComponentClass = component
+// this is so that the compiler doesn't optimize away the previous line
+noOp(reactComponentClass)
+
 %%raw(`
-var React = require("react");
 
 var ErrorBoundary = (function (Component) {
   function ErrorBoundary(props) {
@@ -28,7 +34,7 @@ var ErrorBoundary = (function (Component) {
       : this.props.children;
   };
   return ErrorBoundary;
-})(React.Component);
+})(reactComponentClass);
 `)
 
 @react.component @val