Merge pull request #12580 from quarto-dev/feature/deno-2

Feature/deno 2

Author: cscheid

configuration

@@ -11,7 +11,7 @@
 # in src/command/check/check.ts
 
 # Binary dependencies
-export DENO=v1.46.3
+export DENO=v2.2.10
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.41-alpha-artifacts
 export PANDOC=3.6.3

package/scripts/deno_std/download.sh

@@ -10,4 +10,4 @@ fi
 
 
 export DENO_DIR="$QUARTO_SRC_PATH/resources/deno_std/cache"
-"$QUARTO_DENO" cache --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"
+"$QUARTO_DENO" cache --allow-import --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"

package/src/common/archive-binary-dependencies.ts

@@ -159,9 +159,10 @@ export async function archiveBinaryDependency(
 }
 
 async function s3cmd(cmd: string, args: string[]) {
-  const s3Command = ["aws", "s3", cmd, ...args];
+  const s3Args = ["s3", cmd, ...args];
   const p = await execProcess({
-    cmd: s3Command,
+    cmd: "aws",
+    args: s3Args,
     stdout: "piped",
   });
 

package/src/common/prepare-dist.ts

@@ -90,6 +90,7 @@ export async function prepareDist(
     try {
       await configArchDependency(dependency, targetDir, config)
     } catch (e) {
+      if (!(e instanceof Error)) { throw e; }
       if (
         e.message ===
           "The architecture aarch64 is missing the dependency deno_dom"
@@ -121,13 +122,11 @@ export async function prepareDist(
   info("");
 
   // Create the deno bundle
-  const input = join(config.directoryInfo.src, "quarto.ts");
+  // const input = join(config.directoryInfo.src, "quarto.ts");
   const output = join(config.directoryInfo.pkgWorking.bin, "quarto.js");
   info("\nCreating Deno Bundle");
   info(output);
   await bundle(
-    input,
-    output,
     config,
   );
   info("");

package/src/common/validate-bundle.ts

@@ -32,7 +32,8 @@ export async function validateBundle(
     // NPM Install
     info("Installing Dependencies");
     const npm = await execProcess({
-      cmd: ["npm", "install"],
+      cmd: "npm",
+      args: ["install"],
       stderr: "piped"
     }); 
     if (!npm.success) {
@@ -53,7 +54,8 @@ export async function validateBundle(
     // Test the bundled output
     info("Testing Bundled output");
     const npx = await execProcess({
-      cmd: ["npx", "eslint", "bundle.js"],
+      cmd: "npx",
+      args: ["eslint", "bundle.js"],
       stderr: "piped"
 
     });

package/src/util/cmd.ts

@@ -8,7 +8,7 @@
 import { debug, error, info } from "../../../src/deno_ral/log.ts";
 
 export interface CmdResult {
-  status: Deno.ProcessStatus;
+  status: Deno.CommandStatus;
   stdout: string;
   stderr: string;
 }
@@ -17,34 +17,32 @@ export async function runCmd(
   runCmd: string,
   args: string[],
 ): Promise<CmdResult> {
-  const cmd: string[] = [];
-  cmd.push(runCmd);
-  cmd.push(...args);
+  // const cmd: string[] = [];
+  // cmd.push(runCmd);
+  // cmd.push(...args);
 
-  info(cmd);
+  info([runCmd, ...args]);
   info(`Starting ${runCmd}`);
-  const p = Deno.run({
-    cmd,
+  const cmd = new Deno.Command(runCmd, {
+    args,
     stdout: "piped",
     stderr: "piped",
   });
-  const stdout = new TextDecoder().decode(await p.output());
-  const stderr = new TextDecoder().decode(await p.stderrOutput());
+  const output = await cmd.output();
+  const stdout = new TextDecoder().decode(output.stdout);
+  const stderr = new TextDecoder().decode(output.stderr);
   info(`Finished ${runCmd}`);
   debug(stdout);
 
-  const status = await p.status();
-  info(`Status ${status.code}`);
-  if (status.code !== 0) {
+  const code = output.code;
+  info(`Status ${code}`);
+  if (code !== 0) {
     error(stderr);
-    throw Error(`Command ${cmd} failed.`);
+    throw Error(`Command ${[runCmd, ...args]} failed.`);
   }
 
-  // Close the child process
-  p.close();
-
   return {
-    status,
+    status: output,
     stdout,
     stderr,
   };

package/src/util/deno.ts

@@ -4,13 +4,14 @@
 * Copyright (C) 2020-2022 Posit Software, PBC
 *
 */
+import { execProcess } from "../../../src/core/process.ts";
 import { info } from "../../../src/deno_ral/log.ts";
 import { isWindows } from "../../../src/deno_ral/platform.ts";
 import { Configuration } from "../common/config.ts";
 
+// TODO in we only use the bundler for quarto.ts
+// so we hardcode it in the new esbuild-based bundler
 export async function bundle(
-  input: string,
-  output: string,
   configuration: Configuration,
 ) {
   // Bundle source code
@@ -19,28 +20,23 @@ export async function bundle(
   if (!denoExecPath) {
     throw Error("QUARTO_DENO is not defined");
   }
-  denoBundleCmd.push(denoExecPath);
-  denoBundleCmd.push("bundle");
-  denoBundleCmd.push("--no-check");
-  denoBundleCmd.push("--unstable-kv");
-  denoBundleCmd.push("--unstable-ffi");
-  denoBundleCmd.push(
-    "--importmap=" + configuration.importmap,
-  );
+  denoBundleCmd.push("run");
+  denoBundleCmd.push("--allow-all");
+  denoBundleCmd.push("../tools/deno-esbuild-bundle.ts");
   /*
   denoBundleCmd.push("--log-level");
   denoBundleCmd.push("debug");
   */
+  // denoBundleCmd.push(input);
+  // denoBundleCmd.push(output);
 
-  denoBundleCmd.push(input);
-  denoBundleCmd.push(output);
-
-  const p = Deno.run({
-    cmd: denoBundleCmd,
+  const status = await execProcess({
+    cmd: denoExecPath,
+    args: denoBundleCmd,
+    cwd: configuration.directoryInfo.src,
   });
-  const status = await p.status();
   if (status.code !== 0) {
-    throw Error(`Failure to bundle ${input}`);
+    throw Error(`Failure to bundle src/quarto.ts`);
   }
 }
 
@@ -55,7 +51,6 @@ export async function compile(
   if (!denoExecPath) {
     throw Error("QUARTO_DENO is not defined");
   }
-  denoBundleCmd.push(denoExecPath);
   denoBundleCmd.push("compile");
   denoBundleCmd.push("--unstable-kv");
   denoBundleCmd.push("--unstable-ffi");
@@ -68,15 +63,14 @@ export async function compile(
 
   denoBundleCmd.push(input);
 
-  const p = Deno.run({
-    cmd: denoBundleCmd,
+  const status = await execProcess({
+    cmd: denoExecPath, 
+    args: denoBundleCmd,
   });
-  const status = await p.status();
   if (status.code !== 0) {
     throw Error(`Failure to compile ${input}`);
   }
 }
-
 export async function install(
   input: string,
   flags: string[],
@@ -87,7 +81,6 @@ export async function install(
   if (!denoExecPath) {
     throw Error("QUARTO_DENO is not defined");
   }
-  denoBundleCmd.push(denoExecPath);
   denoBundleCmd.push("install");
   denoBundleCmd.push("--unstable-kv");
   denoBundleCmd.push("--unstable-ffi");
@@ -98,24 +91,19 @@ export async function install(
 
   denoBundleCmd.push(input);
 
-  const p = Deno.run({
-    cmd: denoBundleCmd,
+  const status = await execProcess({
+    cmd: denoExecPath,
+    args: denoBundleCmd,
     stdout: "piped",
   });
-  const status = await p.status();
   if (status.code !== 0) {
     throw Error(`Failure to install ${input}`);
   }
-  const output = await p.output();
-
-  if (output) {
-    // Try to read the installation path and return it
-    const outputTxt = new TextDecoder().decode(output);
-
+  if (status.stdout) {
     // Forward the output
-    info(outputTxt);
+    info(status.stdout);
 
-    const match = outputTxt.match(/Successfully installed.*\n(.*)/);
+    const match = status.stdout.match(/Successfully installed.*\n(.*)/);
     if (match) {
       return match[1];
     }

package/src/windows/installer.ts

@@ -157,8 +157,8 @@ export async function makeInstallerWindows(configuration: Configuration) {
 
 export function zip(input: string, output: string) {
   const dir = dirname(input);
-  const cmd = [
-    "powershell",
+  const cmd = "powershell";
+  const args = [
     "Compress-Archive",
     "-Force",
     input,
@@ -169,6 +169,7 @@ export function zip(input: string, output: string) {
   return execProcess(
     {
       cmd,
+      args,
       cwd: dir,
       stdout: "piped",
     },

src/command/check/check.ts

@@ -217,15 +217,17 @@ async function checkVersions(conf: CheckConfiguration) {
 
   let pandocVersion = lines(
     (await execProcess({
-      cmd: [pandocBinaryPath(), "--version"],
+      cmd: pandocBinaryPath(),
+      args: ["--version"],
       stdout: "piped",
     })).stdout!,
   )[0]?.split(" ")[1];
   const sassVersion = (await dartCommand(["--version"]))?.trim();
   const denoVersion = Deno.version.deno;
   const typstVersion = lines(
     (await execProcess({
-      cmd: [typstBinaryPath(), "--version"],
+      cmd: typstBinaryPath(),
+      args: ["--version"],
       stdout: "piped",
     })).stdout!,
   )[0].split(" ")[1];
@@ -300,7 +302,8 @@ async function checkInstall(conf: CheckConfiguration) {
     const quartoRoot = Deno.env.get("QUARTO_ROOT");
     if (quartoRoot) {
       const gitHead = await execProcess({
-        cmd: ["git", "-C", quartoRoot, "rev-parse", "HEAD"],
+        cmd: "git",
+        args: ["-C", quartoRoot, "rev-parse", "HEAD"],
         stdout: "piped",
         stderr: "piped", // to not show error if not in a git repo
       });

src/command/create/artifacts/artifact-shared.ts

@@ -150,7 +150,8 @@ export async function ejsData(
 
 async function gitAuthor() {
   const result = await execProcess({
-    cmd: ["git", "config", "--global", "user.name"],
+    cmd: "git",
+    args: ["config", "--global", "user.name"],
     stdout: "piped",
     stderr: "piped",
   });