Sync with reactpy core repo

Author: Archmonger

.github/workflows/test-python.yml

@@ -76,5 +76,5 @@ jobs:
                   python-version: 3.x
             - name: Install Python Dependencies
               run: pip install --upgrade pip hatch uv
-            - name: Check Python formatting
+            - name: Run Python type checker
               run: hatch run python:type_check

.gitignore

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

docs/src/about/contributing.md

@@ -50,7 +50,7 @@ By utilizing `hatch`, the following commands are available to manage the develop
 
     The `hatch test` command is a wrapper for `pytest`. Hatch "intercepts" a handful of arguments, which can be previewed by typing `hatch test --help`.
 
-    Any additional arguments in the `test` command are directly passed on to pytest. See the [pytest documentation](https://docs.pytest.org/en/stable/reference/reference.html#command-line-flags) for what additional arguments are available.
+    Any additional arguments in the `test` command are provided directly to pytest. See the [pytest documentation](https://docs.pytest.org/en/stable/reference/reference.html#command-line-flags) for what additional arguments are available.
 
 ### Linting and Formatting
 

pyproject.toml

@@ -75,7 +75,7 @@ installer = "uv"
 [[tool.hatch.build.hooks.build-scripts.scripts]]
 commands = [
   "bun install --cwd src/js",
-  "bun build src/js/src/index.ts --outfile src/reactpy_django/static/reactpy_django/client.js --minify",
+  'bun build src/js/src/index.ts --outdir="src/reactpy_django/static/reactpy_django/" --minify --sourcemap=linked',
   'cd src/build_scripts && python copy_dir.py "src/js/node_modules/@pyscript/core/dist" "src/reactpy_django/static/reactpy_django/pyscript"',
   'cd src/build_scripts && python copy_dir.py "src/js/node_modules/morphdom/dist" "src/reactpy_django/static/reactpy_django/morphdom"',
 ]

src/js/src/client.ts

@@ -19,11 +19,14 @@ export class ReactPyDjangoClient
   constructor(props: ReactPyDjangoClientProps) {
     super();
     this.urls = props.urls;
+    this.mountElement = props.mountElement;
+    this.prerenderElement = props.prerenderElement;
+    this.offlineElement = props.offlineElement;
     this.socket = createReconnectingWebSocket({
-      readyPromise: this.ready,
       url: this.urls.componentUrl,
-      onMessage: async ({ data }) => this.handleIncoming(JSON.parse(data)),
+      readyPromise: this.ready,
       ...props.reconnectOptions,
+      onMessage: async ({ data }) => this.handleIncoming(JSON.parse(data)),
       onClose: () => {
         // If offlineElement exists, show it and hide the mountElement/prerenderElement
         if (this.prerenderElement) {
@@ -43,9 +46,6 @@ export class ReactPyDjangoClient
         }
       },
     });
-    this.mountElement = props.mountElement;
-    this.prerenderElement = props.prerenderElement;
-    this.offlineElement = props.offlineElement;
   }
 
   sendMessage(message: any): void {

src/js/src/types.ts

@@ -7,7 +7,6 @@ export type ReconnectOptions = {
 
 export type ReactPyUrls = {
   componentUrl: URL;
-  query: string;
   jsModules: string;
 };
 

src/reactpy_django/checks.py

@@ -62,11 +62,11 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
-    # Check if reactpy_django/client.js is available
-    if not find("reactpy_django/client.js"):
+    # Check if reactpy_django/index.js is available
+    if not find("reactpy_django/index.js"):
         warnings.append(
             Warning(
-                "ReactPy client.js could not be found within Django static files!",
+                "ReactPy index.js could not be found within Django static files!",
                 hint="Check all static files related Django settings and INSTALLED_APPS.",
                 id="reactpy_django.W004",
             )

src/reactpy_django/forms/components.py

@@ -27,7 +27,7 @@
     from reactpy.core.types import VdomDict
 
 DjangoForm = export(
-    module_from_file("reactpy-django", file=Path(__file__).parent.parent / "static" / "reactpy_django" / "client.js"),
+    module_from_file("reactpy-django", file=Path(__file__).parent.parent / "static" / "reactpy_django" / "index.js"),
     ("DjangoForm"),
 )
 

src/reactpy_django/javascript_components.py

@@ -5,6 +5,6 @@
 from reactpy import web
 
 HttpRequest = web.export(
-    web.module_from_file("reactpy-django", file=Path(__file__).parent / "static" / "reactpy_django" / "client.js"),
+    web.module_from_file("reactpy-django", file=Path(__file__).parent / "static" / "reactpy_django" / "index.js"),
     ("HttpRequest"),
 )

src/reactpy_django/templates/reactpy/component.html

@@ -10,7 +10,7 @@
 {% if reactpy_prerender_html %}<div id="{{reactpy_uuid}}-prerender">{{reactpy_prerender_html|safe}}</div>{% endif %}
 {% if reactpy_offline_html %}<div id="{{reactpy_uuid}}-offline" hidden>{{reactpy_offline_html|safe}}</div>{% endif %}
 <script type="module" crossorigin="anonymous">
-    import { mountComponent } from "{% static 'reactpy_django/client.js' %}";
+    import { mountComponent } from "{% static 'reactpy_django/index.js' %}";
     const mountElement = document.getElementById("{{reactpy_uuid}}");
     mountComponent(
         mountElement,

tests/test_app/__init__.py

@@ -8,7 +8,14 @@
 assert subprocess.run(["bun", "install"], cwd=str(js_dir), check=True).returncode == 0
 assert (
     subprocess.run(
-        ["bun", "build", "./src/index.ts", "--outfile", str(static_dir / "client.js"), "--minify"],
+        [
+            "bun",
+            "build",
+            "./src/index.ts",
+            f"--outdir={static_dir}",
+            "--minify",
+            "--sourcemap=linked",
+        ],
         cwd=str(js_dir),
         check=True,
     ).returncode