Merge branch 'main' into bugfix/no-env-set-past-startup

Author: cscheid

.github/workflows/test-ff-matrix.yml

@@ -117,7 +117,7 @@ jobs:
       - name: Install uv for Python
         uses: astral-sh/setup-uv@v3
         with:
-          version: "0.4.30"
+          version: "0.7.4"
           enable-cache: true
           cache-dependency-glob: "tests/uv.lock"
 

.github/workflows/test-smokes.yml

@@ -145,7 +145,7 @@ jobs:
       - name: Install uv for Python
         uses: astral-sh/setup-uv@v3
         with:
-          version: "0.5.9"
+          version: "0.7.4"
           enable-cache: true
           cache-dependency-glob: "tests/uv.lock"
 

.vscode/launch.json

@@ -36,7 +36,7 @@
       "name": "Run Quarto test",
       "request": "launch",
       "type": "node",
-      "program": "smoke/smoke-all.test.ts", // test script here
+      "program": "smoke/logging/log-level-direct.test.ts", // test script here
       "args": [], // args to the script here, like in command line smoke/smoke-all.test.t -- .\docs\smoke-all\2023\01\19\2107.qmd
       "cwd": "${workspaceFolder}/tests",
       "runtimeExecutable": "${workspaceFolder}/package/dist/bin/tools/deno",

dev-docs/feature-format-matrix/qmd-files/mermaid/document.qmd

@@ -4,7 +4,7 @@ format:
   docusaurus-md: {}
 ---
 
-::: content-visible when-format="docusaurus-md"
+::: {.content-visible when-format="docusaurus-md"}
 This works, but emits a fairly-wonky markdown and doesn't use Javascript rendering.
 :::
 

news/changelog-1.8.md

@@ -5,6 +5,7 @@ All changes included in 1.8:
 - ([#6607](https://github.com/quarto-dev/quarto-cli/issues/6607)): Add missing beamer template update for beamer theme options: `colorthemeoptions`, `fontthemeoptions`, `innerthemeoptions` and `outerthemeoptions`.
 - ([#12625](https://github.com/quarto-dev/quarto-cli/pull/12625)): Fire resize event on window when light/dark toggle is clicked, to tell widgets to resize.
 - ([#12657](https://github.com/quarto-dev/quarto-cli/pull/12657)): Load Giscus in generated script tag, to avoid wrong-theming in Chrome.
+- ([#12780](https://github.com/quarto-dev/quarto-cli/issues/12780)): `keep-ipynb: true` now works again correctly and intermediate `.quarto_ipynb` is not removed.
 
 ## Formats
 
@@ -18,6 +19,8 @@ All changes included in 1.8:
 - ([#12734](https://github.com/quarto-dev/quarto-cli/issues/12734)): `highlight-style` now correctly supports setting a different `light` and `dark`.
 - ([#12747](https://github.com/quarto-dev/quarto-cli/issues/12747)): Ensure `th` elements are properly restored when Quarto's HTML table processing is happening.
 - ([#12766](https://github.com/quarto-dev/quarto-cli/issues/12766)): Use consistent equation numbering display for `html-math-method` and `html-math-method.method` for MathJax and KaTeX (author: @mcanouil)
+- ([#12797](https://github.com/quarto-dev/quarto-cli/issues/12797)): Allow light and dark brands to be specified in one file, by specializing colors with `light:` and `dark:`.
+- ([#12919](https://github.com/quarto-dev/quarto-cli/issues/12919)): Ensure `kbd` shortcode output has hover tooltip.
 
 ### `revealjs`
 
@@ -32,11 +35,16 @@ All changes included in 1.8:
 - ([#12554](https://github.com/quarto-dev/quarto-cli/pull/12554)): CSS properties `font-weight` and `font-style` are translated to Typst `text` properties.
 - ([#12695](https://github.com/quarto-dev/quarto-cli/issues/12695)): Resolve Typst `font-paths` that start with `/` relative to project root.
 - ([#12739](https://github.com/quarto-dev/quarto-cli/pull/12739)): Remove unused variable `heading-background-color` and `heading-decoration` from Typst's templates. They are leftover from previous change, and not part of Brand.yml schema for typography of headings.
+- ([#12815](https://github.com/quarto-dev/quarto-cli/issues/12815)): Do not crash when floats have no content.
 
 ### `beamer`
 
 - ([#12775](https://github.com/quarto-dev/quarto-cli/issues/12775)): Convert Quarto-native layouts (divs with `layout` syntax) to Beamer columns, equivalent to using the Pandoc-native syntax of div with `columns` and `column` classes.
 
+### `hugo-md`
+
+- ([#12676](https://github.com/quarto-dev/quarto-cli/issues/12676)): Add support for rendering layout panels that are not floats.
+
 ## Projects
 
 ### `website`
@@ -52,14 +60,36 @@ All changes included in 1.8:
 ## Lua Filters
 
 - ([#12727](https://github.com/quarto-dev/quarto-cli/issues/12727)): Do not crash in the presence of malformed tabset contents.
+- ([#12806](https://github.com/quarto-dev/quarto-cli/pull/12806)): Use pandoc APIs to handle codepage conversion on Windows.
+- ([#12811](https://github.com/quarto-dev/quarto-cli/pull/12811)): Add support for YouTube Shorts in `video` shortcode.
 
 ## Commands
 
 ### `inspect`
 
 - ([#12733](https://github.com/quarto-dev/quarto-cli/issues/12733)): Add installed extensions to `quarto inspect` project report.
 
+### `add`
+
+- ([#12627](https://github.com/quarto-dev/quarto-cli/issues/12627)): Don't actually install extension when user responds `yes` to first prompt but `no` to second.
+
+## Engines
+
+### `jupyter`
+
+- ([#12753](https://github.com/quarto-dev/quarto-cli/issues/12753)): Support change in IPython 9+ and import `set_matplotlib_formats` from `matplotlib_inline.backend_inline` in the internal `setup.py` script used to initialize rendering with Jupyter engine.
+- ([#12839](https://github.com/quarto-dev/quarto-cli/issues/12839)): Support for `plotly.py` 6+ which now loads plotly.js using a cdn in script as a module.
+
+### `knitr`
+
+- Correctly detect R binary on Windows when `R_HOME` is set - this fixes issue with `quarto::quarto_render()` that will now correctly use the same R version as the R session it is called from.
+
+### `julia`
+
+- ([#12870](https://github.com/quarto-dev/quarto-cli/pull/12870)): Update `julia` engine from `0.17.0` to `0.17.3` to improve `juliaup` detection on Windows systems and correctly set `Base.source_path()` output to match REPL and script usage.
+
 ## Other fixes and improvements
 
 - ([#11321](https://github.com/quarto-dev/quarto-cli/issues/11321)): Follow [recommendation from LaTeX project](https://latex-project.org/news/latex2e-news/ltnews40.pdf) and use `lualatex` instead of `xelatex` as the default PDF engine.
-- ([#12782](https://github.com/quarto-dev/quarto-cli/pull/12782)): fix bug on `safeRemoveDirSync`'s detection of safe directory boundaries.
+- ([#12782](https://github.com/quarto-dev/quarto-cli/pull/12782)): fix bug on `safeRemoveDirSync`'s detection of safe directory boundaries.
+- ([#12853](https://github.com/quarto-dev/quarto-cli/issues/12853)): fix replaceAll() escaping issue with embedded notebooks containing `$` in their Markdown.

package/src/common/update-html-dependencies.ts

@@ -820,63 +820,63 @@ async function updateBootstrapFromBslib(
       for (let line of varContents) {
         line = line.replaceAll(
           "var(--#{$prefix}font-sans-serif)",
-          "$font-family-sans-serif"
+          "$$font-family-sans-serif"
         );
         line = line.replaceAll(
           "var(--#{$prefix}font-monospace)",
-          "$font-family-monospace"
+          "$$font-family-monospace"
         );
         line = line.replaceAll(
           "var(--#{$prefix}success-rgb)",
-          "$success"
+          "$$success"
         );
         line = line.replaceAll(
           "var(--#{$prefix}danger-rgb)",
-          "$danger"
+          "$$danger"
         );
         line = line.replaceAll(
           "var(--#{$prefix}body-color-rgb)",
-          "$body-color"
+          "$$body-color"
         );
         line = line.replaceAll(
           "var(--#{$prefix}body-bg-rgb)",
-          "$body-bg"
+          "$$body-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}emphasis-color-rgb)",
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );
         line = line.replaceAll(
           /RGBA?\(var\(--#\{\$prefix\}emphasis-color-rgb,(.*?)\).*?\)/gm,
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );        
         line = line.replaceAll(
           "var(--#{$prefix}secondary-color)",
-          "$body-secondary-color"
+          "$$body-secondary-color"
         );
         line = line.replaceAll(
           "var(--#{$prefix}secondary-bg)",
-          "$body-secondary-bg"
+          "$$body-secondary-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}tertiary-bg)",
-          "$body-tertiary-bg"
+          "$$body-tertiary-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}tertiary-color)",
           "$body-tertiary-color"
         );
         line = line.replaceAll(
           "var(--#{$prefix}emphasis-bg)",
-          "$body-emphasis-bg"
+          "$$body-emphasis-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}emphasis-color)",
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );
         line = line.replaceAll(
           "$emphasis-color-rgb", 
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );
 
         line = line.replaceAll(/var\(--#\{\$prefix\}(.*?)\)/gm, "$$$1");

src/command/render/render-contexts.ts

@@ -63,16 +63,13 @@ import { ExecutionEngine, ExecutionTarget } from "../../execute/types.ts";
 import {
   deleteProjectMetadata,
   directoryMetadataForInputFile,
-  projectTypeIsWebsite,
   toInputRelativePaths,
 } from "../../project/project-shared.ts";
 import {
   kProjectLibDir,
   kProjectType,
   ProjectContext,
 } from "../../project/types.ts";
-import { isHtmlDashboardOutput, isHtmlOutput } from "../../config/format.ts";
-import { formatHasBootstrap } from "../../format/html/format-html-info.ts";
 import { warnOnce } from "../../core/log.ts";
 import { dirAndStem } from "../../core/path.ts";
 import { fileExecutionEngineAndTarget } from "../../execute/engine.ts";
@@ -298,7 +295,7 @@ export async function renderContexts(
 
     // if this isn't for execute then cleanup context
     if (!forExecute && engine.executeTargetSkipped) {
-      engine.executeTargetSkipped(target, formats[formatKey].format);
+      engine.executeTargetSkipped(target, formats[formatKey].format, project);
     }
   }
   return contexts;

src/command/render/render-files.ts

@@ -200,7 +200,11 @@ export async function renderExecute(
 
         // notify engine that we skipped execute
         if (context.engine.executeTargetSkipped) {
-          context.engine.executeTargetSkipped(context.target, context.format);
+          context.engine.executeTargetSkipped(
+            context.target,
+            context.format,
+            context.project,
+          );
         }
 
         // return results