fix: replace esbuild with webpack to ensure require works on runtime

davesnx · Feb 10, 2022 · 43c0654 · 43c0654
1 parent 804b0ef
commit 43c0654
Show file tree

Hide file tree

Showing 9 changed files with 39,917 additions and 9,557 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@ _coverage
 *.coverage
 coverage.json
 
-# BuckleScript artifacts
-*.bs.js
+# Website artifacts
+website/build
diff --git a/package.json b/package.json
diff --git a/website/Monaco.re b/website/Monaco.re
@@ -32,4 +32,4 @@ external make:
     ~options: options
   ) =>
   React.element =
-  {|require("@monaco-editor/react")|};
+  {|require("@monaco-editor/react").Editor|};
diff --git a/website/dune b/website/dune
@@ -1,12 +1,16 @@
 (executable
  (name Website)
  (modes js)
- (libraries
-  console.lib
-  query-json-js
-  yojson
-  js_of_ocaml
-  jsoo-react.lib
-  jsoo-css)
+ (libraries query-json-js js_of_ocaml jsoo-react.lib jsoo-css)
  (preprocess
   (pps jsoo-react.ppx ppx_jsobject_conv)))
+
+; @monaco-editor/react uses `rollupjs` to build
+; which creates a folder with underscore `_virtual`
+; dune by default ignores any prefixed with underscore folder.
+; This hardcodes the path dune ignores.
+; If we update the lib, this might break
+
+(dirs
+ node_modules/@monaco-editor/react/lib/cjs/_virtual
+ node_modules/@monaco-editor/loader/lib/cjs/_virtual)
diff --git a/website/index.html b/website/index.html
@@ -57,6 +57,5 @@
   </head>
   <body>
     <div id="root"></div>
-    <script src="./js/bundle.js"></script>
   </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,5 @@ @@
       </head>
       <body>
         <div id="root"></div>
-        <script src="./js/bundle.js"></script>
       </body>
     </html>