create-vidra-app 0.2.1 → 0.2.2

package/dist/cli.js

@@ -400,6 +400,7 @@ var newestNet10Sdk = (listSdksOutput) => splitLines(listSdksOutput).map((line) =
 var outputMentionsMaui = (workloadListOutput) => MAUI_WORKLOAD.test(workloadListOutput);
 var workloadSetVersion = (workloadListOutput) => workloadListOutput.match(WORKLOAD_SET_VERSION_LINE)?.[1];
 var MIN_MACCATALYST_WATCH_WORKLOAD_SET = [10, 0, 203];
+var MIN_MACCATALYST_WATCH_SDK = [10, 0, 300];
 var meetsMinimumVersion = (version, minimum) => {
   const segments = version.split(".").map((s) => Number.parseInt(s, 10));
   if (segments.slice(0, minimum.length).some(Number.isNaN)) return false;
@@ -410,12 +411,25 @@ var meetsMinimumVersion = (version, minimum) => {
   return true;
 };
 var workloadSetSupportsCSharpHotReload = (version) => meetsMinimumVersion(version, MIN_MACCATALYST_WATCH_WORKLOAD_SET);
+var sdkSupportsCSharpHotReload = (version) => meetsMinimumVersion(version, MIN_MACCATALYST_WATCH_SDK);
 var macCatalystHotReloadBlocker = () => {
+  const sdkRes = run(DOTNET, ["--version"]);
+  if (!sdkRes.found) return null;
+  const sdkVersion = sdkRes.stdout.trim();
+  if (sdkVersion && !sdkSupportsCSharpHotReload(sdkVersion)) {
+    return {
+      reason: `C# hot reload needs the .NET SDK 10.0.300+ \u2014 found ${sdkVersion}`,
+      fix: INSTALL_NET_10_FIX
+    };
+  }
   const res = run(DOTNET, ["workload", "list"]);
   if (!res.found) return null;
   const version = workloadSetVersion(res.stdout);
-  if (!version) return null;
-  return workloadSetSupportsCSharpHotReload(version) ? null : version;
+  if (!version || workloadSetSupportsCSharpHotReload(version)) return null;
+  return {
+    reason: `C# hot reload needs workload set 10.0.203+ \u2014 found ${version}`,
+    fix: "dotnet workload update"
+  };
 };
 var MISSING_WORKLOAD_SIGNATURES = [
   /NETSDK1147/i,
@@ -487,6 +501,15 @@ var checkCSharpHotReload = (workloadList) => {
   if (process.platform !== "darwin") {
     return { name, status: "ok", detail: "dotnet watch supported" };
   }
+  const sdkVersion = run(DOTNET, ["--version"]).stdout.trim();
+  if (sdkVersion && !sdkSupportsCSharpHotReload(sdkVersion)) {
+    return {
+      name,
+      status: "unknown",
+      detail: `SDK ${sdkVersion} \u2014 its dotnet-watch crashes Mac Catalyst apps on launch (needs 10.0.300+) \u2014 vidra dev falls back to a classic launch`,
+      fix: INSTALL_NET_10_FIX
+    };
+  }
   const version = workloadSetVersion(workloadList.stdout);
   if (!version) {
     return {
@@ -1058,10 +1081,10 @@ var startSession = async (argv, opts) => {
       console.log(
         row({
           glyph: "manual",
-          detail: `${dim("C# hot reload needs workload set 10.0.203+ \u2014 found")} ${value(blocker)}${dim("; using a classic launch")}`
+          detail: `${dim(blocker.reason + "; using a classic launch")}`
         })
       );
-      console.log(fixLine("dotnet workload update"));
+      console.log(fixLine(blocker.fix));
     }
   }
   const session = new DevSession(project, target, viteUrl, verbose, {
@@ -1293,7 +1316,12 @@ var DevSession = class {
           `${dim("launched")} ${value(this.project.projectName)} ${dim("\u2014 C# hot reload active")}`
         )
       );
-    } else if (event === "appWaiting" && !this.shuttingDown) {
+      return;
+    }
+    if (event !== "appWaiting" && event !== "buildBlocked" || this.shuttingDown) {
+      return;
+    }
+    if (this.watchReady) {
       console.log(
         taggedRow(
           "manual",
@@ -1301,20 +1329,30 @@ var DevSession = class {
           dim("app not running \u2014 save a C# file to relaunch, or ctrl-c to stop")
         )
       );
-    } else if (event === "buildBlocked" && !this.shuttingDown) {
-      if (!this.watchReady) {
-        if (looksLikeMissingWorkload(this.watchOutputTail)) printWorkloadHint();
-        else if (looksLikeXcodeTooOld(this.watchOutputTail)) printXcodeTooOldHint();
-        else if (looksLikeMissingXcode(this.watchOutputTail)) printXcodeHint();
-      }
+      return;
+    }
+    if (!/Build FAILED/i.test(this.watchOutputTail)) {
       console.log(
         taggedRow(
           "manual",
           "host",
-          dim("build failed \u2014 fix the error and save to retry, or ctrl-c to stop")
+          dim(
+            "app exited before it was ready \u2014 save a C# file to relaunch, or ctrl-c to stop"
+          )
         )
       );
+      return;
     }
+    if (looksLikeMissingWorkload(this.watchOutputTail)) printWorkloadHint();
+    else if (looksLikeXcodeTooOld(this.watchOutputTail)) printXcodeTooOldHint();
+    else if (looksLikeMissingXcode(this.watchOutputTail)) printXcodeHint();
+    console.log(
+      taggedRow(
+        "manual",
+        "host",
+        dim("build failed \u2014 fix the error and save to retry, or ctrl-c to stop")
+      )
+    );
   }
   /**
    * `dotnet watch` exited before the app ever started — typically an SDK or

package/dist/index.js

@@ -329,7 +329,7 @@ var VIDRA_REPO_ROOT = path2.resolve(CLI_ROOT, "..", "..", "..");
 var LOCAL_FEED_DIR = path2.join(VIDRA_REPO_ROOT, "dist", "packages");
 var LOCAL_CLI_DIR = CLI_ROOT;
 var LOCAL_SDK_DIR = path2.join(VIDRA_REPO_ROOT, "src", "sdk", "vidra-js");
-var VIDRA_VERSION = "0.2.1";
+var VIDRA_VERSION = "0.2.2";
 var SDK_VERSION = "0.1.0";
 var main = async () => {
   console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-vidra-app",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Scaffold a new Vidra application (React + .NET MAUI)",
   "type": "module",
   "bin": {