Merge branch 'main' into revealjs/scroll-view

Author: cderv

.github/workflows/test-smokes-parallel.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
         with:
-          version: pre-release
+          version: ${{ github.ref == 'refs/heads/main' && 'pre-release' || 'release' }}
 
       - name: Create Job for tests
         id: tests-buckets

news/changelog-1.6.md

@@ -42,6 +42,7 @@ All changes included in 1.6:
 - ([#9558](https://github.com/quarto-dev/quarto-cli/issues/9558)): To prevent default footer to show on slide, set `footer='false'` attribute on the slide header, e.g. `## Slide with no footer {footer='false'}`
 - ([#6012](https://github.com/quarto-dev/quarto-cli/issues/6012)): Add styling for `kbd` element in Revealjs slides.
 - ([#10887](https://github.com/quarto-dev/quarto-cli/issues/10887)): Updating default Mathjax used from 2.7.0 to 2.7.9.
+- ([#9999](https://github.com/quarto-dev/quarto-cli/issues/9999)): Fix spacing problems of different size elements in columns.
 
 ## `typst` Format
 
@@ -91,6 +92,7 @@ All changes included in 1.6:
 - Upgrade `mermaidjs` to 11.2.0.
 - Upgrade Pandoc to 3.4.
 - Upgrade `deno` to 1.46.3.
+- ([#11068](https://github.com/quarto-dev/quarto-cli/issues/11068)): use standard location when writing to standard output to avoid breakage under `self-contained: true`.
 - ([#10162](https://github.com/quarto-dev/quarto-cli/issues/10162)): Use Edge on `macOS` as a Chromium browser when available.
 - ([#10235](https://github.com/quarto-dev/quarto-cli/issues/10235)): Configure the CI schedule trigger to activate exclusively for the upstream repository.
 - ([#10295](https://github.com/quarto-dev/quarto-cli/issues/10235)): Fix regression to return error status to shell when `CommandError` is thrown.

package/launcher/src/main.rs

@@ -86,6 +86,7 @@ fn main() {
         String::from("--unstable-ffi"),
         String::from("--no-config"),
         String::from("--cached-only"),
+        String::from("--no-lock"),
         String::from("--allow-read"),
         String::from("--allow-write"),
         String::from("--allow-run"),

package/scripts/common/quarto

@@ -169,7 +169,7 @@ fi
 export DENO_TLS_CA_STORE=system,mozilla
 export DENO_NO_UPDATE_CHECK=1
 # Be sure to include any already defined QUARTO_DENO_OPTIONS
-QUARTO_DENO_OPTIONS="--unstable-ffi --unstable-kv --no-config ${QUARTO_CACHE_OPTIONS} --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
+QUARTO_DENO_OPTIONS="--unstable-ffi --unstable-kv --no-config --no-lock ${QUARTO_CACHE_OPTIONS} --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
 
 # --enable-experimental-regexp-engine is required for /regex/l, https://github.com/quarto-dev/quarto-cli/issues/9737
 if [ "$QUARTO_DENO_V8_OPTIONS" != "" ]; then

package/scripts/windows/quarto.cmd

@@ -59,6 +59,9 @@ IF EXIST "!QUARTO_TS_PATH!" (
 
 	SET QUARTO_CACHE_OPTIONS=
 
+	REM Turn on type checking for dev version
+  SET QUARTO_DENO_OPTIONS=--check
+
 ) ELSE (
 
 	IF NOT DEFINED QUARTO_SHARE_PATH (
@@ -102,7 +105,7 @@ IF NOT DEFINED QUARTO_DENO (
 
 SET "DENO_TLS_CA_STORE=system,mozilla"
 SET "DENO_NO_UPDATE_CHECK=1"
-SET "QUARTO_DENO_OPTIONS=--unstable-kv --unstable-ffi --no-config --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
+SET "QUARTO_DENO_OPTIONS=--unstable-kv --unstable-ffi --no-config --no-lock --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi !QUARTO_DENO_OPTIONS!"
 
 REM Add expected V8 options to QUARTO_DENO_V8_OPTIONS
 IF DEFINED QUARTO_DENO_V8_OPTIONS (

src/command/render/output.ts

@@ -181,7 +181,7 @@ export function outputRecipe(
       });
     }
 
-    if (!recipe.output) {
+    const deriveAutoOutput = () => {
       // no output specified: derive an output path from the extension
 
       // derive new output file
@@ -200,15 +200,16 @@ export function outputRecipe(
 
       // assign output
       updateOutput(output);
+    };
+
+    if (!recipe.output) {
+      deriveAutoOutput();
     } else if (recipe.output === kStdOut) {
-      // output to stdout: direct pandoc to write to a temp file then we'll
-      // forward to stdout (necessary b/c a postprocesor may need to act on
-      // the output before its complete)
-      updateOutput(options.services.temp.createFile({ suffix: "." + ext }));
+      deriveAutoOutput();
       recipe.isOutputTransient = true;
       completeActions.push(() => {
-        writeFileToStdout(recipe.output);
-        Deno.removeSync(recipe.output);
+        writeFileToStdout(join(inputDir, recipe.output));
+        Deno.removeSync(join(inputDir, recipe.output));
       });
     } else if (!isAbsolute(recipe.output)) {
       // relatve output file on the command line: make it relative to the input dir

src/command/render/render.ts

@@ -276,25 +276,38 @@ export async function renderPandoc(
       await withTimingAsync("postprocess-selfcontained", async () => {
         // ensure flags
         const flags = context.options.flags || {};
-
-        // call complete handler (might e.g. run latexmk to complete the render)
-        finalOutput = await recipe.complete(pandocOptions) || recipe.output;
-
         // determine whether this is self-contained output
+        finalOutput = recipe.output;
+
+        // note that we intentionally call isSelfContainedOutput twice
+        // the first needs to happen before recipe completion
+        // because ingestion of self-contained output needs
+        // to happen before recipe completion (which cleans up some files)
         selfContained = isSelfContainedOutput(
           flags,
           format,
           finalOutput,
         );
 
-        // If this is self-contained, run pandoc to 'suck in' the dependencies
-        // which may have been added in the post processor
         if (selfContained && isHtmlFileOutput(format.pandoc)) {
           await pandocIngestSelfContainedContent(
             outputFile,
             format.pandoc[kResourcePath],
           );
         }
+
+        // call complete handler (might e.g. run latexmk to complete the render)
+        finalOutput = (await recipe.complete(pandocOptions)) || recipe.output;
+
+        // note that we intentionally call isSelfContainedOutput twice
+        // the second call happens because some recipes change
+        // their output extension on completion (notably, .pdf files)
+        // and become self-contained for purposes of cleanup
+        selfContained = isSelfContainedOutput(
+          flags,
+          format,
+          finalOutput,
+        );
       });
 
       // compute the relative path to the files dir

src/core/sass.ts

@@ -139,36 +139,19 @@ export async function compileSass(
     ...userRules,
     '// quarto-scss-analysis-annotation { "origin": null }',
   ].join("\n\n");
-  let failed = false;
-  // deno-lint-ignore no-explicit-any
-  let e: any = null;
-  try {
-    scssInput += "\n" + cssVarsBlock(scssInput);
-  } catch (_e) {
-    e = _e;
-    failed = true;
-  }
 
   // Compile the scss
   const result = await compileWithCache(
     scssInput,
     loadPaths,
     temp,
-    minified,
-    await md5HashBytes(new TextEncoder().encode(scssInput)),
+    {
+      compressed: minified,
+      cacheIdentifier: await md5HashBytes(new TextEncoder().encode(scssInput)),
+      addVarsBlock: true,
+    },
   );
 
-  if (failed) {
-    console.warn("Error adding css vars block", e);
-    console.warn(
-      "The resulting CSS file will not have SCSS color variables exported as CSS.",
-    );
-    Deno.writeTextFileSync("_quarto_internal_scss_error.scss", scssInput);
-    console.warn(
-      "This is likely a Quarto bug.\nPlease consider reporting it at https://github.com/quarto-dev/quarto-cli,\nalong with the _quarto_internal_scss_error.scss file that can be found in the current working directory.",
-    );
-  }
-
   if (!Deno.env.get("QUARTO_SAVE_SCSS")) {
     return result;
   }
@@ -353,13 +336,44 @@ export function sassLayerDir(
   };
 }
 
+type CompileWithCacheOptions = {
+  compressed?: boolean;
+  cacheIdentifier?: string;
+  addVarsBlock?: boolean;
+};
+
 export async function compileWithCache(
   input: string,
   loadPaths: string[],
   temp: TempContext,
-  compressed?: boolean,
-  cacheIdentifier?: string,
+  options?: CompileWithCacheOptions,
 ) {
+  const {
+    compressed,
+    cacheIdentifier,
+    addVarsBlock,
+  } = options || {};
+
+  const handleVarsBlock = (input: string) => {
+    if (!addVarsBlock) {
+      return input;
+    }
+    try {
+      input += "\n" + cssVarsBlock(input);
+    } catch (e) {
+      console.warn("Error adding css vars block", e);
+      console.warn(
+        "The resulting CSS file will not have SCSS color variables exported as CSS.",
+      );
+      Deno.writeTextFileSync("_quarto_internal_scss_error.scss", input);
+      console.warn(
+        "This is likely a Quarto bug.\nPlease consider reporting it at https://github.com/quarto-dev/quarto-cli,\nalong with the _quarto_internal_scss_error.scss file that can be found in the current working directory.",
+      );
+      throw e;
+    }
+    return input;
+  };
+
   if (cacheIdentifier) {
     // If there are imports, the computed input Hash is incorrect
     // so we should be using a session cache which will cache
@@ -372,8 +386,16 @@ export async function compileWithCache(
       : quartoCacheDir("sass");
     // when using quarto session cache, we ensure to cleanup the cache files at TempContext cleanup
     const cache = await sassCache(cacheDir, useSessionCache ? temp : undefined);
-    return cache.getOrSet(input, loadPaths, temp, cacheIdentifier, compressed);
+    return cache.getOrSet(
+      input,
+      cacheIdentifier,
+      async (outputFilePath: string) => {
+        input = handleVarsBlock(input);
+        await dartCompile(input, outputFilePath, temp, loadPaths, compressed);
+      },
+    );
   } else {
+    input = handleVarsBlock(input);
     const outputFilePath = temp.createFile({ suffix: ".css" });
     // Skip the cache and just compile
     await dartCompile(

src/core/sass/cache.ts

@@ -77,22 +77,13 @@ class SassCache {
   async setFromHash(
     identifierHash: string,
     inputHash: string,
-    input: string,
-    loadPaths: string[],
-    temp: TempContext,
     cacheIdentifier: string,
-    compressed?: boolean,
+    compilationThunk: (outputFilePath: string) => Promise<void>,
   ): Promise<string> {
     log.debug(`SassCache.setFromHash(${identifierHash}, ${inputHash}), ...`);
     const outputFilePath = join(this.path, `${identifierHash}.css`);
     try {
-      await dartCompile(
-        input,
-        outputFilePath,
-        temp,
-        loadPaths,
-        compressed,
-      );
+      await compilationThunk(outputFilePath);
     } catch (error) {
       // Compilation failed, so clear out the output file (if exists)
       // which will be invalid CSS
@@ -112,30 +103,23 @@ class SassCache {
 
   async set(
     input: string,
-    loadPaths: string[],
-    temp: TempContext,
     cacheIdentifier: string,
-    compressed?: boolean,
+    compilationThunk: (outputFilePath: string) => Promise<void>,
   ): Promise<string> {
     const identifierHash = md5Hash(cacheIdentifier);
     const inputHash = md5Hash(input);
     return this.setFromHash(
       identifierHash,
       inputHash,
-      input,
-      loadPaths,
-      temp,
       cacheIdentifier,
-      compressed,
+      compilationThunk,
     );
   }
 
   async getOrSet(
     input: string,
-    loadPaths: string[],
-    temp: TempContext,
     cacheIdentifier: string,
-    compressed?: boolean,
+    compilationThunk: (outputFilePath: string) => Promise<void>,
   ): Promise<string> {
     log.debug(`SassCache.getOrSet(...)`);
     const identifierHash = md5Hash(cacheIdentifier);
@@ -149,11 +133,8 @@ class SassCache {
     return this.setFromHash(
       identifierHash,
       inputHash,
-      input,
-      loadPaths,
-      temp,
       cacheIdentifier,
-      compressed,
+      compilationThunk,
     );
   }