redirect BUILD_DIR imports to IDOM_CLIENT_BUILD_DIR option

Author: rmorshea

src/idom/server/flask.py

@@ -17,7 +17,7 @@
 from typing_extensions import TypedDict
 
 import idom
-from idom.client.manage import BUILD_DIR
+from idom.config import IDOM_CLIENT_BUILD_DIR
 from idom.core.dispatcher import AbstractDispatcher, SingleViewDispatcher
 from idom.core.layout import Layout, LayoutEvent, LayoutUpdate
 
@@ -111,7 +111,7 @@ def _setup_blueprint_routes(self, config: Config, blueprint: Blueprint) -> None:
 
             @blueprint.route("/client/<path:path>")
             def send_build_dir(path: str) -> Any:
-                return send_from_directory(str(BUILD_DIR), path)
+                return send_from_directory(str(IDOM_CLIENT_BUILD_DIR.get()), path)
 
             if config["redirect_root_to_index"]:
 

src/idom/server/sanic.py

@@ -9,7 +9,7 @@
 from sanic_cors import CORS
 from websockets import WebSocketCommonProtocol
 
-from idom.client.manage import BUILD_DIR
+from idom.client.manage import IDOM_CLIENT_BUILD_DIR
 from idom.core.dispatcher import (
     AbstractDispatcher,
     RecvCoroutine,
@@ -91,7 +91,7 @@ async def sock_recv() -> LayoutEvent:
             await self._run_dispatcher(sock_send, sock_recv, component_params)
 
         if config["serve_static_files"]:
-            blueprint.static("/client", str(BUILD_DIR))
+            blueprint.static("/client", str(IDOM_CLIENT_BUILD_DIR.get()))
 
             if config["redirect_root_to_index"]:
 

src/idom/server/tornado.py

@@ -10,7 +10,7 @@
 from tornado.websocket import WebSocketHandler
 from typing_extensions import TypedDict
 
-from idom.client.manage import BUILD_DIR
+from idom.config import IDOM_CLIENT_BUILD_DIR
 from idom.core.component import ComponentConstructor
 from idom.core.dispatcher import AbstractDispatcher, SingleViewDispatcher
 from idom.core.layout import Layout, LayoutEvent, LayoutUpdate
@@ -85,7 +85,11 @@ def _create_route_handlers(self, config: Config) -> _RouteHandlerSpecs:
 
         if config["serve_static_files"]:
             handlers.append(
-                (r"/client/(.*)", StaticFileHandler, {"path": str(BUILD_DIR)})
+                (
+                    r"/client/(.*)",
+                    StaticFileHandler,
+                    {"path": str(IDOM_CLIENT_BUILD_DIR.get())},
+                )
             )
             if config["redirect_root_to_index"]:
                 handlers.append(("/", RedirectHandler, {"url": "./client/index.html"}))

src/idom/server/utils.py

@@ -1,38 +1,35 @@
 from contextlib import closing
 from importlib import import_module
 from socket import socket
-from types import ModuleType
 from typing import Any, List, Type
 
 
 def find_builtin_server_type(type_name: str) -> Type[Any]:
     """Find first installed server implementation"""
-    builtin_module_names = ["sanic", "flask", "tornado"]
+    supported_packages = ["sanic", "flask", "tornado"]
 
-    installed_builtin_modules: List[ModuleType] = []
-    for module_name in builtin_module_names:
+    installed_builtins: List[str] = []
+    for name in supported_packages:
         try:
-            installed_builtin_modules.append(
-                import_module(f"idom.server.{module_name}")
-            )
+            import_module(name)
         except ImportError:  # coverage: skip
-            pass
-
-    if not installed_builtin_modules:  # coverage: skip
-        raise RuntimeError(
-            f"Found none of the following builtin server implementations {builtin_module_names}"
-        )
-
-    for builtin_module in installed_builtin_modules:
+            continue
+        else:
+            builtin_module = import_module(f"idom.server.{name}")
+            installed_builtins.append(builtin_module.__name__)
         try:
             return getattr(builtin_module, type_name)  # type: ignore
         except AttributeError:  # coverage: skip
             pass
     else:  # coverage: skip
-        installed_names = [m.__name__ for m in installed_builtin_modules]
-        raise ImportError(
-            f"No server type {type_name!r} found in installed implementations {installed_names}"
-        )
+        if not installed_builtins:
+            raise RuntimeError(
+                f"Found none of the following builtin server implementations {supported_packages}"
+            )
+        else:
+            raise ImportError(
+                f"No server type {type_name!r} found in installed implementations {installed_builtins}"
+            )
 
 
 def find_available_port(host: str, port_min: int = 8000, port_max: int = 9000) -> int:

tests/test_client/test_utils.py

@@ -2,25 +2,11 @@
 
 from idom.client.utils import (
     find_js_module_exports_in_source,
-    open_modifiable_json,
     split_package_name_and_version,
 )
 from tests.general_utils import assert_same_items
 
 
-def test_open_modifiable_json(tmp_path):
-    temp_json = tmp_path / "data.json"
-
-    temp_json.touch()
-
-    with open_modifiable_json(temp_json) as data:
-        assert data == {}
-        data["x"] = 1
-
-    with open_modifiable_json(temp_json) as updated_data:
-        assert updated_data == {"x": 1}
-
-
 @pytest.mark.parametrize(
     "module_source, expected_names",
     [