From fe1f0b237ae853764716f3be3cc81616f15cdb9d Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 31 May 2026 06:31:10 +0000
Subject: [PATCH 1/2] Update from copier from copier (2026-05-31T06:31:10)

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .copier-answers.yaml         |  2 +-
 .github/workflows/build.yaml | 14 ++++++++++++++
 js/pnpm-workspace.yaml       |  3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index 9684ea2..091ee19 100644
--- a/.copier-answers.yaml
+++ b/.copier-answers.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: b5fb449
+_commit: b8951e0
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: js
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd0b8d6..0f7e9f3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,7 +27,17 @@ permissions:
 
 jobs:
   build:
+<<<<<<< before updating
     runs-on: ubuntu-latest
+=======
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.11"]
+        node-version: [22.x]
+>>>>>>> after updating
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -40,8 +50,12 @@ jobs:
     - name: Set up NodeJS
       uses: actions-ext/node/setup@main
       with:
+<<<<<<< before updating
         version: 22.x
         pnpm_version: '11'
+=======
+        version: ${{ matrix.node-version }}
+>>>>>>> after updating
 
     - name: Install dependencies
       run: make develop
diff --git a/js/pnpm-workspace.yaml b/js/pnpm-workspace.yaml
index 236f212..0cbfc02 100644
--- a/js/pnpm-workspace.yaml
+++ b/js/pnpm-workspace.yaml
@@ -1,6 +1,9 @@
 allowBuilds:
   esbuild: true
+<<<<<<< before updating
 
 overrides:
   react: 19.2.6
   react-dom: 19.2.6
+=======
+>>>>>>> after updating

From 72f3fc227f6035bcfaf50f4e2f8642fcbf79d0cb Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Mon, 1 Jun 2026 09:43:25 -0400
Subject: [PATCH 2/2] resolve conflicts

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
---
 .github/workflows/build.yaml | 9 ---------
 js/pnpm-workspace.yaml       | 3 ---
 2 files changed, 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0f7e9f3..d962335 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,9 +27,6 @@ permissions:
 
 jobs:
   build:
-<<<<<<< before updating
-    runs-on: ubuntu-latest
-=======
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -37,7 +34,6 @@ jobs:
         os: [ubuntu-latest]
         python-version: ["3.11"]
         node-version: [22.x]
->>>>>>> after updating
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -50,12 +46,7 @@ jobs:
     - name: Set up NodeJS
       uses: actions-ext/node/setup@main
       with:
-<<<<<<< before updating
-        version: 22.x
-        pnpm_version: '11'
-=======
         version: ${{ matrix.node-version }}
->>>>>>> after updating
 
     - name: Install dependencies
       run: make develop
diff --git a/js/pnpm-workspace.yaml b/js/pnpm-workspace.yaml
index 0cbfc02..236f212 100644
--- a/js/pnpm-workspace.yaml
+++ b/js/pnpm-workspace.yaml
@@ -1,9 +1,6 @@
 allowBuilds:
   esbuild: true
-<<<<<<< before updating
 
 overrides:
   react: 19.2.6
   react-dom: 19.2.6
-=======
->>>>>>> after updating