fix docs

rmorshea · rmorshea · commit e4774928b477 · 2021-01-18T10:48:29.000-08:00
diff --git a/docs/source/_exts/interactive_widget.py b/docs/source/_exts/interactive_widget.py
@@ -31,14 +31,13 @@ def run(self):
                         enableWidgetButton.setAttribute("class", "enable-widget-button")
 
                         enableWidgetButton.addEventListener("click", () => {{
-                            import("/client/src/layout.js").then((layout) => {{
+                            import("/client/index.js").then((module) => {{
                                 fadeOutAndThen(enableWidgetButton, () => {{
                                     mount.removeChild(enableWidgetButton);
                                     mount.setAttribute("class", "interactive widget-container");
-                                    layout.mountLayoutWithWebSocket(
+                                    module.mountLayoutWithWebSocket(
                                       mount,
                                       ws_proto + idom_url + "/stream?view_id={view_id}",
-                                      "/client/web_modules",
                                     );
                                 }});
                             }});
diff --git a/idom/cli.py b/idom/cli.py
@@ -18,8 +18,8 @@ def install(packages: List[str]) -> None:
 
 
 @main.command()
-def restore() -> None:
-    manage_client.build([], clean_build=True)
+def restore(clean_build: bool = True) -> None:
+    manage_client.build([], clean_build=clean_build)
     return None
 
 
diff --git a/idom/client/app/index.html b/idom/client/app/index.html
@@ -8,41 +8,9 @@
   <body>
     <div id="app"></div>
     <script type="module">
-      import { mountLayout } from "idom-client-react";
+      import { mountLayoutWithWebSocket } from "./index.js";
 
-      const uri = document.location.hostname + ":" + document.location.port;
-      const url = (uri + document.location.pathname).split("/").slice(0, -1);
-      url[url.length - 1] = "stream";
-      const secure = document.location.protocol === "https:";
-
-      let protocol;
-      if (secure) {
-        protocol = "wss:";
-      } else {
-        protocol = "ws:";
-      }
-
-      let endpoint = protocol + "//" + url.join("/") + window.location.search;
-
-      const ws = new WebSocket(endpoint);
-
-      function saveUpdateHook(update) {
-        ws.onmessage = (event) => {
-          const [pathPrefix, patch] = JSON.parse(event.data);
-          update(pathPrefix, patch);
-        };
-      }
-
-      function sendCallback(event) {
-        ws.send(JSON.stringify(event));
-      }
-
-      mountLayout(
-        document.getElementById("app"),
-        saveUpdateHook,
-        sendCallback,
-        "../web_modules/"
-      );
+      mountLayoutWithWebSocket(document.getElementById("app"));
     </script>
   </body>
 </html>
diff --git a/idom/client/app/index.js b/idom/client/app/index.js
@@ -0,0 +1,34 @@
+import { mountLayout } from "idom-client-react";
+
+export function mountLayoutWithWebSocket(element, endpoint, importSourceURL) {
+  const ws = new WebSocket(endpoint || defaultWebSocketEndpoint());
+
+  function saveUpdateHook(update) {
+    ws.onmessage = (event) => {
+      const [pathPrefix, patch] = JSON.parse(event.data);
+      update(pathPrefix, patch);
+    };
+  }
+
+  function sendCallback(event) {
+    ws.send(JSON.stringify(event));
+  }
+
+  mountLayout(element, saveUpdateHook, sendCallback, importSourceURL || "./");
+}
+
+function defaultWebSocketEndpoint() {
+  const uri = document.location.hostname + ":" + document.location.port;
+  const url = (uri + document.location.pathname).split("/").slice(0, -1);
+  url[url.length - 1] = "stream";
+  const secure = document.location.protocol === "https:";
+
+  let protocol;
+  if (secure) {
+    protocol = "wss:";
+  } else {
+    protocol = "ws:";
+  }
+
+  return protocol + "//" + url.join("/") + window.location.search;
+}
diff --git a/idom/client/app/package.json b/idom/client/app/package.json
@@ -3,6 +3,7 @@
   "description": "A client application for IDOM implemented in React",
   "version": "0.1.0",
   "author": "Ryan Morshead",
+  "main": "index.js",
   "license": "MIT",
   "repository": {
     "type": "git",
