Skip to content

Commit 93cd278

Browse files
authored
Merge branch 'main' into fix/mono-color-options
2 parents 51312a9 + b5af774 commit 93cd278

File tree

399 files changed

+25125
-5012
lines changed

Some content is hidden

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

399 files changed

+25125
-5012
lines changed

.air.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[format]
2+
line-width = 80
3+
indent-width = 2
4+
indent-style = "space"
5+
line-ending = "auto"
6+
persistent-line-breaks = true
7+
exclude = []
8+
default-exclude = true

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"denoland.vscode-deno",
44
"esbenp.prettier-vscode",
55
"sumneko.lua",
6-
"nvarner.typst-lsp"
6+
"nvarner.typst-lsp",
7+
"Posit.air-vscode"
78
]
89
}

.vscode/settings.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
"editor.defaultFormatter": "denoland.vscode-deno"
44
},
55
"[r]": {
6-
"editor.formatOnSave": false,
7-
"editor.defaultFormatter": "REditorSupport.r"
6+
"editor.formatOnSave": true,
7+
"editor.defaultFormatter": "Posit.air-vscode"
8+
},
9+
"[quarto]": {
10+
"editor.formatOnSave": true,
11+
"editor.defaultFormatter": "quarto.quarto"
812
},
913
"[html]": {
1014
"editor.formatOnSave": false
@@ -16,5 +20,7 @@
1620
"deno.lint": true,
1721
"deno.unstable": true,
1822
"deno.importMap": "./src/import_map.json",
19-
"deno.disablePaths": ["tests/integration/playwright/"]
23+
"deno.disablePaths": ["tests/integration/playwright/"],
24+
// opt-out lintr as we use air formatter
25+
"r.lsp.diagnostics": false
2026
}

configuration

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
# but it also used when packaging (e.g. run configure.sh, then prepare-dist.sh, then package.sh)
88
# deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
99

10+
# NB: When these are updated, you must also update the versions
11+
# in src/command/check/check.ts
12+
1013
# Binary dependencies
1114
export DENO=v1.46.3
1215
# TODO figure out where 0.1.41 apple silicon libs are available
1316
export DENO_DOM=v0.1.41-alpha-artifacts
14-
export PANDOC=3.4
15-
export DARTSASS=1.70.0
17+
export PANDOC=3.6.3
18+
export DARTSASS=1.85.1
1619
export ESBUILD=0.19.12
17-
export TYPST=0.11.0
20+
export TYPST=0.13.0
1821

1922

2023
# NB: we can't put comments in the same line as export statements because it

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- Select 'Publish Quarto PyPi'
1616
- [ ] Click "Run Workflow"
1717
- **Publishing Test**: You may elect to publish to test.pypi first by _unchecking_ the `Production Release` option
18-
- Once complete, trest using
18+
- Once complete, test using
1919
```bash
2020
python3 -m pip install --index-url https://test.pypi.org/ --extra-index-url https://pypi.org/ quarto-cli
2121
```
@@ -24,4 +24,4 @@
2424
- **Publishing Production**: You may elect to publish to production pypyi by checking the `Production Release` option
2525
- Published to: <https://pypi.org/project/quarto-cli/>
2626
- Take a sip of tea ☕, bask in the glory of automation.
27-
- [ ] Update the stable changelog by moving entries to the "in previous release"
27+
- [ ] 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/css-properties/font-size/document.qmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ _quarto:
1919
typst:
2020
ensureTypstFileRegexMatches:
2121
-
22-
- 'align\(center\)\[#set text\(size: 6pt\); #table\('
22+
- '#\[\s*#set text\(size: 6pt\); #table\('
2323
- []
2424
---
2525

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
- `QUARTO_PROJECT_ROOT` points to the root of the project, or the directory of the file is not in project mode
22
- `QUARTO_DOCUMENT_PATH` points to the directory of the document being rendered
3+
- `QUARTO_DOCUMENT_FILE` points to the source filename of the document being rendered
34
- `QUARTO_PROFILE` is set to profile used, e.g `QUARTO_PROFILE=advanced,production` for `quarto render --profile advanced,production`

dev-docs/upgrade-dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Change version numbers in `./configuration` to correspond to new versions.
22

3-
Contact JJ so he uploads the binaries to the S3 bucket.
3+
Contact Carlos so he uploads the binaries to the S3 bucket.
44

55
## Upgrade deno
66

news/changelog-1.7.md

Lines changed: 106 additions & 34 deletions
Large diffs are not rendered by default.

package/src/common/dependencies/esbuild.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export function esBuild(version: string): Dependency {
6767
};
6868

6969
return {
70-
name: "esbuild javscript bundler",
70+
name: "esbuild javascript bundler",
7171
bucket: "esbuild",
7272
version,
7373
architectureDependencies: {

0 commit comments

Comments
 (0)