cabloy 5.1.84 → 5.1.86

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 5.1.86
+
+### Bug Fixes
+
+- Commit rerun lockfile residue before performing a compensation rerun.
+
+### Improvements
+
+- Bump `zova-core` to `v5.1.73`.
+- Refresh the Vona `zova-core` patch for `v5.1.72`.
+
+## 5.1.85
+
+### Bug Fixes
+
+- Skip staging for ignored compensation packages.
+
+### Improvements
+
+- Update `zova-core` to v5.1.71.
+- Refresh the Zova lockfile after the v5.1.84 release.
+
 ## 5.1.84
 
 ### Improvements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.84",
+  "version": "5.1.86",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/scripts/release.ts

@@ -516,15 +516,30 @@ function verifyCompensationPatch(dryRun?: boolean): void {
 function commitCompensationChanges(targetVersion: string, dryRun?: boolean): void {
   // eslint-disable-next-line
   console.log('\n📁 Committing compensation changes...');
-  exec(
-    'git add vona/package.json vona/pnpm-workspace.yaml vona/pnpm-lock.yaml vona/patches',
-    dryRun,
-  );
+  const stageTargets = ['vona/pnpm-workspace.yaml', 'vona/pnpm-lock.yaml', 'vona/patches'];
+  if (existsSync(VONA_PACKAGE_JSON_PATH)) {
+    let trackedPackageJson = false;
+    try {
+      trackedPackageJson =
+        execSync(`git ls-files --error-unmatch "${VONA_PACKAGE_JSON_PATH}"`, {
+          cwd: ROOT_DIR,
+          stdio: 'pipe',
+        })
+          .toString()
+          .trim() !== '';
+    } catch {
+      trackedPackageJson = false;
+    }
+    if (trackedPackageJson) {
+      stageTargets.unshift('vona/package.json');
+    }
+  }
+  exec(`git add ${stageTargets.join(' ')}`, dryRun);
   if (!dryRun) {
-    const staged = execSync(
-      'git diff --cached --name-only -- vona/package.json vona/pnpm-workspace.yaml vona/pnpm-lock.yaml vona/patches',
-      { cwd: ROOT_DIR, encoding: 'utf-8' },
-    ).trim();
+    const staged = execSync(`git diff --cached --name-only -- ${stageTargets.join(' ')}`, {
+      cwd: ROOT_DIR,
+      encoding: 'utf-8',
+    }).trim();
     if (!staged) {
       throw new Error('No compensation changes were staged for commit');
     }
@@ -537,6 +552,18 @@ function rerunPatchReleaseAfterCompensation(noAi?: boolean, dryRun?: boolean): v
   const noAiFlag = noAi ? ' --no-ai' : '';
   // eslint-disable-next-line
   console.log('\n🚀 Running the compensation patch release...');
+  const rerunStageTargets = ['zova/pnpm-lock.yaml'];
+  exec(`git add ${rerunStageTargets.join(' ')}`, dryRun);
+  if (!dryRun) {
+    const staged = execSync(`git diff --cached --name-only -- ${rerunStageTargets.join(' ')}`, {
+      cwd: ROOT_DIR,
+      encoding: 'utf-8',
+    }).trim();
+    if (staged) {
+      exec('git commit -m "chore: refresh zova lockfile after compensation rerun prep"', dryRun);
+      exec('git push', dryRun);
+    }
+  }
   execInherited(`node "${RELEASE_SCRIPT_PATH}" patch --skip-compensation${noAiFlag}`, dryRun);
 }
 

package/vona/pnpm-lock.yaml

@@ -16,7 +16,7 @@ overrides:
   zod: npm:@cabloy/zod@4.3.8
 
 patchedDependencies:
-  zova-core@5.1.68: 0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54
+  zova-core@5.1.72: 0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54
 
 importers:
 
@@ -474,11 +474,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.123
-        version: 5.1.123(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.125
+        version: 5.1.125(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.71
-        version: 1.1.71(typescript@5.9.3)
+        specifier: ^1.1.73
+        version: 1.1.73(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.21
         version: 5.1.21
@@ -546,11 +546,11 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.123
-        version: 5.1.123(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.125
+        version: 5.1.125(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
-        specifier: ^1.1.71
-        version: 1.1.71(typescript@5.9.3)
+        specifier: ^1.1.73
+        version: 1.1.73(typescript@5.9.3)
       zova-module-a-api:
         specifier: ^5.1.21
         version: 5.1.21
@@ -7535,11 +7535,11 @@ packages:
     peerDependencies:
       zod: ^3.25.28 || ^4
 
-  zova-core@5.1.68:
-    resolution: {integrity: sha512-Lg0uQtnbVfHTAPDXM4EWs7M11/ncqyv8R70RFp+OGJWgLxLRxh31ekkqAmvDbztjbFuRoUANuri3OIapN+UTvA==}
+  zova-core@5.1.72:
+    resolution: {integrity: sha512-DP2Tuk8ohSWvvNTMsSnpCNYgR0asB1CBZ/EX7Yz6c2IWzWvXY8k4qUOcUNpC7b1NEezKJMaFfXlN455XwEHINA==}
 
-  zova-jsx@1.1.71:
-    resolution: {integrity: sha512-Mp9DV+akSw6Sc0+MEjhcdVov6Kjix26bzwXeqYp/BAL08O/bZXuBdsaokEorckm7+F8yvo6F31WMJnGvP9vj9A==}
+  zova-jsx@1.1.73:
+    resolution: {integrity: sha512-qqQNgYtV0b0z87NfPMGXD0HRaX8Qcqy4yRSBmQpEYjDgO1prKuGPgJZhHpXOYER70RyTAEIy8x6Ll05uP08UFw==}
 
   zova-module-a-api@5.1.21:
     resolution: {integrity: sha512-qjm/hfjC4/+7Ap/uzJfBzV0PwRlp2idEmEKwCZYxquaXq6QtJBbTWTznw1iukT4lkJZip2KFkjOvXTzdvZA2UA==}
@@ -7613,17 +7613,17 @@ packages:
   zova-module-a-zod@5.1.35:
     resolution: {integrity: sha512-hCZG81WY5MPG5ozaYLMiNML4FtdCGNOJpi5drEKTP/xpsvzil66ZaOXkWj+XO/3MlkulmcBEThBx7amcHHWszg==}
 
-  zova-module-a-zova@5.1.86:
-    resolution: {integrity: sha512-5PEJ63sWSCBmZwbBFAslnGmMgFUHG45COPIgwEugpvf4v9RF7yxRn36ZPbuoM84kCFlZcd6zY8bOWqt9TMSPuw==}
+  zova-module-a-zova@5.1.88:
+    resolution: {integrity: sha512-IBxPuaVMBksTmxcsEBGVHHwL+W9aF/miKmLsbr7Dy/TsCJCE05iMiZy+GBrczlxzGtD/dxrirRwhtwnVqtV8Ng==}
 
   zova-module-rest-resource@5.1.40:
     resolution: {integrity: sha512-rMqZaXSK6nJ4LW2O1yO/jZqxI7joCiWylzjutMTKpx7EfNmtK1t1nVoWFd+gCTxqgbbv9uXh0vfFaSFA7GKYFg==}
 
-  zova-suite-a-zova@5.1.122:
-    resolution: {integrity: sha512-HC8Sc7S/ucCQMUr3kV2gILa7ygpriPxCiXs7hK3C8VIZrw4Lcg/u1EDYroG+yvlvFxXByBJuGahJYRZ1Iu/9Zw==}
+  zova-suite-a-zova@5.1.124:
+    resolution: {integrity: sha512-/tHdjRxLeRz54n/lHX35xyXs/77idSCWcJttWB4UWbyMMohaTz21O9hTeShj5T36zIwJX5Z0tBjcloHz9O1QSA==}
 
-  zova@5.1.123:
-    resolution: {integrity: sha512-GQO0qbdqUNUo8HFCMN7nLjvA3bpWZGtYsBfnTSUHmxjal6Q2vkPbwZ79aArH31c0fP6mwNS0BOyNFoyDihc5Kw==}
+  zova@5.1.125:
+    resolution: {integrity: sha512-4nFoPotm+0sJaw/oyjCQVzuuZfLcFheTM0x6RJ9Ia4386DsbRZ88Ifo0tio0n6vRPjeu0oydSguxl9QiHIL82w==}
 
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
@@ -13092,7 +13092,7 @@ snapshots:
     dependencies:
       zod: '@cabloy/zod@4.3.8'
 
-  zova-core@5.1.68(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3):
+  zova-core@5.1.72(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
       '@cabloy/extend': link:packages-utils/extend
@@ -13121,14 +13121,14 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  zova-jsx@1.1.71(typescript@5.9.3):
+  zova-jsx@1.1.73(typescript@5.9.3):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
       '@cabloy/utils': link:packages-utils/utils
       '@cabloy/word-utils': 2.1.14
       typestyle: 2.4.0
       vue: 3.5.39(typescript@5.9.3)
-      zova-core: 5.1.68(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
+      zova-core: 5.1.72(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
@@ -13229,7 +13229,7 @@ snapshots:
       '@cabloy/zod-query': link:packages-utils/zod-query
       zod: '@cabloy/zod@4.3.8'
 
-  zova-module-a-zova@5.1.86(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-module-a-zova@5.1.88(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       '@cabloy/compose': link:packages-utils/compose
       '@cabloy/deps': link:packages-utils/deps
@@ -13240,14 +13240,14 @@ snapshots:
       '@cabloy/word-utils': 2.1.14
       defu: 6.1.7
       luxon: 3.7.2
-      zova-jsx: 1.1.71(typescript@5.9.3)
+      zova-jsx: 1.1.73(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
       - vue
 
   zova-module-rest-resource@5.1.40: {}
 
-  zova-suite-a-zova@5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.124(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.21
       zova-module-a-app: 5.1.24
@@ -13273,7 +13273,7 @@ snapshots:
       zova-module-a-style: 5.1.32
       zova-module-a-table: 5.1.37(vue@3.5.39(typescript@5.9.3))
       zova-module-a-zod: 5.1.35
-      zova-module-a-zova: 5.1.86(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-module-a-zova: 5.1.88(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug
@@ -13281,10 +13281,10 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.123(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova@5.1.125(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
-      zova-core: 5.1.68(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.122(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-core: 5.1.72(patch_hash=0f4164c4d2bbb16d671beb5c26759dff37769be0709df941bc7b90b94261ac54)(typescript@5.9.3)
+      zova-suite-a-zova: 5.1.124(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/vona/pnpm-workspace.yaml

@@ -52,4 +52,4 @@ allowBuilds:
   vue-demi: true
 
 patchedDependencies:
-  zova-core@5.1.68: patches/zova-core@5.1.68.patch
+  zova-core@5.1.72: patches/zova-core@5.1.72.patch

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.72",
+  "version": "1.1.74",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.70"
+    "zova-core": "^5.1.74"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.124",
+  "version": "5.1.126",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.70",
-    "zova-suite-a-zova": "^5.1.123"
+    "zova-core": "^5.1.74",
+    "zova-suite-a-zova": "^5.1.125"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.70",
+  "version": "5.1.74",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/pnpm-lock.yaml

@@ -133,7 +133,7 @@ importers:
         specifier: workspace:^
         version: link:packages-zova/zova
       zova-jsx:
-        specifier: ^1.1.71
+        specifier: ^1.1.73
         version: link:packages-utils/zova-jsx
       zova-module-a-api:
         specifier: workspace:^
@@ -672,7 +672,7 @@ importers:
         specifier: ^3.5.38
         version: 3.5.38(typescript@5.9.3)
       zova-core:
-        specifier: ^5.1.68
+        specifier: ^5.1.72
         version: link:../../packages-zova/zova-core
     devDependencies:
       clean-package:
@@ -813,10 +813,10 @@ importers:
   packages-zova/zova:
     dependencies:
       zova-core:
-        specifier: ^5.1.68
+        specifier: ^5.1.72
         version: link:../zova-core
       zova-suite-a-zova:
-        specifier: ^5.1.122
+        specifier: ^5.1.124
         version: link:../../src/suite-vendor/a-zova
     devDependencies:
       clean-package:
@@ -1001,7 +1001,7 @@ importers:
         specifier: ^5.1.35
         version: link:modules/a-zod
       zova-module-a-zova:
-        specifier: ^5.1.86
+        specifier: ^5.1.88
         version: link:modules/a-zova
 
   src/suite-vendor/a-zova/modules/a-api:
@@ -1340,7 +1340,7 @@ importers:
         specifier: ^3.7.2
         version: 3.7.2
       zova-jsx:
-        specifier: ^1.1.71
+        specifier: ^1.1.73
         version: link:../../../../../packages-utils/zova-jsx
     devDependencies:
       '@cabloy/cli':
@@ -7991,7 +7991,7 @@ snapshots:
   '@babel/generator@8.0.0-rc.3':
     dependencies:
       '@babel/parser': 8.0.0
-      '@babel/types': 8.0.0-rc.3
+      '@babel/types': 8.0.0
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
       '@types/jsesc': 2.5.1
@@ -8102,7 +8102,7 @@ snapshots:
 
   '@babel/parser@8.0.0-rc.3':
     dependencies:
-      '@babel/types': 8.0.0-rc.3
+      '@babel/types': 8.0.0
 
   '@babel/plugin-proposal-decorators@7.29.7(@babel/core@7.29.7)':
     dependencies:

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.87",
+  "version": "5.1.89",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.72"
+    "zova-jsx": "^1.1.74"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.27",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.123",
+  "version": "5.1.125",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "zova-module-a-style": "^5.1.32",
     "zova-module-a-table": "^5.1.37",
     "zova-module-a-zod": "^5.1.35",
-    "zova-module-a-zova": "^5.1.87"
+    "zova-module-a-zova": "^5.1.89"
   },
   "title": "a-zova"
 }