@cedarjs/cli 1.0.0-canary.13062 → 1.0.0-canary.13063

package/dist/commands/upgrade.js

@@ -238,18 +238,16 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
   await tasks.run();
   if (preUpgradeError) {
     console.error("");
-    console.error(`   \u274C ${c.error("Pre-upgrade Error:")}
-`);
-    console.error("  " + preUpgradeError.replace(/\n/g, "\n   "));
+    console.error(`  \u{1F6A8} ${c.error("Pre-upgrade Error:")}`);
+    console.error("  " + preUpgradeError.replace(/\n/g, "\n  "));
     if (!force) {
       process.exit(1);
     }
   }
   if (preUpgradeMessage) {
     console.log("");
-    console.log(`   \u{1F4E3} ${c.info("Pre-upgrade Message:")}
-`);
-    console.log("  " + preUpgradeMessage.replace(/\n/g, "\n   "));
+    console.log(`   \u{1F4E3} ${c.info("Pre-upgrade Message:")}`);
+    console.log("  " + preUpgradeMessage.replace(/\n/g, "\n  "));
   }
 };
 async function yarnInstall({ verbose }) {
@@ -658,27 +656,32 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
       );
       if (stdout) {
         if (ctx.preUpgradeMessage) {
-          ctx.preUpgradeMessage += "\n\n";
+          ctx.preUpgradeMessage += "\n";
         }
         ctx.preUpgradeMessage += `
 ${stdout}`;
       }
     } catch (e) {
       const errorOutput = e.stdout || e.stderr || e.message || "";
-      const errorMessage = `Pre-upgrade check ${scriptName} failed:
-${errorOutput}`;
+      const verboseErrorMessage = verbose ? `Pre-upgrade check ${scriptName} failed with exit code ${e.exitCode}:
+${e.stderr ? e.stderr + "\n" : ""}` : "";
       if (ctx.preUpgradeError) {
-        ctx.preUpgradeError += "\n\n";
+        ctx.preUpgradeError += "\n";
+      }
+      if (verbose) {
+        ctx.preUpgradeError += `
+${verboseErrorMessage}`;
       }
-      ctx.preUpgradeError += errorMessage;
+      ctx.preUpgradeError += `
+${errorOutput}`;
       if (!force) {
-        await fs.promises.rmdir(tempDir, { recursive: true });
+        await fs.promises.rm(tempDir, { recursive: true });
         shouldCleanup = false;
         return;
       }
     } finally {
       if (shouldCleanup) {
-        await fs.promises.rmdir(tempDir, { recursive: true });
+        await fs.promises.rm(tempDir, { recursive: true });
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13062+bfee639dd",
+  "version": "1.0.0-canary.13063+d4d2d0cd8",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13062",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13062",
-    "@cedarjs/fastify-web": "1.0.0-canary.13062",
-    "@cedarjs/internal": "1.0.0-canary.13062",
-    "@cedarjs/prerender": "1.0.0-canary.13062",
-    "@cedarjs/project-config": "1.0.0-canary.13062",
-    "@cedarjs/structure": "1.0.0-canary.13062",
-    "@cedarjs/telemetry": "1.0.0-canary.13062",
-    "@cedarjs/web-server": "1.0.0-canary.13062",
+    "@cedarjs/api-server": "1.0.0-canary.13063",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13063",
+    "@cedarjs/fastify-web": "1.0.0-canary.13063",
+    "@cedarjs/internal": "1.0.0-canary.13063",
+    "@cedarjs/prerender": "1.0.0-canary.13063",
+    "@cedarjs/project-config": "1.0.0-canary.13063",
+    "@cedarjs/structure": "1.0.0-canary.13063",
+    "@cedarjs/telemetry": "1.0.0-canary.13063",
+    "@cedarjs/web-server": "1.0.0-canary.13063",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bfee639ddb273d138b35056f6274ffcbbd9309d2"
+  "gitHead": "d4d2d0cd8e92339f008a6d07dce5d98a2a3425ee"
 }