From 96b0e5b8480d7d17f87ca9e15cd675e2f9644653 Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Mon, 15 Sep 2025 23:32:25 +0300 Subject: [PATCH 1/6] Updated the changelog. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e06744..232a8f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), - Documentation about the attributes are properties in Vcup. +### Fixed + +- Fixed a bug which prevented reactive fragments (e.g. if, for) to be used directly inside each other. + ## [0.1.0] - 2025-03-17 ### Added From 76215a8212f8a12911b1438076dba695feeacfdb Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Mon, 15 Sep 2025 23:47:27 +0300 Subject: [PATCH 2/6] Bump dependencies, use the latest shadow-cljs version. --- deps.edn | 6 +++--- example/react-interop/deps.edn | 12 ++++++------ example/react-interop/package.json | 2 +- example/si-frame-simple/deps.edn | 8 ++++---- example/si-frame-simple/package.json | 2 +- example/test-app/deps.edn | 8 ++++---- example/test-app/package.json | 2 +- example/todomvc/deps.edn | 8 ++++---- example/todomvc/package.json | 2 +- pom.xml | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/deps.edn b/deps.edn index ae5c1a5..456c8f0 100644 --- a/deps.edn +++ b/deps.edn @@ -4,9 +4,9 @@ taipei.404/mate {:git/url "https://github.com/green-coder/mate.git" :git/sha "e553bf33e6b6aef556d6713f9b0db4d13df33345"}} - :aliases {:dev {:extra-deps {org.clojure/clojure {:mvn/version "1.12.0"} - org.clojure/clojurescript {:mvn/version "1.12.35"} - djblue/portal {:mvn/version "0.59.0"} + :aliases {:dev {:extra-deps {org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojurescript {:mvn/version "1.12.42"} + djblue/portal {:mvn/version "0.61.0"} lambdaisland/deep-diff2 {:mvn/version "2.12.219"}}} :test {:extra-paths ["test" "test-resource"] diff --git a/example/react-interop/deps.edn b/example/react-interop/deps.edn index fa62dc4..14e0c2a 100644 --- a/example/react-interop/deps.edn +++ b/example/react-interop/deps.edn @@ -1,14 +1,14 @@ {:paths ["src"] - :deps {org.clojure/clojure {:mvn/version "1.12.0"} - org.clojure/clojurescript {:mvn/version "1.11.132"} - thheller/shadow-cljs {:mvn/version "2.28.21"} + :deps {org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojurescript {:mvn/version "1.12.42"} + thheller/shadow-cljs {:mvn/version "3.2.0"} fi.metosin/vrac {:local/root "../.."} fi.metosin/si-frame {:mvn/version "1.4.3.0"} fi.metosin/siagent {:mvn/version "0.1.0"} - com.pitch/uix.core {:mvn/version "1.3.1"} - com.pitch/uix.dom {:mvn/version "1.3.1"}} + com.pitch/uix.core {:mvn/version "1.4.4"} + com.pitch/uix.dom {:mvn/version "1.4.4"}} :aliases {;; clojure -M:outdated --upgrade - :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1269"}} + :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}} :main-opts ["-m" "antq.core"]}}} diff --git a/example/react-interop/package.json b/example/react-interop/package.json index cf606d5..a15c132 100644 --- a/example/react-interop/package.json +++ b/example/react-interop/package.json @@ -6,7 +6,7 @@ "release": "npx shadow-cljs release :app" }, "devDependencies": { - "shadow-cljs": "^2.28.21" + "shadow-cljs": "3.2.0" }, "dependencies": { "react": "^19.0.0", diff --git a/example/si-frame-simple/deps.edn b/example/si-frame-simple/deps.edn index 0ec72e0..bf7694f 100644 --- a/example/si-frame-simple/deps.edn +++ b/example/si-frame-simple/deps.edn @@ -1,11 +1,11 @@ {:paths ["src"] - :deps {org.clojure/clojure {:mvn/version "1.12.0"} - org.clojure/clojurescript {:mvn/version "1.11.132"} - thheller/shadow-cljs {:mvn/version "2.28.21"} + :deps {org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojurescript {:mvn/version "1.12.42"} + thheller/shadow-cljs {:mvn/version "3.2.0"} fi.metosin/vrac {:local/root "../.."} fi.metosin/si-frame {:mvn/version "1.4.3.0-no-siagent"}} :aliases {;; clojure -M:outdated --upgrade - :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1269"}} + :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}} :main-opts ["-m" "antq.core"]}}} diff --git a/example/si-frame-simple/package.json b/example/si-frame-simple/package.json index 9db3a63..bc52c4e 100644 --- a/example/si-frame-simple/package.json +++ b/example/si-frame-simple/package.json @@ -6,6 +6,6 @@ "release": "npx shadow-cljs release :app" }, "devDependencies": { - "shadow-cljs": "^2.28.21" + "shadow-cljs": "3.2.0" } } diff --git a/example/test-app/deps.edn b/example/test-app/deps.edn index 0c29e43..715165e 100644 --- a/example/test-app/deps.edn +++ b/example/test-app/deps.edn @@ -1,10 +1,10 @@ {:paths ["src" "resource"] - :deps {org.clojure/clojure {:mvn/version "1.12.0"} - org.clojure/clojurescript {:mvn/version "1.11.132"} - thheller/shadow-cljs {:mvn/version "2.28.21"} + :deps {org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojurescript {:mvn/version "1.12.42"} + thheller/shadow-cljs {:mvn/version "3.2.0"} fi.metosin/vrac {:local/root "../.."}} :aliases {;; clojure -M:outdated --upgrade - :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1269"}} + :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}} :main-opts ["-m" "antq.core"]}}} diff --git a/example/test-app/package.json b/example/test-app/package.json index ba2245a..2a7191a 100644 --- a/example/test-app/package.json +++ b/example/test-app/package.json @@ -7,6 +7,6 @@ "server": "npx shadow-cljs server" }, "devDependencies": { - "shadow-cljs": "^2.28.21" + "shadow-cljs": "3.2.0" } } diff --git a/example/todomvc/deps.edn b/example/todomvc/deps.edn index 2879edb..d25ca12 100644 --- a/example/todomvc/deps.edn +++ b/example/todomvc/deps.edn @@ -1,9 +1,9 @@ {:paths ["src"] - :deps {org.clojure/clojure {:mvn/version "1.12.0"} - org.clojure/clojurescript {:mvn/version "1.11.132"} - thheller/shadow-cljs {:mvn/version "2.28.21"} - metosin/reitit-frontend {:mvn/version "0.7.2"} + :deps {org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojurescript {:mvn/version "1.12.42"} + thheller/shadow-cljs {:mvn/version "3.2.0"} + metosin/reitit-frontend {:mvn/version "0.9.1"} fi.metosin/vrac {:local/root "../.."} fi.metosin/si-frame {:mvn/version "1.4.3.0-no-siagent"}} diff --git a/example/todomvc/package.json b/example/todomvc/package.json index 307ec63..6453f76 100644 --- a/example/todomvc/package.json +++ b/example/todomvc/package.json @@ -6,6 +6,6 @@ "release": "npx shadow-cljs release :app" }, "devDependencies": { - "shadow-cljs": "^2.28.21" + "shadow-cljs": "3.2.0" } } diff --git a/pom.xml b/pom.xml index d6c4843..a2d18ef 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.clojure clojure - 1.12.0 + 1.12.2 fi.metosin From 3e9100a6567ffdb31803ec7ba75ab749f9f27682 Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Mon, 15 Sep 2025 23:48:40 +0300 Subject: [PATCH 3/6] [attempt to] update the hooks' version. --- .github/workflows/cljdoc.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/validate.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cljdoc.yml b/.github/workflows/cljdoc.yml index 40b74a5..0150ced 100644 --- a/.github/workflows/cljdoc.yml +++ b/.github/workflows/cljdoc.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a5ab80..98f86dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v5 with: node-version: lts/hydrogen diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index e392fef..15c7e5f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -17,9 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v5 with: node-version: lts/hydrogen From f6c88fe0b95b33fd65b50aa3adea7e05ed265e12 Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Tue, 16 Sep 2025 00:38:24 +0300 Subject: [PATCH 4/6] Setup Java 17 in the Github hooks. --- .github/workflows/release.yml | 6 ++++++ .github/workflows/validate.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98f86dc..a168346 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,12 @@ jobs: with: node-version: lts/hydrogen + - name: Setup java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 15c7e5f..eb14786 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -23,6 +23,12 @@ jobs: with: node-version: lts/hydrogen + - name: Setup java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: From 82f49cd7776d945527ec87918cc284daea372a14 Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Tue, 16 Sep 2025 00:49:10 +0300 Subject: [PATCH 5/6] Bump playwright's deps. --- playwright/package-lock.json | 40 ++++++++++++++++++------------------ playwright/package.json | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/playwright/package-lock.json b/playwright/package-lock.json index 4cf72d3..240fbc1 100644 --- a/playwright/package-lock.json +++ b/playwright/package-lock.json @@ -6,18 +6,18 @@ "": { "name": "playwright", "devDependencies": { - "@playwright/test": "^1.50.1", - "@types/node": "^22.13.0" + "@playwright/test": "1.55.0", + "@types/node": "24.5.0" } }, "node_modules/@playwright/test": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.0.tgz", - "integrity": "sha512-dJ0dMbZeHhI+wb77+ljx/FeC8VBP6j/rj9OAojO08JI80wTZy6vRk9KvHKiDCUh4iMpEiseMgqRBIeW+eKX6RA==", + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.55.0.tgz", + "integrity": "sha512-04IXzPwHrW69XusN/SIdDdKZBzMfOT9UNT/YiJit/xpy2VuAoB8NHc8Aplb96zsWDddLnbkPL3TsmrS04ZU2xQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.51.0" + "playwright": "1.55.0" }, "bin": { "playwright": "cli.js" @@ -27,13 +27,13 @@ } }, "node_modules/@types/node": { - "version": "22.13.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", - "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", + "version": "24.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.0.tgz", + "integrity": "sha512-y1dMvuvJspJiPSDZUQ+WMBvF7dpnEqN4x9DDC9ie5Fs/HUZJA3wFp7EhHoVaKX/iI0cRoECV8X2jL8zi0xrHCg==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~7.12.0" } }, "node_modules/fsevents": { @@ -52,13 +52,13 @@ } }, "node_modules/playwright": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.0.tgz", - "integrity": "sha512-442pTfGM0xxfCYxuBa/Pu6B2OqxqqaYq39JS8QDMGThUvIOCd6s0ANDog3uwA0cHavVlnTQzGCN7Id2YekDSXA==", + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0.tgz", + "integrity": "sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.51.0" + "playwright-core": "1.55.0" }, "bin": { "playwright": "cli.js" @@ -71,9 +71,9 @@ } }, "node_modules/playwright-core": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.0.tgz", - "integrity": "sha512-x47yPE3Zwhlil7wlNU/iktF7t2r/URR3VLbH6EknJd/04Qc/PSJ0EY3CMXipmglLG+zyRxW6HNo2EGbKLHPWMg==", + "version": "1.55.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0.tgz", + "integrity": "sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -84,9 +84,9 @@ } }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz", + "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==", "dev": true, "license": "MIT" } diff --git a/playwright/package.json b/playwright/package.json index 2576a4f..2c9ea51 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -6,7 +6,7 @@ "test-ui": "npx playwright test --ui" }, "devDependencies": { - "@playwright/test": "^1.50.1", - "@types/node": "^22.13.0" + "@playwright/test": "1.55.0", + "@types/node": "24.5.0" } } From 0b444d58bc6d3abc8d98a01214b11bb201fc8200 Mon Sep 17 00:00:00 2001 From: Vincent Cantin Date: Tue, 16 Sep 2025 00:52:45 +0300 Subject: [PATCH 6/6] Java 21 ? --- .github/workflows/release.yml | 2 +- .github/workflows/validate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a168346..a48a720 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index eb14786..e930eba 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master