fix: make rustup optional (#141)

denoland · Jun 18, 2024 · eaf565f · eaf565f · codegod100 · Jun 21, 2024
1 parent 53f1020
commit eaf565f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/lib/commands/new_command.ts b/lib/commands/new_command.ts
@@ -152,7 +152,7 @@ async function getFileTextIfExists(path: string) {
 }
 
 async function checkIfRequiredToolsExist() {
-  const requiredTools = ["deno", "cargo", "rustup"];
+  const requiredTools = ["deno", "cargo"];
   const notInstalled: string[] = [];
 
   for (const tool of requiredTools) {

diff --git a/lib/pre_build.ts b/lib/pre_build.ts
@@ -44,19 +44,28 @@ export async function runPreBuild(
 
   verifyVersions(crate);
 
-  console.log(
-    `${
-      colors.bold(colors.green("Ensuring"))
-    } wasm32-unknown-unknown target installed...`,
-  );
-
-  const rustupAddWasm = new Deno.Command("rustup", {
-    args: ["target", "add", "wasm32-unknown-unknown"],
-  });
-  const rustupAddWasmOutput = await rustupAddWasm.output();
-  if (!rustupAddWasmOutput.success) {
-    console.error(`adding wasm32-unknown-unknown target failed`);
-    Deno.exit(1);
+  try {
+    const rustupAddWasm = new Deno.Command("rustup", {
+      args: ["target", "add", "wasm32-unknown-unknown"],
+    });
+    console.log(
+      `${
+        colors.bold(colors.green("Ensuring"))
+      } wasm32-unknown-unknown target installed...`,
+    );
+    const rustupAddWasmOutput = await rustupAddWasm.output();
+    if (!rustupAddWasmOutput.success) {
+      console.error(`adding wasm32-unknown-unknown target failed`);
+      Deno.exit(1);
+    }
+  } catch (error) {
+    if (error instanceof Deno.errors.NotFound) {
+      console.info(
+        `rustup not found. Ensure wasm32-unknown-unknown installed manually.`,
+      );
+    } else {
+      throw error;
+    }
   }
 
   console.log(