Merge branch 'main' into fix/issue11750

Author: cscheid

.github/workflows/actions/prevent-rerun/action.yml

@@ -0,0 +1,11 @@
+name: Prevent Workflow Re-run
+description: Fails if the workflow is re-run (github.run_attempt > 1)
+runs:
+  using: "composite"
+  steps:
+    - name: Prevent any re-run
+      if: ${{ github.run_attempt > 1 }}
+      run: |
+        echo "::error::Re-running jobs is not permitted. Please trigger a new build manually at https://github.com/quarto-dev/quarto-cli/actions/workflows/create-release.yml (click 'Run workflow'), or use the GitHub CLI: 'gh workflow run create-release.yml'"
+        exit 1
+      shell: bash

.github/workflows/create-release.yml

@@ -28,13 +28,17 @@ jobs:
       tag_name: v${{ steps.read-version.outputs.version_full }}
       version_commit: ${{ steps.version_commit.outputs.commit_long_sha }}
       pushed: ${{ steps.version_commit.outputs.pushed }}
+      tagged: ${{ steps.version_commit.outputs.tagged }}
       tag_pushed: ${{ steps.version_commit.outputs.tag_pushed }}
     if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'quarto-dev/quarto-cli')
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       # we _also_ need npm, specifically for webui/preview
       - uses: actions/setup-node@v4
         with:
@@ -99,6 +103,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Make Tarball
         run: |
           tar --owner=root --group=root -zcvf  quarto-${{needs.configure.outputs.version}}.tar.gz *
@@ -117,6 +124,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -150,6 +160,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -183,6 +196,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -227,6 +243,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -257,6 +276,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -283,6 +305,15 @@ jobs:
     runs-on: ubuntu-latest
     needs: [configure, make-tarball]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - uses: actions/download-artifact@v4
         with:
           name: Deb Zip
@@ -303,15 +334,17 @@ jobs:
     needs: [configure]
 
     steps:
-      - name: Configure Rust Tools
-        run: |
-          rustup.exe toolchain install 1.63.0 --component rustfmt --component clippy --no-self-update
-          rustup.exe default 1.63.0
-
       - uses: actions/checkout@v4
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
+      - name: Configure Rust Tools
+        run: |
+          rustup.exe toolchain install 1.63.0 --component rustfmt --component clippy --no-self-update
+          rustup.exe default 1.63.0
       - name: Configure
         run: |
           .\configure.cmd
@@ -383,6 +416,15 @@ jobs:
     runs-on: windows-latest
     needs: [configure, make-installer-win]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - uses: actions/download-artifact@v4
         with:
           name: Windows Zip
@@ -403,6 +445,9 @@ jobs:
         with:
           ref: ${{ needs.configure.outputs.version_commit }}
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Configure
         run: |
           ./configure.sh
@@ -464,6 +509,15 @@ jobs:
     runs-on: macos-latest
     needs: [configure, make-installer-mac]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - uses: actions/download-artifact@v4
         with:
           name: Mac Zip
@@ -499,6 +553,16 @@ jobs:
       ]
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.configure.outputs.version_commit }}
+          path: quarto-cli
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        uses: ./quarto-cli/.github/workflows/actions/prevent-rerun
+
       - name: Download Artifacts
         uses: actions/download-artifact@v4
 
@@ -601,6 +665,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Revert commit of version.txt
         if: ${{ needs.configure.outputs.pushed }}
         run: |
@@ -614,7 +681,7 @@ jobs:
           git push origin $GITHUB_REF_NAME
 
       - name: Deleted created tag
-        if: ${{ needs.configure.outputs.tag_pushed }}
+        if: ${{ needs.configure.outputs.tagged && needs.configure.outputs.tag_pushed }}
         run: |
           git push --delete origin ${{ needs.configure.outputs.tag_name }}
 
@@ -623,10 +690,18 @@ jobs:
     runs-on: ubuntu-latest
     needs: [configure, publish-release]
     steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            .github
+
+      - name: Prevent Re-run
+        uses: ./.github/workflows/actions/prevent-rerun
+
       - name: Download Artifacts
         uses: actions/download-artifact@v4
 
-      - uses: quarto-dev/quarto-cli/.github/actions/docker@main
+      - uses: ./.github/actions/docker
         with:
           source: ./Deb Installer/quarto-${{needs.configure.outputs.version}}-linux-amd64.deb
           version: ${{needs.configure.outputs.version}}

.github/workflows/test-smokes.yml

@@ -235,7 +235,7 @@ jobs:
           readarray -t my_array < <(echo '${{ inputs.buckets }}' | jq -rc '.[]')
           for file in "${my_array[@]}"; do 
             echo ">>> ./run-tests.sh ${file}"
-            ./run-tests.sh $file
+            shopt -s globstar && ./run-tests.sh $file
             status=$?
             [ $status -eq 0 ] && echo ">>> No error in this test file" || haserror=1
           done

news/changelog-1.8.md

@@ -20,31 +20,40 @@ All changes included in 1.8:
 - ([#726](https://github.com/quarto-dev/quarto-cli/issues/726)): a11y - Provide `.screen-reader-only` callout type when callout text doesn't naturally include the type.
 - ([#5538](https://github.com/quarto-dev/quarto-cli/issues/5538)): Fix code-copy button style so that scrolling behaves properly.
 - ([#5879](https://github.com/quarto-dev/quarto-cli/issues/5879)): Improve font rendering of `kbd` shortcode on macOS. `kbd` will now also be stricter in converting keyboard shortcuts to macOS icons.
+- ([#8568](https://github.com/quarto-dev/quarto-cli/issues/8568)) Default inline code background color to the code block background color if not specified; foreground color is `$pre-color` in dark mode and (remains) purple in light mode.
 - ([#10983](https://github.com/quarto-dev/quarto-cli/issues/10983)): Fix spacing inconsistency between paras and first section headings.
 - ([#12259](https://github.com/quarto-dev/quarto-cli/issues/12259)): Fix conflict between `html-math-method: katex` and crossref popups (author: @benkeks).
 - ([#12341](https://github.com/quarto-dev/quarto-cli/issues/12341)): Enable light and dark logos for html formats (sidebar, navbar, dashboard).
+- ([#12643](https://github.com/quarto-dev/quarto-cli/issues/12643)): Ensure brand.yml logos using urls are rendered correctly by passing them through when resolving brand `processedData`, and not processing them as paths.
 - ([#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.
 - ([#12981](https://github.com/quarto-dev/quarto-cli/issues/12981)): Brand should be applied in dark mode when dark mode is enabled by the theme, not the brand.
+- ([#13004](https://github.com/quarto-dev/quarto-cli/issues/13004)): Brand logo shortcode automatically applies `.light-content` and `.dark-content` classes, inserts both light and dark logo if brand mode is not specified, and uses alt text from brand logo spec.
 
 ### `revealjs`
 
+- ([#10933](https://github.com/quarto-dev/quarto-cli/issues/10933)): Revealjs supports alt text on logo, as well as customization of light and dark logos at the document level, consistent with other formats.
+- ([#12550](https://github.com/quarto-dev/quarto-cli/issues/12550)): Revealjs supports `brand-mode`, allowing to select either the light or the dark brand.
 - ([#12598](https://github.com/quarto-dev/quarto-cli/pull/12598)): Ensure `.fragment` on an image with caption applies to whole figure.
 - ([#12716](https://github.com/quarto-dev/quarto-cli/issues/12716)): Correctly resolve `"brand"` set in `theme` configuration for document in subdirectory from project root.
+- Use `cdn.jsdelivr.net` for mathjax dependencies to ensure consistent CDN usage across formats. Previously, `cdnjs.cloudflare.com` was used for `revealjs` mathjax dependencies, while `cdn.jsdelivr.net` was used for html format.
 
 ### `docx`
 
 - ([#8392](https://github.com/quarto-dev/quarto-cli/issues/8392)): Fix `docx` generation issues in tables
 
 ### `typst`
 
+- ([#12180](https://github.com/quarto-dev/quarto-cli/issues/12180)): Typst schema / autocomplete for `logo` option has `path` and `alt`.
 - ([#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.
+- ([#13119](https://github.com/quarto-dev/quarto-cli/pull/13119)): Expose `brand.logo` metadata as Typst dictionaries.
+- ([#13133](https://github.com/quarto-dev/quarto-cli/pull/13133)): Allow customization of light and dark logos at document level, consistent with other formats.
 
 ### `beamer`
 
@@ -67,12 +76,15 @@ All changes included in 1.8:
 
 - ([#12615](https://github.com/quarto-dev/quarto-cli/pull/12615)): Adds `algorithm` to theorem environments. (author: @jeremy9959)
 
-## Lua Filters
+## Lua Filters and API
 
+- ([#11750](https://github.com/quarto-dev/quarto-cli/pull/11750)): Extend filter path resolution to support `at`/`path` filters from extensions.
 - ([#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.
-- ([#11750](https://github.com/quarto-dev/quarto-cli/pull/11750)): Extend filter path resolution to support `at`/`path` filters from extensions.
+- ([#13112](https://github.com/quarto-dev/quarto-cli/pull/13112)): Add `quarto.format.format_identifier()` API entry.
+- ([#13128](https://github.com/quarto-dev/quarto-cli/issues/13128)): Avoid meta shortcode crash on bad input.
+- ([#13246](https://github.com/quarto-dev/quarto-cli/pull/13246)): Add `quarto.variables.get()` and `quarto.metadata.get()` APIs.
 
 ## Commands
 
@@ -88,13 +100,19 @@ All changes included in 1.8:
 
 - ([#12965](https://github.com/quarto-dev/quarto-cli/issues/12965)): Prevent automatic opening of new editor sessions when creating projects in Posit Workbench context. The `--open` flag is now ignored in this environment to avoid issues with Workbench session management.
 
+## Extensions
+
+- ([#12559](https://github.com/quarto-dev/quarto-cli/issues/12559)): New extension type: `brand` for distributing [brand.yml](https://posit-dev.github.io/brand-yml/) configurations with associated assets.
+
 ## Engines
 
+- ([#13171](https://github.com/quarto-dev/quarto-cli/pull/13171/)): Provide execution information to all engines uniformly via QUARTO_EXECUTE_INFO environment variable. It points to a file on disk containing a JSON object describing the execution environment for code cells to use.
+
 ### `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.
-- ([#13026](https://github.com/quarto-dev/quarto-cli/pulls/13026)): Use `jsdelivr` CDN for jupyter widgets dependencies.
+- ([#13026](https://github.com/quarto-dev/quarto-cli/pull/13026), [#13151](https://github.com/quarto-dev/quarto-cli/pull/13151)), [#13184](https://github.com/quarto-dev/quarto-cli/pull/13184): Use `jsdelivr` CDN for jupyter widgets dependencies.
 
 ### `knitr`
 
@@ -104,9 +122,21 @@ All changes included in 1.8:
 
 - ([#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.
 
+## Languages
+
+- ([#13098](https://github.com/quarto-dev/quarto-cli/pull/13098)): Fox a minor inappropriate phrasing in the Chinese localization of `environment-proof-title` (@sun123xyz).
+
 ## 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.
 - ([#12853](https://github.com/quarto-dev/quarto-cli/issues/12853)): fix replaceAll() escaping issue with embedded notebooks containing `$` in their Markdown.
 - ([#12939](https://github.com/quarto-dev/quarto-cli/pull/12939)): Upgrade `mermaidjs` to 11.6.0.
+- ([#13031](https://github.com/quarto-dev/quarto-cli/pull/13031)): Add `.quarto_ipynb` files to `.gitignore` by default.
+- ([#13085](https://github.com/quarto-dev/quarto-cli/pull/13085)): Avoid `kbd` shortcode crashes on unknown OS keys.
+- ([#13164](https://github.com/quarto-dev/quarto-cli/pull/13164)): add `julia` to execute schema to allow autocomplete suggestions. (@mcanouil)
+
+
+## Quarto Internals
+
+- ([#13155](https://github.com/quarto-dev/quarto-cli/pull/13155)): Process `pandoc-reader-FORMAT` raw blocks through `pandoc.read(FORMAT)`

src/command/create/artifacts/extension.ts

@@ -41,6 +41,7 @@ const kExtensionTypes: Array<string | ExtensionType> = [
   { name: "journal format", value: "journal", openfiles: ["template.qmd"] },
   { name: "custom format", value: "format", openfiles: ["template.qmd"] },
   { name: "metadata", value: "metadata", openfiles: [] },
+  { name: "brand", value: "brand", openfiles: [] },
 ];
 
 const kExtensionSubtypes: Record<string, string[]> = {

src/command/render/project.ts

@@ -14,7 +14,6 @@ import {
 } from "../../deno_ral/fs.ts";
 import { dirname, isAbsolute, join, relative } from "../../deno_ral/path.ts";
 import { info, warning } from "../../deno_ral/log.ts";
-import { mergeProjectMetadata } from "../../config/metadata.ts";
 
 import * as colors from "fmt/colors";
 
@@ -80,7 +79,6 @@ import { Format } from "../../config/types.ts";
 import { fileExecutionEngine } from "../../execute/engine.ts";
 import { projectContextForDirectory } from "../../project/project-context.ts";
 import { ProjectType } from "../../project/types/types.ts";
-import { Zod } from "../../resources/types/zod/schema-types.ts";
 
 const noMutationValidations = (
   projType: ProjectType,
@@ -242,37 +240,11 @@ const getProjectRenderScripts = async (
   return { preRenderScripts, postRenderScripts };
 };
 
-const mergeExtensionMetadata = async (
-  context: ProjectContext,
-  pOptions: RenderOptions,
-) => {
-  // this will mutate context.config.project to merge
-  // in any project metadata from extensions
-  if (context.config) {
-    const extensions = await pOptions.services.extension.extensions(
-      undefined,
-      context.config,
-      context.isSingleFile ? undefined : context.dir,
-      { builtIn: false },
-    );
-    const projectMetadata = extensions.filter((extension) =>
-      extension.contributes.metadata?.project
-    ).map((extension) => {
-      return Zod.ProjectConfig.parse(extension.contributes.metadata!.project);
-    });
-    context.config.project = mergeProjectMetadata(
-      context.config.project,
-      ...projectMetadata,
-    );
-  }
-};
-
 export async function renderProject(
   context: ProjectContext,
   pOptions: RenderOptions,
   pFiles?: string[],
 ): Promise<RenderResult> {
-  await mergeExtensionMetadata(context, pOptions);
   const { preRenderScripts, postRenderScripts } = await getProjectRenderScripts(
     context,
   );