Merge branch 'quarto-dev:main' into main

Author: sigurdurthorjonsson

.github/workflows/create-release.yml

@@ -35,6 +35,11 @@ jobs:
         with:
           fetch-depth: 0
 
+      # we _also_ need npm, specifically for webui/preview
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
       - name: Get previous version
         id: read-version
         run: |

package/scripts/common/quarto

@@ -92,7 +92,6 @@ else
   QUARTO_ACTION=run
   QUARTO_TARGET=${SCRIPT_PATH}/quarto.js
   export QUARTO_BIN_PATH=$SCRIPT_PATH
-  export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
   QUARTO_CACHE_OPTIONS="--cached-only"
 
   # Turn off type checking for bundled version

package/src/common/configure.ts

@@ -19,7 +19,7 @@ import {
   kDependencies,
 } from "./dependencies/dependencies.ts";
 import { suggestUserBinPaths } from "../../../src/core/path.ts";
-import { buildQuartoPreviewJs } from "../../../src/core/previewjs.ts";
+import { buildQuartoPreviewJs } from "./previewjs.ts";
 import { isWindows } from "../../../src/deno_ral/platform.ts";
 
 export async function configure(

package/src/common/prepare-dist.ts

@@ -21,7 +21,7 @@ Dependency,
 } from "./dependencies/dependencies.ts";
 import { copyQuartoScript } from "./configure.ts";
 import { deno } from "./dependencies/deno.ts";
-import { buildQuartoPreviewJs } from "../../../src/core/previewjs.ts";
+import { buildQuartoPreviewJs } from "./previewjs.ts";
 
 export async function prepareDist(
   config: Configuration,

src/core/previewjs.ts renamed to package/src/common/previewjs.ts

@@ -4,14 +4,14 @@
  * Copyright (C) 2020-2023 Posit Software, PBC
  */
 
-import { join } from "../deno_ral/path.ts";
+import { join } from "../../../src/deno_ral/path.ts";
 
 export function buildQuartoPreviewJs(
   srcDir: string,
   denoDir?: string,
   force?: boolean,
 ) {
-  const args = ["run", "-A", "build.ts"];
+  const args = ["run", "--no-config", "-A", "build.ts"];
   if (force) {
     args.push("--force");
   }

src/command/dev-call/build-artifacts/cmd.ts

@@ -157,7 +157,7 @@ export async function buildAssets() {
 }
 
 export const buildJsCommand = new Command()
-  .name("build-js")
+  .name("build-artifacts")
   .hidden()
   .description(
     "Builds all the javascript assets necessary for IDE support.\n\n",

src/command/dev-call/cmd.ts

@@ -2,6 +2,7 @@ import { Command } from "cliffy/command/mod.ts";
 import { quartoConfig } from "../../core/quarto.ts";
 import { commands } from "../command.ts";
 import { buildJsCommand } from "./build-artifacts/cmd.ts";
+import { hidden } from "../../core/lib/external/colors.ts";
 
 type CommandOptionInfo = {
   name: string;
@@ -13,6 +14,7 @@ type CommandOptionInfo = {
 };
 
 type CommandInfo = {
+  hidden: boolean;
   name: string;
   description: string;
   options: CommandOptionInfo[];
@@ -33,10 +35,19 @@ const generateCliInfoCommand = new Command()
     output["version"] = quartoConfig.version();
     const commandsInfo: CommandInfo[] = [];
     output["commands"] = commandsInfo;
+
+    // Cliffy doesn't export the "hidden" property, so we maintain our own list
+    // here
+    const hiddenCommands = [
+      "dev-call",
+      "editor-support",
+      "create-project",
+    ];
     // deno-lint-ignore no-explicit-any
     const cmdAsJson = (cmd: any): CommandInfo => {
       return {
         name: cmd.getName(),
+        hidden: hiddenCommands.includes(cmd.getName()),
         description: cmd.getDescription(),
         options: cmd.getOptions(),
         usage: cmd.getUsage(),
@@ -50,6 +61,7 @@ const generateCliInfoCommand = new Command()
 
 export const devCallCommand = new Command()
   .name("dev-call")
+  .hidden()
   .description(
     "Access internals of Quarto - this command is not intended for general use.",
   )

src/command/preview/preview.ts

@@ -84,10 +84,7 @@ import {
 } from "../../core/platform.ts";
 import { isJupyterNotebook } from "../../core/jupyter/jupyter.ts";
 import { watchForFileChanges } from "../../core/watch.ts";
-import {
-  previewEnsureResources,
-  previewMonitorResources,
-} from "../../core/quarto.ts";
+import { previewMonitorResources } from "../../core/quarto.ts";
 import { exitWithCleanup } from "../../core/cleanup.ts";
 import {
   extensionFilesFromDirs,
@@ -200,9 +197,6 @@ export async function preview(
   // const listener = Deno.listen({ port: options.port!, hostname: options.host });
   const stopServer = () => ac.abort();
 
-  // ensure resources
-  previewEnsureResources(stopServer);
-
   // create client reloader
   const reloader = httpDevServer(
     options.timeout!,

src/core/jupyter/jupyter.ts

@@ -1030,7 +1030,7 @@ export function mdFromContentCell(
             : data as string;
           // base 64 decode if its not svg
           if (!imageText.trimStart().startsWith("<svg")) {
-            const imageData = base64decode(imageText);
+            const imageData = base64decode(imageText.replaceAll("\n", ""));
             Deno.writeFileSync(outputFile, imageData);
           } else {
             Deno.writeTextFileSync(outputFile, imageText);

src/core/quarto.ts

@@ -14,7 +14,6 @@ import { exitWithCleanup } from "./cleanup.ts";
 import { onActiveProfileChanged } from "../project/project-profile.ts";
 import { onDotenvChanged } from "../quarto-core/dotenv.ts";
 import { normalizePath, safeExistsSync } from "./path.ts";
-import { buildQuartoPreviewJs } from "./previewjs.ts";
 import { isWindows } from "../deno_ral/platform.ts";
 
 export const kLocalDevelopment = "99.9.9";
@@ -78,12 +77,6 @@ export const quartoConfig = {
   },
 };
 
-export function previewEnsureResources(cleanup?: VoidFunction) {
-  if (quartoConfig.isDebug()) {
-    buildPreviewJs(quartoSrcDir(), cleanup);
-  }
-}
-
 export function previewMonitorResources(cleanup?: VoidFunction) {
   // active profile changed
   onActiveProfileChanged(() => {
@@ -129,10 +122,3 @@ function terminatePreview(reason: string, cleanup?: VoidFunction) {
 function quartoSrcDir() {
   return normalizePath(join(quartoConfig.binPath(), "../../../src"));
 }
-
-function buildPreviewJs(srcDir: string, cleanup?: VoidFunction) {
-  const output = buildQuartoPreviewJs(srcDir);
-  if (!output.success) {
-    terminatePreview("Error building quarto-preview.js", cleanup);
-  }
-}