cabloy 5.1.79 → 5.1.80

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 5.1.80
+
+### Bug Fixes
+
+- Harden the `zova-core` release compensation flow.
+
 ## 5.1.79
 
 ### Improvements

package/package.json

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

package/scripts/release.ts

@@ -159,8 +159,8 @@ function readLocalZovaCoreVersion(): string {
   return version;
 }
 
-function normalizeVonaPatchedDependency(version: string): void {
-  const patchLine = `  zova-core@${version}: patches/zova-core@${version}.patch`;
+function updateVonaPatchedDependency(version?: string): void {
+  const patchLine = version ? `  zova-core@${version}: patches/zova-core@${version}.patch` : null;
   const lines = readFileSync(VONA_WORKSPACE_PATH, 'utf-8').split('\n');
   const patchedDependenciesIndex = lines.findIndex(line => line.trim() === 'patchedDependencies:');
   if (patchedDependenciesIndex === -1) {
@@ -180,13 +180,19 @@ function normalizeVonaPatchedDependency(version: string): void {
     );
   const newLines = [
     ...lines.slice(0, patchedDependenciesIndex + 1),
-    patchLine,
+    ...(patchLine ? [patchLine] : []),
     ...preservedBlockLines,
     ...lines.slice(blockEndIndex),
   ];
   writeFileSync(VONA_WORKSPACE_PATH, `${newLines.join('\n').replace(/\n+$/, '\n')}\n`);
 }
 
+function ensureFileExists(filePath: string): void {
+  if (!existsSync(filePath)) {
+    writeFileSync(filePath, '');
+  }
+}
+
 function replaceOrThrow(
   content: string,
   search: RegExp,
@@ -222,7 +228,7 @@ function applyKnownZovaCorePatchEdits(editDir: string): void {
   const envContent = readFileSync(envPath, 'utf-8');
   const envNext = replaceOrThrow(
     envContent,
-    /declare global \{\n {4}namespace NodeJS \{\n        interface ProcessEnv \{[\s\S]*?\n        \}\n    \}\n\}\n?/,
+    /declare global \{\n {4}namespace NodeJS \{\n {8}interface ProcessEnv \{[\s\S]*?\n        \}\n    \}\n\}\n?/,
     '',
     'the NodeJS.ProcessEnv augmentation',
   );
@@ -231,7 +237,7 @@ function applyKnownZovaCorePatchEdits(editDir: string): void {
   const moduleContent = readFileSync(modulePath, 'utf-8');
   const moduleNext = replaceOrThrow(
     moduleContent,
-    /declare module '@cabloy\/module-info' \{\n {4}interface IModule \{[\s\S]*?\n    \}\n\}\n?/,
+    /declare module '@cabloy\/module-info' \{\n {4}interface IModule \{[\s\S]*?\n {4}\}\n\}\n?/,
     '',
     'the @cabloy/module-info augmentation',
   );
@@ -275,17 +281,28 @@ function regenerateVonaZovaCorePatch(
   console.log(`\n🩹 Regenerating the Vona zova-core patch for ${targetVersion}...`);
 
   if (dryRun) {
+    // eslint-disable-next-line
+    console.log(
+      '  [dry-run] Temporarily remove the current zova-core patched dependency registration',
+    );
+    exec(`pnpm --dir "${VONA_DIR}" install`, true);
     exec(
       `pnpm --dir "${VONA_DIR}" patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
       true,
     );
     // eslint-disable-next-line
     console.log('  [dry-run] Apply the known zova-core declaration-file patch edits');
-    exec(`pnpm --dir "${VONA_DIR}" patch-commit "${editDir}"`, true);
     // eslint-disable-next-line
-    console.log(`  [dry-run] Normalize ${VONA_WORKSPACE_PATH}`);
+    console.log(`  [dry-run] Ensure ${newPatchFilePath} exists before patch-commit`);
+    exec(
+      `pnpm --dir "${VONA_DIR}" patch-commit "${editDir}" --patches-dir "${VONA_PATCHES_DIR}"`,
+      true,
+    );
+    // eslint-disable-next-line
+    console.log(`  [dry-run] Restore ${VONA_WORKSPACE_PATH} to point at ${newPatchFilePath}`);
     // eslint-disable-next-line
     console.log(`  [dry-run] Remove ${oldPatchFilePath} if it still exists`);
+    exec(`pnpm --dir "${VONA_DIR}" install`, true);
     return;
   }
 
@@ -293,20 +310,27 @@ function regenerateVonaZovaCorePatch(
   mkdirSync(dirname(editDir), { recursive: true });
 
   try {
+    updateVonaPatchedDependency();
+    execInherited(`pnpm --dir "${VONA_DIR}" install`);
+
     execInherited(
       `pnpm --dir "${VONA_DIR}" patch zova-core@${targetVersion} --edit-dir "${editDir}" --ignore-existing`,
     );
     applyKnownZovaCorePatchEdits(editDir);
-    execInherited(`pnpm --dir "${VONA_DIR}" patch-commit "${editDir}"`);
 
-    normalizeVonaPatchedDependency(targetVersion);
+    ensureFileExists(newPatchFilePath);
+    execInherited(
+      `pnpm --dir "${VONA_DIR}" patch-commit "${editDir}" --patches-dir "${VONA_PATCHES_DIR}"`,
+    );
 
+    updateVonaPatchedDependency(targetVersion);
     if (!existsSync(newPatchFilePath)) {
       throw new Error(`Expected regenerated patch file is missing: ${newPatchFilePath}`);
     }
     if (currentPatchedVersion !== targetVersion && existsSync(oldPatchFilePath)) {
       rmSync(oldPatchFilePath);
     }
+    execInherited(`pnpm --dir "${VONA_DIR}" install`);
   } finally {
     rmSync(editDir, { recursive: true, force: true });
   }
@@ -380,12 +404,6 @@ async function postReleaseCompensation(options: ReleaseOptions): Promise<void> {
     return;
   }
 
-  if (compareVersions(localZovaCoreVersion, currentPatchedVersion) <= 0) {
-    // eslint-disable-next-line
-    console.log('No newer local zova-core version needs patch compensation. Skipping.');
-    return;
-  }
-
   regenerateVonaZovaCorePatch(currentPatchedVersion, localZovaCoreVersion, options.dryRun);
   refreshVonaLockfile(options.dryRun);
   verifyCompensationPatch(options.dryRun);

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.69",
+  "version": "1.1.70",
   "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.64"
+    "zova-core": "^5.1.66"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.121",
+  "version": "5.1.122",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.64",
-    "zova-suite-a-zova": "^5.1.120"
+    "zova-core": "^5.1.66",
+    "zova-suite-a-zova": "^5.1.121"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.84",
+  "version": "5.1.85",
   "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.69"
+    "zova-jsx": "^1.1.70"
   },
   "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.120",
+  "version": "5.1.121",
   "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.84"
+    "zova-module-a-zova": "^5.1.85"
   },
   "title": "a-zova"
 }