convert to building standard js app

Author: rmorshea

.gitignore

@@ -1,4 +1,3 @@
-
 # Django #
 logs
 *.log
@@ -125,4 +124,4 @@ GitHub.sublime-settings
 %SystemDrive%
 
 # Mac file system
-.DS_Store
+.DS_Store

noxfile.py

@@ -14,6 +14,20 @@
 POSARGS_PATTERN = re.compile(r"^(\w+)\[(.+)\]$")
 
 
+@nox.session(reuse_venv=True)
+def manage(session: Session) -> None:
+ session.install("-r", "requirements.txt")
+ session.install("idom[stable]")
+ session.install("-e", ".")
+ session.chdir("tests")
+
+ build_js_on_commands = ["runserver"]
+ if set(session.posargs).intersection(build_js_on_commands):
+ session.run("python", "manage.py", "build_js")
+
+ session.run("python", "manage.py", *session.posargs)
+
+
 @nox.session(reuse_venv=True)
 def format(session: Session) -> None:
  install_requirements_file(session, "check-style")
@@ -35,6 +49,7 @@ def test_suite(session: Session) -> None:
  session.env["IDOM_DEBUG_MODE"] = "1"
  install_requirements_file(session, "test-env")
  session.install(".[all]")
+ session.chdir("tests")
  session.run("figure-it-out")
 
 

requirements/test-env.txt

@@ -1,2 +1 @@
-django<4.0.0 # Django Library
-daphne<4.0.0 # Production ASGI webserver
+django

src/django_idom/websocket_consumer.py

@@ -4,6 +4,7 @@
 
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 
+from idom.core.layout import Layout
 from idom.core.dispatcher import dispatch_single_view
 from idom.core.component import ComponentConstructor
 
@@ -18,17 +19,23 @@ def __init__(
  super().__init__(*args, **kwargs)
 
  async def connect(self) -> None:
+ await super().connect()
  self._idom_recv_queue = recv_queue = asyncio.Queue()
- self._idom_dispatcher_future = dispatch_single_view(
- self._idom_component_constructor,
- self.send_json,
- recv_queue.get,
+ self._idom_dispatcher_future = asyncio.ensure_future(
+ dispatch_single_view(
+ Layout(self._idom_component_constructor()),
+ self.send_json,
+ recv_queue.get,
+ )
  )
 
  async def close(self, *args: Any, **kwargs: Any) -> None:
- self._idom_dispatcher_future.cancel()
+ if self._idom_dispatcher_future.done():
+ await self._idom_dispatcher_future
+ else:
+ self._idom_dispatcher_future.cancel()
  await asyncio.wait([self._idom_dispatcher_future])
- super().close(*args, **kwargs)
+ await super().close(*args, **kwargs)
 
  async def receive_json(self, content: Any, **kwargs: Any) -> None:
  await self._idom_recv_queue.put(content)

tests/.gitignore

@@ -0,0 +1 @@
+test_app/static/build.js

tests/js/.gitignore

@@ -0,0 +1,2 @@
+# Javascript
+node_modules