workflow for pyscript dist

Author: Archmonger

.gitignore

@@ -1,5 +1,6 @@
 # ReactPy-Django Build Artifacts
-src/reactpy_django/static/*
+src/reactpy_django/static/reactpy_django/client.js
+src/reactpy_django/static/reactpy_django/pyscript
 
 # Django #
 logs

setup.py

@@ -1,5 +1,6 @@
 from __future__ import annotations, print_function
 
+import shutil
 import sys
 import traceback
 from distutils import log
@@ -16,7 +17,9 @@
 name = "reactpy_django"
 root_dir = Path(__file__).parent
 src_dir = root_dir / "src"
+js_dir = src_dir / "js"
 package_dir = src_dir / name
+static_dir = package_dir / "static" / name
 
 
 # -----------------------------------------------------------------------------
@@ -97,22 +100,29 @@
 def build_javascript_first(build_cls: type):
     class Command(build_cls):
         def run(self):
-            js_dir = str(src_dir / "js")
 
             log.info("Installing Javascript...")
-            result = npm.call(["install"], cwd=js_dir)
+            result = npm.call(["install"], cwd=str(js_dir))
             if result != 0:
                 log.error(traceback.format_exc())
                 log.error("Failed to install Javascript")
                 raise RuntimeError("Failed to install Javascript")
 
             log.info("Building Javascript...")
-            result = npm.call(["run", "build"], cwd=js_dir)
+            result = npm.call(["run", "build"], cwd=str(js_dir))
             if result != 0:
                 log.error(traceback.format_exc())
                 log.error("Failed to build Javascript")
                 raise RuntimeError("Failed to build Javascript")
 
+            log.info("Copying @pyscript/core distribution")
+            pyscript_dist = js_dir / "node_modules" / "@pyscript" / "core" / "dist"
+            pyscript_static_dir = static_dir / "pyscript"
+            if not pyscript_static_dir.exists():
+                pyscript_static_dir.mkdir()
+            for file in pyscript_dist.iterdir():
+                shutil.copy(file, pyscript_static_dir / file.name)
+
             log.info("Successfully built Javascript")
             super().run()
 

src/js/package-lock.json

@@ -13,13 +13,14 @@
     "@rollup/plugin-replace": "^5.0.5",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
-    "prettier": "^3.2.3",
     "eslint": "^8.38.0",
     "eslint-plugin-react": "^7.32.2",
+    "prettier": "^3.2.3",
     "rollup": "^4.9.5",
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "@pyscript/core": "^0.4.48",
     "@reactpy/client": "^0.3.1",
     "@rollup/plugin-typescript": "^11.1.6",
     "tslib": "^2.6.2"

src/js/package.json

@@ -1,3 +1,4 @@
+import shutil
 from pathlib import Path
 
 from nodejs import npm
@@ -6,3 +7,18 @@
 js_dir = Path(__file__).parent.parent.parent / "src" / "js"
 assert npm.call(["install"], cwd=str(js_dir)) == 0
 assert npm.call(["run", "build"], cwd=str(js_dir)) == 0
+
+# Make sure the current PyScript distribution is available
+pyscript_dist = js_dir / "node_modules" / "@pyscript" / "core" / "dist"
+pyscript_static_dir = (
+    Path(__file__).parent.parent.parent
+    / "src"
+    / "reactpy_django"
+    / "static"
+    / "reactpy_django"
+    / "pyscript"
+)
+if not pyscript_static_dir.exists():
+    pyscript_static_dir.mkdir()
+for file in pyscript_dist.iterdir():
+    shutil.copy(file, pyscript_static_dir / file.name)