rename static/ dir to app/

Author: rmorshea

MANIFEST.in

@@ -1,4 +1,4 @@
-graft idom/client/static/build
+graft idom/client/app/build
 include idom/py.typed
 include LICENSE
 include requirements/prod.txt

docs/Dockerfile

@@ -21,7 +21,7 @@ ADD setup.py ./
 ADD setup.cfg ./
 ADD MANIFEST.in ./
 ADD README.md ./
-ADD idom/client/static/favicon.ico ./
+ADD idom/client/app/favicon.ico ./
 
 RUN pip install -e .[all]
 RUN python -m idom install victory semantic-ui-react @material-ui/core

docs/main.py

@@ -7,14 +7,14 @@
 from sanic import response
 
 from idom.widgets.utils import multiview
-from idom.client.manage import STATIC_DIR
+from idom.client.manage import APP_DIR
 from idom.server.sanic import PerClientStateServer
 
 here = Path(__file__).parent
 
 app = Sanic(__name__)
 app.static("/docs", str(here / "build"))
-app.static("/favicon.ico", str(STATIC_DIR / "favicon.ico"))
+app.static("/favicon.ico", str(APP_DIR / "favicon.ico"))
 
 
 @app.route("/")

idom/client/static/.gitignore renamed to idom/client/app/.gitignore

@@ -9,11 +9,9 @@
 from .utils import Spinner
 
 
-STATIC_DIR = Path(__file__).parent / "static"
-NODE_MODULES = STATIC_DIR / "node_modules"
-BUILD_DIR = STATIC_DIR / "build"
-CORE_MODULES = BUILD_DIR / "core_modules"
-WEB_MODULES = BUILD_DIR / "web_modules"
+APP_DIR = Path(__file__).parent / "app"
+BUILD_DIR = APP_DIR / "build"
+WEB_MODULES_DIR = BUILD_DIR / "web_modules"
 
 
 STATIC_SHIMS: Dict[str, Path] = {}
@@ -34,7 +32,7 @@ def web_module_path(name: str) -> Optional[Path]:
 
 
 def web_module_url(name: str) -> str:
-    path = f"../{WEB_MODULES.name}/{name}.js"
+    path = f"../{WEB_MODULES_DIR.name}/{name}.js"
     if not web_module_exists(name):
         raise ValueError(f"Module '{path}' does not exist.")
     return path
@@ -89,8 +87,8 @@ def delete_web_modules(names: Sequence[str], skip_missing: bool = False) -> None
 
 def installed() -> List[str]:
     names: List[str] = []
-    for path in WEB_MODULES.rglob("*.js"):
-        rel_path = path.relative_to(WEB_MODULES)
+    for path in WEB_MODULES_DIR.rglob("*.js"):
+        rel_path = path.relative_to(WEB_MODULES_DIR)
         if rel_path.parent.name != "common":
             names.append(str(rel_path.with_suffix("")))
     return list(sorted(names))
@@ -103,7 +101,7 @@ def install(packages: Sequence[str], exports: Sequence[str] = ()) -> None:
         temp_build_dir = temp_static_dir / "build"
 
         # copy over the whole ./static directory into the temp one
-        shutil.copytree(STATIC_DIR, temp_static_dir, symlinks=True)
+        shutil.copytree(APP_DIR, temp_static_dir, symlinks=True)
 
         cache = Cache(temp_build_dir)
         cache.add_packages(packages, exports)
@@ -133,8 +131,8 @@ def install(packages: Sequence[str], exports: Sequence[str] = ()) -> None:
 def restore() -> None:
     with Spinner("Restoring"):
         _delete_os_paths(BUILD_DIR)
-        _run_subprocess(["npm", "install"], STATIC_DIR)
-        _run_subprocess(["npm", "run", "build"], STATIC_DIR)
+        _run_subprocess(["npm", "install"], APP_DIR)
+        _run_subprocess(["npm", "run", "build"], APP_DIR)
     STATIC_SHIMS.clear()
 
 

idom/client/static/README.md renamed to idom/client/app/README.md

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-cd idom/client/static
+cd idom/client/app
 rm -rf node_modules
 rm -rf web_modules
 npm install

idom/client/static/core_modules/event-to-object.js renamed to idom/client/app/core_modules/event-to-object.js

@@ -10,7 +10,7 @@ max-line-length = 88
 max-complexity = 18
 select = B,C,E,F,W,T4,B9,N
 exclude =
-    idom/client/static/node_modules/*
+    idom/client/app/node_modules/*
     docs/source/examples/*
     .eggs/*
     .tox/*

idom/client/static/core_modules/layout.js renamed to idom/client/app/core_modules/layout.js

@@ -31,7 +31,7 @@ commands = mypy --strict idom
 skip_install = true
 deps = -r requirements/lint.txt
 commands =
-    black . --check --exclude "idom/client/static/node_modules/.*"
+    black . --check --exclude "idom/client/app/node_modules/.*"
     flake8 idom tests docs
 
 [testenv:py38-docs]