Merge remote-tracking branch 'upstream/main' into pr/1191

Author: Archmonger

.github/pull_request_template.md

@@ -1,14 +1,14 @@
-<sub>By submitting this pull request you agree that all contributions to this project are made under the MIT license.</sub>
+## Description
 
-## Issues
+<!-- A summary of the changes. -->
 
-<!-- Describe or link the issues this change resolves -->
-
-## Solution
+## Checklist
 
-<!-- Describe how these changes resolve the aforementioned issues -->
+Please update this checklist as you complete each item:
 
-## Checklist
+-   [ ] Tests have been developed for bug fixes or new functionality.
+-   [ ] The changelog has been updated, if necessary.
+-   [ ] Documentation has been updated, if necessary.
+-   [ ] GitHub Issues closed by this PR have been linked.
 
-- [ ] Tests have been included for all bug fixes or added functionality.
-- [ ] The `changelog.rst` has been updated with any significant changes.
+<sub>By submitting this pull request I agree that all contributions comply with this project's open source license(s).</sub>

.github/workflows/.hatch-run.yml

@@ -38,15 +38,15 @@ jobs:
                 runs-on: ${{ fromJson(inputs.runs-on-array) }}
         runs-on: ${{ matrix.runs-on }}
         steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v2
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
-                  node-version: "14.x"
+                  node-version: "23.x"
                   registry-url: ${{ inputs.node-registry-url }}
             - name: Pin NPM Version
               run: npm install -g npm@8.19.3
             - name: Use Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install Python Dependencies

.github/workflows/deploy-docs.yml

@@ -4,27 +4,27 @@
 name: deploy-docs
 
 on:
-  push:
-    branches:
-      - "main"
-    tags:
-      - "*"
+    push:
+        branches:
+            - "main"
+        tags:
+            - "*"
 
 jobs:
-  deploy-documentation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out src from Git
-        uses: actions/checkout@v2
-      - name: Get history and tags for SCM versioning to work
-        run: |
-          git fetch --prune --unshallow
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Login to Heroku Container Registry
-        run: echo ${{ secrets.HEROKU_API_KEY }} | docker login -u ${{ secrets.HEROKU_EMAIL }} --password-stdin registry.heroku.com
-      - name: Build Docker Image
-        run: docker build . --file docs/Dockerfile --tag registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
-      - name: Push Docker Image
-        run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
-      - name: Deploy
-        run: HEROKU_API_KEY=${{ secrets.HEROKU_API_KEY }} heroku container:release web --app ${{ secrets.HEROKU_APP_NAME }}
+    deploy-documentation:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Check out src from Git
+              uses: actions/checkout@v4
+            - name: Get history and tags for SCM versioning to work
+              run: |
+                  git fetch --prune --unshallow
+                  git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+            - name: Login to Heroku Container Registry
+              run: echo ${{ secrets.HEROKU_API_KEY }} | docker login -u ${{ secrets.HEROKU_EMAIL }} --password-stdin registry.heroku.com
+            - name: Build Docker Image
+              run: docker build . --file docs/Dockerfile --tag registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
+            - name: Push Docker Image
+              run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
+            - name: Deploy
+              run: HEROKU_API_KEY=${{ secrets.HEROKU_API_KEY }} heroku container:release web --app ${{ secrets.HEROKU_APP_NAME }}

.github/workflows/publish.yml

@@ -4,17 +4,17 @@
 name: publish
 
 on:
-  release:
-    types: [published]
+    release:
+        types: [published]
 
 jobs:
-  publish:
-    uses: ./.github/workflows/.hatch-run.yml
-    with:
-      job-name: "publish"
-      hatch-run: "publish"
-      node-registry-url: "https://registry.npmjs.org"
-    secrets:
-      node-auth-token: ${{ secrets.NODE_AUTH_TOKEN }}
-      pypi-username: ${{ secrets.PYPI_USERNAME }}
-      pypi-password: ${{ secrets.PYPI_PASSWORD }}
+    publish:
+        uses: ./.github/workflows/.hatch-run.yml
+        with:
+            job-name: "publish"
+            hatch-run: "publish"
+            node-registry-url: "https://registry.npmjs.org"
+        secrets:
+            node-auth-token: ${{ secrets.NODE_AUTH_TOKEN }}
+            pypi-username: ${{ secrets.PYPI_USERNAME }}
+            pypi-password: ${{ secrets.PYPI_PASSWORD }}

.vscode/extensions.json

@@ -0,0 +1,12 @@
+{
+    "recommendations": [
+        "wholroyd.jinja",
+        "esbenp.prettier-vscode",
+        "ms-python.vscode-pylance",
+        "ms-python.python",
+        "charliermarsh.ruff",
+        "dbaeumer.vscode-eslint",
+        "ms-python.black-formatter",
+        "ms-python.mypy-type-checker"
+    ]
+}

docs/source/about/changelog.rst

@@ -3,15 +3,10 @@ Changelog
 
 .. note::
 
-    The ReactPy team manages their short and long term plans with `GitHub Projects
-    <https://github.com/orgs/reactive-python/projects/1>`__. If you have questions about what
-    the team are working on, or have feedback on how issues should be prioritized, feel
-    free to :discussion-type:`open up a discussion <question>`.
-
-All notable changes to this project will be recorded in this document. The style of
-which is based on `Keep a Changelog <https://keepachangelog.com/>`__. The versioning
-scheme for the project adheres to `Semantic Versioning <https://semver.org/>`__. For
-more info, see the :ref:`Contributor Guide <Creating a Changelog Entry>`.
+    All notable changes to this project will be recorded in this document. The style of
+    which is based on `Keep a Changelog <https://keepachangelog.com/>`__. The versioning
+    scheme for the project adheres to `Semantic Versioning <https://semver.org/>`__. For
+    more info, see the :ref:`Contributor Guide <Creating a Changelog Entry>`.
 
 
 .. INSTRUCTIONS FOR CHANGELOG CONTRIBUTORS
@@ -25,15 +20,18 @@ Unreleased
 
 **Fixed**
 
-- :pull:`1118` - `module_from_template` is broken with a recent release of `requests`
-- :pull:`1131` - `module_from_template` did not work when using Flask backend
+- :pull:`1118` - ``module_from_template`` is broken with a recent release of ``requests``
+- :pull:`1131` - ``module_from_template`` did not work when using Flask backend
+- :pull:`1200` - Fixed ``UnicodeDecodeError`` when using ``reactpy.web.export``
+- :pull:`1224` - Fixes needless unmounting of JavaScript components during each ReactPy render.
+- :pull:`1126` - Fixed missing ``event["target"]["checked"]`` on checkbox inputs
 
 **Added**
 
-- :pull:`1165` - Allow concurrent renders of discrete component tree - enable this
-  experimental feature by setting `REACTPY_ASYNC_RENDERING=true`. This should improve
-  the overall responsiveness of your app, particularly when handling larger renders
-  that would otherwise block faster renders from being processed.
+- :pull:`1165` - Allow concurrently rendering discrete component trees - enable this
+  experimental feature by setting ``REACTPY_ASYNC_RENDERING=true``. This improves
+  the overall responsiveness of your app in situations where larger renders would
+  otherwise block smaller renders from executing.
 
 **Changed**
 
@@ -44,12 +42,15 @@ Unreleased
   fragment to conditionally render an element by writing
   ``something if condition else html._()``. Now you can simply write
   ``something if condition else None``.
+- :pull:`1210` - Move hooks from ``reactpy.backend.hooks`` into ``reactpy.core.hooks``.
 
 **Deprecated**
 
 - :pull:`1171` - The ``Stop`` exception. Recent releases of ``anyio`` have made this
   exception difficult to use since it now raises an ``ExceptionGroup``. This exception
   was primarily used for internal testing purposes and so is now deprecated.
+- :pull:`1210` - Deprecate ``reactpy.backend.hooks`` since the hooks have been moved into
+  ``reactpy.core.hooks``.
 
 
 v1.0.2

pyproject.toml

@@ -12,12 +12,11 @@ detached = true
 dependencies = [
   "invoke",
   # lint
-  "black==24.1.1",        # Pin lint tools we don't control to avoid breaking changes
-  "ruff==0.0.278",        # Pin lint tools we don't control to avoid breaking changes
+  "black==24.1.1",    # Pin lint tools we don't control to avoid breaking changes
+  "ruff==0.0.278",    # Pin lint tools we don't control to avoid breaking changes
   "toml",
-  "flake8==7.0.0",        # Pin lint tools we don't control to avoid breaking changes
+  "flake8==7.0.0",    # Pin lint tools we don't control to avoid breaking changes
   "flake8-pyproject",
-  "reactpy-flake8 >=0.7",
   # types
   "mypy",
   "types-toml",

src/js/app/package-lock.json

@@ -12,7 +12,7 @@
     "@types/react": "^17.0",
     "@types/react-dom": "^17.0",
     "typescript": "^4.9.5",
-    "vite": "^3.2.7"
+    "vite": "^3.2.11"
   },
   "repository": {
     "type": "git",