fix #429 - move client JS to top of src/ dir

.github/workflows/test.yml

@@ -67,7 +67,7 @@ jobs:
           npm install -g npm@latest
           npm --version
       - name: Test Javascript
-        working-directory: ./src/idom/client
+        working-directory: ./src/client
         run: |
           npm install
           npm test

.gitignore

@@ -39,3 +39,4 @@ pip-wheel-metadata
 # --- JS ---
 
 node_modules
+src/idom/client

MANIFEST.in

@@ -1,4 +1,3 @@
-recursive-include src/idom *
-recursive-exclude src/idom/client/node_modules *
+recursive-include src/idom/client *
 include requirements/prod.txt
 include requirements/extras.txt

docs/source/custom_js/package.json

@@ -15,6 +15,6 @@
     "rollup-plugin-replace": "^2.2.0"
   },
   "dependencies": {
-    "idom-client-react": "file:../../../src/idom/client/packages/idom-client-react"
+    "idom-client-react": "file:../../../src/client/packages/idom-client-react"
   }
 }

setup.py

@@ -119,7 +119,7 @@ class Command(cls):
         def run(self):
             log.info("Installing Javascript...")
             try:
-                js_dir = str(package_dir / "client")
+                js_dir = str(src_dir / "client")
                 npm = shutil.which("npm")  # this is required on windows
                 if npm is None:
                     raise RuntimeError("NPM is not installed.")

src/idom/client/snowpack.config.js → src/client/snowpack.config.js

@@ -1,4 +1,5 @@
 module.exports = {
   workspaceRoot: false,
   testOptions: { files: ["**/tests/**/*", "**/*.test.*"] },
+  buildOptions: { out: "../idom/client" },
 };

src/idom/__init__.py

@@ -22,26 +22,21 @@
 
 
 __all__ = [
-    "run",
-    "component",
-    "Component",
-    "event",
-    "Events",
-    "dialect",
+    "config",
     "html",
+    "log",
+    "web",
     "hooks",
+    "Component",
+    "component",
+    "Events",
+    "event",
     "Layout",
-    "server",
-    "Ref",
+    "VdomDict",
     "vdom",
+    "run",
+    "Ref",
+    "html_to_vdom",
     "hotswap",
     "multiview",
-    "html_to_vdom",
-    "VdomDict",
-    "widgets",
-    "client",
-    "install",
-    "log",
-    "config",
-    "web",
 ]

src/idom/server/utils.py

@@ -13,7 +13,7 @@
 from .proto import ServerFactory
 
 
-CLIENT_BUILD_DIR = Path(idom.__file__).parent / "client" / "build"
+CLIENT_BUILD_DIR = Path(idom.__file__).parent / "client"
 
 _SUPPORTED_PACKAGES = [
     "sanic",