From a451d6d8daa7612099a5c8cf466bca37af625c65 Mon Sep 17 00:00:00 2001 From: jiyinyiyong Date: Sat, 26 Sep 2026 21:05:13 +0800 Subject: [PATCH 1/3] chore: upgrade to Calcit 0.22.0-alpha.3 --- deps.cirru | 4 ++-- package.json | 4 ++-- yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deps.cirru b/deps.cirru index 27e245d..00bfa02 100644 --- a/deps.cirru +++ b/deps.cirru @@ -1,6 +1,6 @@ -{} (:calcit-version |0.18.1) - :version |0.1.21 +{} (:calcit-version |0.22.0-alpha.3) + :version |0.1.22 :dependencies $ {} (|Cumulo/cumulo-reel.calcit |0.0.44) |Cumulo/cumulo-util.calcit |0.0.22 |Respo/alerts.calcit |0.10.43 diff --git a/package.json b/package.json index 3a20a3a..6e53486 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "termina", - "version": "0.1.21", + "version": "0.1.22", "description": "Start process from a Webpage", "packageManager": "yarn@4.12.0", "main": "./server.mjs", @@ -19,7 +19,7 @@ "author": "jiyinyiyong", "license": "MIT", "dependencies": { - "@calcit/procs": "0.18.1", + "@calcit/procs": "0.22.0-alpha.3", "chalk": "^5.3.0", "dayjs": "^1.11.11", "latest-version": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index ca24179..7e9cd24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,14 +5,14 @@ __metadata: version: 8 cacheKey: 10c0 -"@calcit/procs@npm:0.18.1": - version: 0.18.1 - resolution: "@calcit/procs@npm:0.18.1" +"@calcit/procs@npm:0.22.0-alpha.3": + version: 0.22.0-alpha.3 + resolution: "@calcit/procs@npm:0.22.0-alpha.3" dependencies: "@calcit/ternary-tree": "npm:0.0.26" "@cirru/parser.ts": "npm:^0.0.9" "@cirru/writer.ts": "npm:^0.1.9" - checksum: 10c0/dc4af8fe80a01e0ddc464596ddec8dd07a02ef14fcd7ac3a9aec6695756516dd3f857e9fa0e3ae0b04ee55355e4f181d7795c8b7d2308da553d0b39e17f2b1c8 + checksum: 10c0/b6aa28ae40918bef2e5363adbd4f5b36ec2ee26eda1a45b5e6c628b12c0d2746554d1106c5b0c86e2ff1be0fc726bed7173df1984e1dcb9a07d846b849db2a4e languageName: node linkType: hard @@ -1032,7 +1032,7 @@ __metadata: version: 0.0.0-use.local resolution: "termina@workspace:." dependencies: - "@calcit/procs": "npm:0.18.1" + "@calcit/procs": "npm:0.22.0-alpha.3" bottom-tip: "npm:^0.1.5" chalk: "npm:^5.3.0" dayjs: "npm:^1.11.11" From 7bdb250e6a3084f96d8179abf1e226c609daf416 Mon Sep 17 00:00:00 2001 From: jiyinyiyong Date: Sat, 26 Sep 2026 22:02:21 +0800 Subject: [PATCH 2/3] ci: drop removed --max gate from 0.22-alpha workflows --- .github/workflows/npm-publish.yaml | 4 ++-- .github/workflows/upload.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index f0897ac..3ea7203 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -34,8 +34,8 @@ jobs: caps verify --toolchain calcit calcit.cirru --check-only calcit calcit.cirru --entry page --check-only - calcit analyze dynamic-methods --max 0 --summary-only --format json - calcit --entry page analyze dynamic-methods --max 0 --summary-only --format json + calcit analyze dynamic-methods --summary-only --format json + calcit --entry page analyze dynamic-methods --summary-only --format json calcit analyze deprecated --summary-only --format json calcit --entry page analyze deprecated --summary-only --format json diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 548da59..ba0662d 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -34,8 +34,8 @@ jobs: caps verify --toolchain calcit calcit.cirru --check-only calcit calcit.cirru --entry page --check-only - calcit analyze dynamic-methods --max 0 --summary-only --format json - calcit --entry page analyze dynamic-methods --max 0 --summary-only --format json + calcit analyze dynamic-methods --summary-only --format json + calcit --entry page analyze dynamic-methods --summary-only --format json calcit analyze deprecated --summary-only --format json calcit --entry page analyze deprecated --summary-only --format json From c398452dab003c256379e8fddf6917d045f4f0d1 Mon Sep 17 00:00:00 2001 From: tiye Date: Sun, 27 Sep 2026 08:07:55 +0800 Subject: [PATCH 3/3] Upgrade Termina to Calcit 0.24.3 strict checks --- .github/workflows/upload.yaml | 4 ++-- .yarnrc.yml | 3 +++ calcit.cirru | 19 ++++++++++++------- deps.cirru | 2 +- package.json | 4 ++-- yarn.lock | 12 ++++++------ 6 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 .yarnrc.yml diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index ba0662d..591f64c 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -19,10 +19,10 @@ jobs: - name: Enable pinned Yarn run: | corepack enable - corepack prepare yarn@4.12.0 --activate + corepack prepare yarn@4.18.0 --activate yarn --version - - uses: calcit-lang/setup-calcit@d02594b15f0e9de723fe1a202a3fa62a87afe07b # v1.4.0 + - uses: calcit-lang/setup-calcit@ca701be5a471759e442aa053cd100720bbe1f09f # v1.5.0 with: tools: calcit,caps diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000..ca56693 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1,3 @@ +nodeLinker: node-modules +npmPreapprovedPackages: + - "@calcit/procs@0.24.3" diff --git a/calcit.cirru b/calcit.cirru index 6317f7c..6111f47 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -358,7 +358,8 @@ :min-width 320 .render remove-plugin :examples $ [] - :schema $ :: 'Dynamic + :schema $ :: 'Fn $ {} (:return 'respo.schema/Component) + :args $ [] (:: 'Map 'Tag 'Dynamic) (:: 'Map 'Tag 'Dynamic) 'String 'style-command-row $ %{} 'CodeEntry (:doc |) :code $ quote $ def style-command-row merge ui/column $ {} @@ -454,13 +455,15 @@ :on-click $ fn (e d!) (d! :effect/connect nil) <> "|No connection..." $ {} (:font-family ui/font-fancy) (:font-size 24) :examples $ [] - :schema $ :: 'Dynamic + :schema $ :: 'Fn $ {} (:return 'respo.schema/Component) + :args $ [] 'comp-status-color $ %{} 'CodeEntry (:doc |) :code $ quote $ defcomp comp-status-color (color) div $ {} (:class-name css-status) :style $ {} $ :background-color color :examples $ [] - :schema $ :: 'Dynamic + :schema $ :: 'Fn $ {} (:return 'respo.schema/Component) + :args $ [] 'Dynamic 'css-container $ %{} 'CodeEntry (:doc |) :code $ quote $ defstyle css-container {} $ |& $ {} @@ -884,9 +887,10 @@ div ({}) (<> "|Page missing") div {} $ :style $ {} (:font-family ui/font-code) - <> router + <> $ str router :examples $ [] - :schema $ :: 'Dynamic + :schema $ :: 'Fn $ {} (:return 'respo.schema/Component) + :args $ [] $ :: 'Map 'Tag 'Dynamic :ns $ %{} 'NsEntry (:doc |) :code $ quote $ ns app.comp.missing :require @@ -913,9 +917,10 @@ d! :router/change $ {} $ :name :profile <> $ if logged-in? |Me |Guest =< 8 nil - <> count-members + <> $ str count-members :examples $ [] - :schema $ :: 'Dynamic + :schema $ :: 'Fn $ {} (:return 'respo.schema/Component) + :args $ [] 'Bool (:: 'Map 'Tag 'Dynamic) 'Number 'css-nav $ %{} 'CodeEntry (:doc |) :code $ quote $ defstyle css-nav {} $ |& $ merge ui/row-center diff --git a/deps.cirru b/deps.cirru index 00bfa02..8569dd8 100644 --- a/deps.cirru +++ b/deps.cirru @@ -1,5 +1,5 @@ -{} (:calcit-version |0.22.0-alpha.3) +{} (:calcit-version |0.24.3) :version |0.1.22 :dependencies $ {} (|Cumulo/cumulo-reel.calcit |0.0.44) |Cumulo/cumulo-util.calcit |0.0.22 diff --git a/package.json b/package.json index 6e53486..326fffd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "termina", "version": "0.1.22", "description": "Start process from a Webpage", - "packageManager": "yarn@4.12.0", + "packageManager": "yarn@4.18.0", "main": "./server.mjs", "bin": "./server.mjs", "scripts": { @@ -19,7 +19,7 @@ "author": "jiyinyiyong", "license": "MIT", "dependencies": { - "@calcit/procs": "0.22.0-alpha.3", + "@calcit/procs": "0.24.3", "chalk": "^5.3.0", "dayjs": "^1.11.11", "latest-version": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index 7e9cd24..134c0a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,17 +2,17 @@ # Manual changes might be lost - proceed with caution! __metadata: - version: 8 + version: 10 cacheKey: 10c0 -"@calcit/procs@npm:0.22.0-alpha.3": - version: 0.22.0-alpha.3 - resolution: "@calcit/procs@npm:0.22.0-alpha.3" +"@calcit/procs@npm:0.24.3": + version: 0.24.3 + resolution: "@calcit/procs@npm:0.24.3" dependencies: "@calcit/ternary-tree": "npm:0.0.26" "@cirru/parser.ts": "npm:^0.0.9" "@cirru/writer.ts": "npm:^0.1.9" - checksum: 10c0/b6aa28ae40918bef2e5363adbd4f5b36ec2ee26eda1a45b5e6c628b12c0d2746554d1106c5b0c86e2ff1be0fc726bed7173df1984e1dcb9a07d846b849db2a4e + checksum: 10c0/532256bb021794f8d1d3f084fda4f339d4d298f5ff8c483f929e81cfa82e7410c5e64d82fe2904f98e2b85362cda44ff2734b9e4e5e87673df51b2630af84979 languageName: node linkType: hard @@ -1032,7 +1032,7 @@ __metadata: version: 0.0.0-use.local resolution: "termina@workspace:." dependencies: - "@calcit/procs": "npm:0.22.0-alpha.3" + "@calcit/procs": "npm:0.24.3" bottom-tip: "npm:^0.1.5" chalk: "npm:^5.3.0" dayjs: "npm:^1.11.11"