Rewrite JS build steps. Rewrite fetching logic for remote components, React, and React-DOM.

Author: Archmonger

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
         uses: ./.github/workflows/.hatch-run.yml
         with:
             job-name: "Publish to PyPI"
-            run-cmd: "hatch build --clean && hatch publish --yes"
+            run-cmd: "hatch run javascript:build && hatch build --clean && hatch publish --yes"
         secrets:
             pypi-username: ${{ secrets.PYPI_USERNAME }}
             pypi-password: ${{ secrets.PYPI_PASSWORD }}

pyproject.toml

@@ -72,9 +72,8 @@ reactpy = "reactpy._console.cli:entry_point"
 
 [[tool.hatch.build.hooks.build-scripts.scripts]]
 commands = [
-  "hatch --env default run javascript:build",
-  'python "src/build_scripts/copy_dir.py" "src/js/node_modules/@pyscript/core/dist" "src/reactpy/static/pyscript"',
-  'python "src/build_scripts/copy_dir.py" "src/js/node_modules/morphdom/dist" "src/reactpy/static/morphdom"',
+  'hatch --env default run "src/build_scripts/copy_dir.py" "src/js/node_modules/@pyscript/core/dist" "src/reactpy/static/pyscript"',
+  'hatch --env default run "src/build_scripts/copy_dir.py" "src/js/node_modules/morphdom/dist" "src/reactpy/static/morphdom"',
 ]
 artifacts = []
 
@@ -84,13 +83,15 @@ artifacts = []
 [tool.hatch.envs.hatch-test.scripts]
 run = [
   'hatch --env default run "src/build_scripts/install_playwright.py"',
+  "hatch --env default run javascript:build --dev",
   "hatch --env default build -t wheel",
   "pytest{env:HATCH_TEST_ARGS:} {args}",
 ]
 run-cov = [
-  'hatch --env default run "src/build_scripts/delete_old_coverage.py"',
   'hatch --env default run "src/build_scripts/install_playwright.py"',
+  "hatch --env default run javascript:build --dev",
   "hatch --env default build -t wheel",
+  'hatch --env default run "src/build_scripts/delete_old_coverage.py"',
   "coverage run -m pytest{env:HATCH_TEST_ARGS:} {args}",
 ]
 cov-combine = "coverage combine"
@@ -198,22 +199,15 @@ test = ['hatch run javascript:build_event_to_object', 'bun test']
 build = [
   'hatch run "src/build_scripts/clean_js_dir.py"',
   'bun install --cwd "src/js"',
-  'hatch run javascript:build_event_to_object',
-  'hatch run javascript:build_client',
-  'hatch run javascript:build_app',
+  'hatch run javascript:build_event_to_object {args}',
+  'hatch run javascript:build_client {args}',
+  'hatch run javascript:build_app {args}',
 ]
 build_event_to_object = [
-  'bun install --cwd "src/js/packages/event-to-object"',
-  'bun run --cwd "src/js/packages/event-to-object" build',
-]
-build_client = [
-  'bun install --cwd "src/js/packages/@reactpy/client"',
-  'bun run --cwd "src/js/packages/@reactpy/client" build',
-]
-build_app = [
-  'bun install --cwd "src/js/packages/@reactpy/app"',
-  'bun run --cwd "src/js/packages/@reactpy/app" build',
+  'hatch run "src/build_scripts/build_js_event_to_object.py" {args}',
 ]
+build_client = ['hatch run "src/build_scripts/build_js_client.py" {args}']
+build_app = ['hatch run "src/build_scripts/build_js_app.py" {args}']
 publish_event_to_object = [
   'hatch run javascript:build_event_to_object',
   'cd "src/js/packages/event-to-object" && bun publish --access public',

src/build_scripts/build_js_app.py

@@ -0,0 +1,30 @@
+# /// script
+# requires-python = ">=3.11"
+# dependencies = []
+# ///
+import pathlib
+import subprocess
+import sys
+
+dev_mode = "--dev" in sys.argv
+root_dir = pathlib.Path(__file__).parent.parent.parent
+build_commands = [
+    [
+        "bun",
+        "install",
+        "--cwd",
+        "src/js/packages/@reactpy/app",
+        *([] if dev_mode else ["--production"]),
+    ],
+    [
+        "bun",
+        "run",
+        "--cwd",
+        "src/js/packages/@reactpy/app",
+        "buildDev" if dev_mode else "build",
+    ],
+]
+
+for command in build_commands:
+    print(f"Running command: '{command}'...")  # noqa: T201
+    subprocess.run(command, check=True, cwd=root_dir)  # noqa: S603

src/build_scripts/build_js_client.py

@@ -0,0 +1,30 @@
+# /// script
+# requires-python = ">=3.11"
+# dependencies = []
+# ///
+import pathlib
+import subprocess
+import sys
+
+dev_mode = "--dev" in sys.argv
+root_dir = pathlib.Path(__file__).parent.parent.parent
+build_commands = [
+    [
+        "bun",
+        "install",
+        "--cwd",
+        "src/js/packages/@reactpy/client",
+        *([] if dev_mode else ["--production"]),
+    ],
+    [
+        "bun",
+        "run",
+        "--cwd",
+        "src/js/packages/@reactpy/client",
+        "build",
+    ],
+]
+
+for command in build_commands:
+    print(f"Running command: '{command}'...")  # noqa: T201
+    subprocess.run(command, check=True, cwd=root_dir)  # noqa: S603

src/build_scripts/build_js_event_to_object.py

@@ -0,0 +1,30 @@
+# /// script
+# requires-python = ">=3.11"
+# dependencies = []
+# ///
+import pathlib
+import subprocess
+import sys
+
+dev_mode = "--dev" in sys.argv
+root_dir = pathlib.Path(__file__).parent.parent.parent
+build_commands = [
+    [
+        "bun",
+        "install",
+        "--cwd",
+        "src/js/packages/event-to-object",
+        *([] if dev_mode else ["--production"]),
+    ],
+    [
+        "bun",
+        "run",
+        "--cwd",
+        "src/js/packages/event-to-object",
+        "build",
+    ],
+]
+
+for command in build_commands:
+    print(f"Running command: '{command}'...")  # noqa: T201
+    subprocess.run(command, check=True, cwd=root_dir)  # noqa: S603

src/js/bun.lockb

@@ -1,7 +1,8 @@
 {
   "workspaces": [
-    "packages/*",
-    "packages/@reactpy/*"
+    "packages/event-to-object",
+    "packages/@reactpy/app",
+    "packages/@reactpy/client"
   ],
   "catalog": {
     "preact": "^10.27.2",

src/js/package.json

@@ -13,7 +13,8 @@
   "license": "MIT",
   "name": "@reactpy/app",
   "scripts": {
-    "build": "bun build \"src/index.ts\" \"src/react.ts\" \"src/react-dom.ts\" \"src/react-jsx-runtime.ts\" --outdir=\"../../../../reactpy/static/\" --minify --sourcemap=\"linked\" --splitting",
+    "build": "bun build \"src/index.ts\" \"src/preact.ts\" \"src/preact-dom.ts\" \"src/preact-jsx-runtime.ts\"  --outdir=\"../../../../reactpy/static/\" --minify --production --sourcemap=\"linked\" --splitting",
+    "buildDev": "bun build \"src/index.ts\" \"src/preact.ts\" \"src/preact-dom.ts\" \"src/preact-jsx-runtime.ts\" --outdir=\"../../../../reactpy/static/\" --sourcemap=\"linked\" --splitting",
     "checkTypes": "tsc --noEmit"
   }
 }

src/js/packages/@reactpy/app/package.json

@@ -0,0 +1 @@
+export * from "preact/compat/jsx-runtime";