Skip to content

Commit f320f5f

Browse files
committed
Merge branch 'main' into bugfix/no-env-set-past-startup
2 parents 71bf433 + e426fbc commit f320f5f

File tree

131 files changed

+9285
-4530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+9285
-4530
lines changed

.github/DISCUSSION_TEMPLATE/feature-requests.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7+
Welcome to the Quarto CLI GitHub repository!
8+
We are always happy to hear feedback from our users.
9+
10+
This is the repository for the command-line program `quarto`:
11+
12+
- If you're reporting an issue with the **Visual Editor** or with the **Visual Studio Code / Positron extension**, please visit https://github.com/quarto-dev/quarto
13+
- If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
14+
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
15+
- If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
16+
717
First, please check [Quarto Issues](https://github.com/quarto-dev/quarto-cli/issues) and [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests) to see if your feature request has already been discussed.
818
If it has, please consider adding a comment to the existing discussion instead of creating a new one.
919

.github/DISCUSSION_TEMPLATE/q-a.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@ body:
33
- type: markdown
44
attributes:
55
value: |
6-
First, please check [Quarto Issues](https://github.com/quarto-dev/quarto-cli/issues) and [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a) first to see if your question has already been asked.
6+
Welcome to the Quarto CLI GitHub repository!
7+
We are always happy to hear feedback from our users.
8+
9+
This is the repository for the command-line program `quarto`:
10+
11+
- If you're reporting an issue with the **Visual Editor** or with the **Visual Studio Code / Positron extension**, please visit https://github.com/quarto-dev/quarto
12+
- If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
13+
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
14+
- If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
15+
16+
First, please check [Quarto Issues](https://github.com/quarto-dev/quarto-cli/issues) and [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a) to see if your question has already been asked.
717
If it has, please consider adding a comment to the existing discussion instead of creating a new one.
818
919
After checking, if you are not sure if your question has already been asked, please create a new discussion.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ body:
1111
1212
This is the repository for the command-line program `quarto`:
1313
14-
- If you're reporting an issue with the VS Code extension, please visit https://github.com/quarto-dev/quarto
15-
- If you're reporting an issue inside RStudio, please visit https://github.com/rstudio/rstudio
14+
- If you're reporting an issue with the **Visual Editor** or with the **Visual Studio Code / Positron extension**, please visit https://github.com/quarto-dev/quarto
15+
- If you're reporting an issue inside **RStudio**, please visit https://github.com/rstudio/rstudio
1616
- If you're reporting an issue inside **Positron**, please visit https://github.com/posit-dev/positron
1717
- If you want to ask for a feature, please use the [Feature Requests GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/feature-requests).
1818
- If you want to ask for help, please use the [Q&A GitHub Discussions](https://github.com/quarto-dev/quarto-cli/discussions/categories/q-a).
@@ -53,6 +53,14 @@ body:
5353
The end.
5454
````
5555
56+
- type: checkboxes
57+
attributes:
58+
label: "I have:"
59+
options:
60+
- label: searched the issue tracker for similar issues
61+
- label: installed the latest version of [Quarto CLI](https://github.com/quarto-dev/quarto-cli/releases/latest)
62+
- label: formatted my issue following the [Bug Reports guide](https://quarto.org/bug-reports.html)
63+
5664
- type: textarea
5765
attributes:
5866
label: Bug description

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set up R
4848
uses: r-lib/actions/setup-r@v2
4949
with:
50-
r-version: "4.4.2"
50+
r-version: "4.5.0"
5151
use-public-rspm: true
5252
# required to avoid rtools bin in path
5353
windows-path-include-rtools: false

.github/workflows/test-smokes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Set up R
6969
uses: r-lib/actions/setup-r@v2
7070
with:
71-
r-version: "4.4.2"
71+
r-version: "4.5.0"
7272
use-public-rspm: true
7373
# required to avoid rtools bin in path
7474
windows-path-include-rtools: false

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"name": "Launch Deno",
99
"request": "launch",
1010
"type": "node",
11-
"program": "${workspaceFolder}/src/quarto.ts",
1211
"args": ["serve"],
1312
"cwd": "${workspaceFolder}/../quarto-demo",
1413
"runtimeExecutable": "${workspaceFolder}/package/dist/bin/tools/deno",
@@ -19,7 +18,8 @@
1918
"--importmap=${workspaceFolder}/src/import_map.json",
2019
"--inspect-brk",
2120
"--allow-all",
22-
"--v8-flags=--enable-experimental-regexp-engine,--max-old-space-size=8192,--max-heap-size=8192"
21+
"--v8-flags=--enable-experimental-regexp-engine,--max-old-space-size=8192,--max-heap-size=8192",
22+
"${workspaceFolder}/src/quarto.ts"
2323
],
2424
"env": {
2525
"QUARTO_BIN_PATH": "${workspaceFolder}/package/dist/bin",

configuration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export DATATABLES_CONFIG=bs5/jszip-3.10.1/dt-1.13.8/b-2.4.2/b-html5-2.4.2/b-prin
5454
export PDF_MAKE=0.2.7
5555

5656
# javascript search dependencies
57-
export AUTOCOMPLETE_JS=1.11.1
57+
export AUTOCOMPLETE_JS=1.19.1
5858
export FUSE_JS=6.6.2
5959
export ALGOLIA_SEARCH_JS=4.5.1
6060
export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3

news/changelog-1.8.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ All changes included in 1.8:
1010

1111
### `html`
1212

13+
- ([#678](https://github.com/quarto-dev/quarto-cli/issues/678)): a11y - Provide appropriate `aria-label` to search button.
14+
- ([#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.
15+
- ([#5538](https://github.com/quarto-dev/quarto-cli/issues/5538)): Fix code-copy button style so that scrolling behaves properly.
16+
- ([#10983](https://github.com/quarto-dev/quarto-cli/issues/10983)): Fix spacing inconsistency between paras and first section headings.
1317
- ([#12259](https://github.com/quarto-dev/quarto-cli/issues/12259)): Fix conflict between `html-math-method: katex` and crossref popups (author: @benkeks).
18+
- ([#12734](https://github.com/quarto-dev/quarto-cli/issues/12734)): `highlight-style` now correctly supports setting a different `light` and `dark`.
19+
- ([#12747](https://github.com/quarto-dev/quarto-cli/issues/12747)): Ensure `th` elements are properly restored when Quarto's HTML table processing is happening.
20+
- ([#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)
1421

1522
### `revealjs`
1623

@@ -23,6 +30,12 @@ All changes included in 1.8:
2330
### `typst`
2431

2532
- ([#12554](https://github.com/quarto-dev/quarto-cli/pull/12554)): CSS properties `font-weight` and `font-style` are translated to Typst `text` properties.
33+
- ([#12695](https://github.com/quarto-dev/quarto-cli/issues/12695)): Resolve Typst `font-paths` that start with `/` relative to project root.
34+
- ([#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.
35+
36+
### `beamer`
37+
38+
- ([#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.
2639

2740
## Projects
2841

@@ -35,3 +48,18 @@ All changes included in 1.8:
3548
## Crossrefs
3649

3750
- ([#12615](https://github.com/quarto-dev/quarto-cli/pull/12615)): Adds `algorithm` to theorem environments. (author: @jeremy9959)
51+
52+
## Lua Filters
53+
54+
- ([#12727](https://github.com/quarto-dev/quarto-cli/issues/12727)): Do not crash in the presence of malformed tabset contents.
55+
56+
## Commands
57+
58+
### `inspect`
59+
60+
- ([#12733](https://github.com/quarto-dev/quarto-cli/issues/12733)): Add installed extensions to `quarto inspect` project report.
61+
62+
## Other fixes and improvements
63+
64+
- ([#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.
65+
- ([#12782](https://github.com/quarto-dev/quarto-cli/pull/12782)): fix bug on `safeRemoveDirSync`'s detection of safe directory boundaries.

src/command/dev-call/cmd.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Command } from "cliffy/command/mod.ts";
22
import { quartoConfig } from "../../core/quarto.ts";
33
import { commands } from "../command.ts";
44
import { buildJsCommand } from "./build-artifacts/cmd.ts";
5-
import { hidden } from "../../core/lib/external/colors.ts";
5+
import { validateYamlCommand } from "./validate-yaml/cmd.ts";
6+
import { showAstTraceCommand } from "./show-ast-trace/cmd.ts";
67

78
type CommandOptionInfo = {
89
name: string;
@@ -70,4 +71,6 @@ export const devCallCommand = new Command()
7071
Deno.exit(1);
7172
})
7273
.command("cli-info", generateCliInfoCommand)
73-
.command("build-artifacts", buildJsCommand);
74+
.command("validate-yaml", validateYamlCommand)
75+
.command("build-artifacts", buildJsCommand)
76+
.command("show-ast-trace", showAstTraceCommand);
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
/*
2+
* cmd.ts
3+
*
4+
* Copyright (C) 2025 Posit Software, PBC
5+
*/
6+
7+
import { Command } from "cliffy/command/mod.ts";
8+
import { quartoCacheDir } from "../../../core/appdirs.ts";
9+
import { quartoConfig } from "../../../core/quarto.ts";
10+
import {
11+
ensureDir,
12+
moveSync,
13+
safeRemoveDirSync,
14+
} from "../../../deno_ral/fs.ts";
15+
import { basename, dirname, join } from "../../../deno_ral/path.ts";
16+
import { copy } from "fs/copy";
17+
import { resourcePath } from "../../../core/resources.ts";
18+
import { execProcess } from "../../../core/process.ts";
19+
20+
const ensureTracingToolsCopied = async () => {
21+
const cacheDir = quartoCacheDir();
22+
const tracingDir = `${cacheDir}/ast-tracing`;
23+
await ensureDir(tracingDir);
24+
safeRemoveDirSync(join(tracingDir, "qmd"), cacheDir);
25+
await copy(
26+
resourcePath(join("tools", "ast-tracing")),
27+
join(tracingDir, "qmd"),
28+
);
29+
return join(tracingDir, "qmd");
30+
};
31+
32+
export const showAstTraceCommand = new Command()
33+
.name("show-ast-trace")
34+
.hidden()
35+
.arguments("<arguments...>")
36+
.description(
37+
"Renders the document with AST tracing enabled and then shows the debugging output.\n\n",
38+
)
39+
.action(async (_options: unknown, input: string, ...args: string[]) => {
40+
const toolsPath = await ensureTracingToolsCopied();
41+
42+
const dir = dirname(input);
43+
const base = basename(input, ".qmd");
44+
const traceName = join(dir, `${base}-quarto-ast-trace.json`);
45+
46+
const renderOpts = {
47+
cmd: "quarto",
48+
env: {
49+
"QUARTO_TRACE_FILTERS": traceName,
50+
},
51+
args: [
52+
"render",
53+
input,
54+
...args,
55+
"--quiet",
56+
],
57+
};
58+
const _renderResult = await execProcess(renderOpts);
59+
// we don't check for errors here because we want to show the trace even if
60+
// the render fails
61+
62+
moveSync(traceName, join(toolsPath, basename(traceName)));
63+
64+
const _previewResult = await execProcess({
65+
cmd: "quarto",
66+
cwd: toolsPath,
67+
args: [
68+
"preview",
69+
"trace-viewer.qmd",
70+
"-M",
71+
`trace_1:${basename(traceName)}`,
72+
],
73+
});
74+
});

0 commit comments

Comments
 (0)