upgrade snowpack

Author: rmorshea

MANIFEST.in

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

idom/client/manage.py

@@ -4,24 +4,25 @@
 from loguru import logger
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Optional, List, Union, Dict, Any, Sequence
+from typing import Optional, List, Union, Dict, Sequence
 
 from .utils import Spinner
 
 
 STATIC_DIR = Path(__file__).parent / "static"
-
-CORE_MODULES = STATIC_DIR / "core_modules"
 NODE_MODULES = STATIC_DIR / "node_modules"
-WEB_MODULES = STATIC_DIR / "web_modules"
+BUILD_DIR = STATIC_DIR / "build"
+CORE_MODULES = BUILD_DIR / "core_modules"
+WEB_MODULES = BUILD_DIR / "web_modules"
+
 
 STATIC_SHIMS: Dict[str, Path] = {}
 
 
 def find_path(url_path: str) -> Optional[Path]:
     url_path = url_path.strip("/")
 
-    builtin_path = STATIC_DIR.joinpath(*url_path.split("/"))
+    builtin_path = BUILD_DIR.joinpath(*url_path.split("/"))
     if builtin_path.exists():
         return builtin_path
 
@@ -83,9 +84,9 @@ 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("*"):
-        if path.is_file() and path.suffix == ".js":
-            rel_path = path.relative_to(WEB_MODULES)
+    for path in WEB_MODULES.rglob("*.js"):
+        rel_path = path.relative_to(WEB_MODULES)
+        if rel_path.parent.name != "common":
             names.append(str(rel_path.with_suffix("")))
     return list(sorted(names))
 
@@ -108,51 +109,40 @@ def install(
         for exp in export_list:
             delete_web_modules(exp, skip_missing=True)
 
-    package_json = _package_json()
-    package_json["snowpack"]["webDependencies"].extend(export_list)
-
     with TemporaryDirectory() as tempdir:
+        if BUILD_DIR.exists():
+            shutil.rmtree(BUILD_DIR)
+
         tempdir_path = Path(tempdir)
+        temp_static_dir = tempdir_path / "static"
+
+        shutil.copytree(STATIC_DIR, temp_static_dir, symlinks=True)
+        assert (temp_static_dir / "package.json").exists()
 
-        if NODE_MODULES.exists():
-            shutil.copytree(
-                NODE_MODULES, tempdir_path / NODE_MODULES.name, symlinks=True
-            )
+        with open(temp_static_dir / "package.json") as f:
+            package_json = json.load(f)
 
-        with (tempdir_path / "package.json").open("w+") as f:
+        package_json["snowpack"].setdefault("install", []).extend(export_list)
+
+        with (temp_static_dir / "package.json").open("w+") as f:
             json.dump(package_json, f)
 
         with Spinner(f"Installing: {', '.join(package_list)}"):
-            _run_subprocess(["npm", "install"], tempdir)
-            _run_subprocess(["npm", "install"] + package_list, tempdir)
-            _run_subprocess(["npm", "run", "snowpack"], tempdir)
+            _run_subprocess(["npm", "install"], temp_static_dir)
+            _run_subprocess(["npm", "install"] + package_list, temp_static_dir)
+            _run_subprocess(["npm", "run", "build"], temp_static_dir)
+
+        shutil.copytree(temp_static_dir / "build", BUILD_DIR, symlinks=True)
 
 
 def restore() -> None:
     with Spinner("Restoring"):
         _delete_os_paths(WEB_MODULES, NODE_MODULES)
         _run_subprocess(["npm", "install"], STATIC_DIR)
-        _run_subprocess(["npm", "run", "snowpack"], STATIC_DIR)
+        _run_subprocess(["npm", "run", "build"], STATIC_DIR)
     STATIC_SHIMS.clear()
 
 
-def _package_json() -> Dict[str, Any]:
-    with (STATIC_DIR / "package.json").open("r") as f:
-        dependencies = json.load(f)["dependencies"]
-
-    return {
-        "dependencies": dependencies,
-        "scripts": {"snowpack": "./node_modules/.bin/snowpack"},
-        "devDependencies": {"snowpack": "^1.6.0"},
-        "snowpack": {
-            "installOptions": {
-                "dest": str(WEB_MODULES),
-            },
-            "webDependencies": [],
-        },
-    }
-
-
 def _run_subprocess(args: List[str], cwd: Union[str, Path]) -> None:
     try:
         subprocess.run(

idom/client/static/core_modules/layout.js

@@ -1,22 +1,17 @@
-import React, {
-  useEffect,
-  useState,
-  useMemo,
-  Suspense,
-} from "../web_modules/react.js";
 
-import ReactDOM from "../web_modules/react-dom.js";
-import htm from "../web_modules/htm.js";
-import * as jsonpatch from "../web_modules/fast-json-patch.js";
+import * as react from "react";
+import * as reactDOM from "react-dom";
+import htm from "htm";
+import * as jsonpatch from "fast-json-patch";
 
-import serializeEvent from "./event-to-object.js";
+import serializeEvent from "./event-to-object";
 
-const html = htm.bind(React.createElement);
+const html = htm.bind(react.createElement);
 const alreadyImported = {};
 
 export function renderLayout(mountElement, endpoint) {
   const cmpt = html`<${Layout} endpoint=${endpoint} />`;
-  return ReactDOM.render(cmpt, mountElement);
+  return reactDOM.render(cmpt, mountElement);
 }
 
 export default function Layout({ endpoint }) {
@@ -36,8 +31,8 @@ export default function Layout({ endpoint }) {
     endpoint = new_uri + endpoint;
   }
 
-  const socket = useMemo(() => new WebSocket(endpoint), [endpoint]);
-  const [state, setState] = useState({ model: {} });
+  const socket = react.useMemo(() => new WebSocket(endpoint), [endpoint]);
+  const [state, setState] = react.useState({ model: {} });
 
   socket.onmessage = (event) => {
     const [pathPrefix, patch] = JSON.parse(event.data);
@@ -152,7 +147,7 @@ function eventHandler(sendEvent, eventSpec) {
 }
 
 function useLazyModule(source) {
-  const [module, setModule] = useState(alreadyImported[source]);
+  const [module, setModule] = react.useState(alreadyImported[source]);
   if (!module) {
     dynamicImport(source).then(setModule);
   }