Merge branch 'main' into fix-katex-crossref-previews

Author: cderv

.air.toml

@@ -0,0 +1,8 @@
+[format]
+line-width = 80
+indent-width = 2
+indent-style = "space"
+line-ending = "auto"
+persistent-line-breaks = true
+exclude = []
+default-exclude = true

.vscode/extensions.json

@@ -3,6 +3,7 @@
     "denoland.vscode-deno",
     "esbenp.prettier-vscode",
     "sumneko.lua",
-    "nvarner.typst-lsp"
+    "nvarner.typst-lsp",
+    "Posit.air-vscode"
   ]
 }

.vscode/settings.json

@@ -3,8 +3,12 @@
     "editor.defaultFormatter": "denoland.vscode-deno"
   },
   "[r]": {
-    "editor.formatOnSave": false,
-    "editor.defaultFormatter": "REditorSupport.r"
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "Posit.air-vscode"
+  },
+  "[quarto]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "quarto.quarto"
   },
   "[html]": {
     "editor.formatOnSave": false
@@ -16,5 +20,7 @@
   "deno.lint": true,
   "deno.unstable": true,
   "deno.importMap": "./src/import_map.json",
-  "deno.disablePaths": ["tests/integration/playwright/"]
+  "deno.disablePaths": ["tests/integration/playwright/"],
+  // opt-out lintr as we use air formatter
+  "r.lsp.diagnostics": false
 }

CITATION.cff

@@ -20,7 +20,7 @@ authors:
   given-names: "Gordon"
   orcid: "https://orcid.org/0009-0005-1809-8936"
 title: "Quarto"
-version: 1.6
+version: 1.7
 doi: 10.5281/zenodo.5960048
-date-released: 2024-11-27
+date-released: 2025-04-28
 url: "https://github.com/quarto-dev/quarto-cli"

configuration

@@ -7,14 +7,17 @@
 # but it also used when packaging (e.g. run configure.sh, then prepare-dist.sh, then package.sh)
 # deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
 
+# NB: When these are updated, you must also update the versions
+# in src/command/check/check.ts
+
 # Binary dependencies
 export DENO=v1.46.3
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.41-alpha-artifacts
-export PANDOC=3.4
-export DARTSASS=1.85.1
-export ESBUILD=0.19.12
-export TYPST=0.11.0
+export PANDOC=3.6.3
+export DARTSASS=1.87.0
+export ESBUILD=0.25.3
+export TYPST=0.13.0
 
 
 # NB: we can't put comments in the same line as export statements because it
@@ -58,7 +61,7 @@ export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3
 
 
 # Quarto Info Version
-export QUARTO_VERSION=1.7
+export QUARTO_VERSION=1.8
 export QUARTO_NAME=Quarto
 
 # Folder names. These are not the same as paths (those variable names end in _PATH).

dev-docs/checklist-make-a-new-quarto-release.md

@@ -2,22 +2,21 @@
 - [ ] create a branch `v1.x`, where x is the version being released
   - `git checkout -b v1.4`
   - `git push origin v1.4`
-- [ ] mark the current release as the stable release in the `main` branch
+- [ ] mark the current release as the new release in the `main` branch
   - [ ] edit QUARTO_VERSION line in `/configuration` to be the new version (e.g. `1.5`)
   - [ ] push the changes to the `main` branch
   - [ ] kick off a v1.5 build in GHA: https://github.com/quarto-dev/quarto-cli/actions/workflows/create-release.yml
     - [ ] ensure the build completes successfully
 - [ ] mark v1.4 release as stable
-  - go to https://github.com/quarto-dev/quarto-cli/releases
-  - find the latest v1.4 release and edit, (eg https://github.com/quarto-dev/quarto-cli/releases/edit/v1.4.549)
-  - at the bottom of the page, there will be two checkboxes, "Set as pre-release" and "Set as latest release":
-    - "Set as pre-release" should be unchecked, and
-    - "Set as latest release" should be checked.
+  - [ ] go to https://github.com/quarto-dev/quarto-cli/releases
+  - [ ] find the latest v1.4 release and edit, (eg https://github.com/quarto-dev/quarto-cli/releases/edit/v1.4.549)
+  - [ ] at the bottom of the page, there will be two checkboxes, "Set as pre-release" and "Set as latest release":
+    - [ ] "Set as pre-release" should be unchecked, and
+    - [ ] "Set as latest release" should be checked.
 - [ ] once the v1.5 build completes, edit the quarto.org website configuration on https://github.com/quarto-dev/quarto-web to reflect the new version
   - this means flipping the profile group configuration in `_quarto.yml` from `[rc,prelease]` to `[prerelease,rc]`
     - [ ] push the changes to the `main` branch
 - [ ] quarto-dev/quarto-web changes
-
   - wait for the downloads file to be automatically updated by the GitHub Action on https://github.com/quarto-dev/quarto-web
     - [ ] wait for https://github.com/quarto-dev/quarto-web/actions/workflows/update-downloads.yml to run (it runs every 15 minutes, or you can manually trigger it)
       - This workflow run rendered the website: https://github.com/quarto-dev/quarto-web/actions/runs/12016407762
@@ -30,20 +29,22 @@
       - [ ] create `docs/prerelease/1.5/{_highlights, index, _pre-release-feature}.qmd` files based on the ones from the previous release
       - [ ] change `docs/prerelease/_highlights.qmd` so its include points to the new version-specific `_highlights.qmd` file (here, 1.5)
       - [ ] change `docs/prerelease/_highlights-release.qmd` so its include points to the new version-specific `_highlights.qmd` file (here, 1.4)
-    - [ ] add the stable version to the older downloads list, like [this example](https://github.com/quarto-dev/quarto-web/commit/85ef62ec5036026d62d57f9cfb190d8b923b2d43)
-      - [ ] run `quarto run tools/release-notes.R` to generate the release notes
+    - [ ] add the stable version to the older downloads list by editing /docs/download/_download-older.yml
+    - [ ] run `quarto run tools/release-notes.R` to generate the release notes
   - [ ] push the changes to `prerelease` branch, ensure they build correctly
-  - [ ] Merge the `prerelease` branch into `main`
+  - [ ] Merge the `prerelease` branch into `main`, push to `main`
     - [ ] ensure the build completes successfully
-  - [ ] Merge `main` into `prerelease`
+  - [ ] Merge `main` into `prerelease`, push to `prerelease`
     - [ ] ensure the build completes successfully
-  - [ ] Create new tag on `main` (here, `v1.5`)
-    - [ ] `git tag -a v1.5 -m "v1.5"`
-    - [ ] `git push origin v1.5`
+  - [ ] Create new tag on `main` with stable release version number (here, `v1.4`) to mark when the new main site version went live
+    - [ ] `git tag -a v1.4 -m "v1.4"`
+    - [ ] `git push origin v1.4`
   - [ ] Update `prerelease` version number (here, `v1.5`)
     - [ ] edit `_quarto-prerelease-docs.yml` to point to the new version
   - [ ] publish the release blog post that should exist in https://github.com/quarto-dev/quarto-web/tree/main/docs/blog/posts
-        by removing the `draft: true` line in the metadata and changing the date to match the release date. Do this on a branch off of `main` to trigger our PR automation to make the corresponding change to `prerelease`.
+    - [ ] Create a branch off of `main` (to trigger our PR automation to make the corresponding change to `prerelease`).
+    - [ ] Removing the `draft: true` line in the metadata 
+    - [ ] Change the date to match the release date. 
 
 - [ ] Update https://github.com/quarto-dev/quarto-cli/blob/main/CITATION.cff
 - [ ] Packaging and package managers, etc
@@ -55,8 +56,8 @@
       - Check the "Whether to publish or not the package on chocolatey" checkbox
     - Wait for @cderv to receive email confirmation, no action needed
   - [ ] pypi
-    - Goto the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
-    - Update `version.txt` to be the version you'd like to publish and commit
+    - Go to the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
+    - [ ] Update `version.txt` to be the version you'd like to publish and commit
     - Go to actions
       - Select 'Publish Quarto PyPi'
       - [ ] Click "Run Workflow"

dev-docs/checklist-make-a-new-stable-quarto-release.md

@@ -15,7 +15,7 @@
     - Select 'Publish Quarto PyPi'
     - [ ] Click "Run Workflow"
       - **Publishing Test**: You may elect to publish to test.pypi first by _unchecking_ the `Production Release` option
-        - Once complete, trest using
+        - Once complete, test using
           ```bash
           python3 -m pip install --index-url https://test.pypi.org/ --extra-index-url https://pypi.org/ quarto-cli
           ```
@@ -24,4 +24,4 @@
       - **Publishing Production**: You may elect to publish to production pypyi by checking the `Production Release` option
         - Published to: <https://pypi.org/project/quarto-cli/>
     - Take a sip of tea ☕, bask in the glory of automation.
-- [ ] Update the stable changelog by moving entries to the "in previous release"
+- [ ] Update the stable changelog by moving entries to the "in previous release". Use "[release checklist]" in the commit message to make it easier to spot if a new release is needed next month.

dev-docs/feature-format-matrix/qmd-files/callout/appearance-minimal.qmd

@@ -0,0 +1,14 @@
+---
+title: Callout with minimal appearance
+format:
+  html: 
+    quality: 1
+---
+
+::: {.callout-note appearance="minimal"}
+
+## Title
+
+{{< lipsum 1 >}}
+
+:::

dev-docs/feature-format-matrix/qmd-files/callout/appearance-simple.qmd

@@ -0,0 +1,14 @@
+---
+title: Callout with simple appearance
+format:
+  html: 
+    quality: 1
+---
+
+::: {.callout-note appearance="simple"}
+
+## Title
+
+{{< lipsum 1 >}}
+
+:::

dev-docs/feature-format-matrix/qmd-files/callout/collapse.qmd

@@ -0,0 +1,29 @@
+---
+title: Callouts
+format:
+  html: 
+    quality: 2
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - 
+          - "div.callout-header.collapsed ~ div#callout-1.collapse"
+          - "div.callout-header:not(.collapsed) ~ div#callout-2.collapse.show"
+---
+
+::: {.callout-note collapse="true"}
+
+## A small note
+
+You should note that this is a note.
+
+:::
+
+::: {.callout-note collapse="false"}
+
+## A small note
+
+You should note that this is a note.
+
+:::