Skip to content

Commit 006437b

Browse files
committed
squash non-ast v1.3 fixes
1 parent 68f2bf9 commit 006437b

File tree

305 files changed

+6319
-7319
lines changed

Some content is hidden

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

305 files changed

+6319
-7319
lines changed

configuration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
99

1010
# Binary dependencies
11-
export DENO=v1.25.2
11+
export DENO=v1.26.1
1212
export DENO_DOM=v0.1.23-alpha-artifacts
1313
export PANDOC=2.19.2
1414
export DARTSASS=1.32.8

news/changelog-1.3.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
1-
## Article Layout
2-
3-
- Improve the performance of extremely large documents with margin elements by improving the efficiency of positioning the elements.
1+
## Changes
42

53
## HTML Format
64

7-
- Improved handling of margin references that appear within a callout. (#3003)
5+
- Improved handling of margin references that appear within a callout. ([#3003](https://github.com/quarto-dev/quarto-cli/issues/3003))
86
- Add support for customizing the baseline widths of grid columns using yaml or scss. For more information, see [https://www.quarto.org/docs/prerelease/1.3.html](https://www.quarto.org/docs/prerelease/1.3.html).
7+
- Fix wrapping of long `code` entries inside table cells ([#3221](https://github.com/quarto-dev/quarto-cli/issues/3221))
98

109
## Dates
1110

1211
- Properly fall back to language only locale when a supported language-region locale isn't available. (#3059)
1312

13+
## PDF Format
14+
15+
- Fix wrong page number in the TOC for appendices ([#3164](https://github.com/quarto-dev/quarto-cli/issues/3164)) (Thank you, @iusgit!)
16+
17+
## Dates
18+
19+
- Properly fall back to language only locale when a supported language-region locale isn't available. ([#3059](https://github.com/quarto-dev/quarto-cli/issues/3059))
20+
1421
## About Pages
1522

16-
- Add support for `image-alt` which provides alternate text for the about page image. (#3010)
23+
- Add support for `image-alt` which provides alternate text for the about page image. ([#3010](https://github.com/quarto-dev/quarto-cli/issues/3010))
24+
25+
## Article Layout
26+
27+
- Improve the performance of extremely large documents with margin elements by improving the efficiency of positioning the elements.
1728

1829
## Listings
1930

@@ -22,4 +33,6 @@
2233

2334
## Miscellaneous
2435

36+
- Work around pandoc strict checking of `number-offset` type. ([#3126](https://github.com/quarto-dev/quarto-cli/issues/3126))
37+
- Warn instead of crash on bad URI ([#3220](https://github.com/quarto-dev/quarto-cli/issues/3220))
2538
- ensure `video` shortcode works with `embed-resources` and `self-contained` ([#3310](https://github.com/quarto-dev/quarto-cli/issues/3310))
Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
// deno-lint-ignore-file
2-
import * as archive from "https://deno.land/[email protected]/archive/tar.ts";
3-
import * as async from "https://deno.land/[email protected]/async/mod.ts";
4-
import * as bytes from "https://deno.land/[email protected]/bytes/mod.ts";
5-
import * as collections from "https://deno.land/[email protected]/collections/mod.ts";
6-
import * as crypto from "https://deno.land/[email protected]/crypto/mod.ts";
7-
import * as datetime from "https://deno.land/[email protected]/datetime/mod.ts";
8-
import * as encoding_ascii85 from "https://deno.land/[email protected]/encoding/ascii85.ts";
9-
import * as encoding_base32 from "https://deno.land/[email protected]/encoding/base32.ts";
10-
import * as encoding_base64 from "https://deno.land/[email protected]/encoding/base64.ts";
11-
import * as encoding_base64url from "https://deno.land/[email protected]/encoding/base64url.ts";
12-
import * as encoding_binary from "https://deno.land/[email protected]/encoding/binary.ts";
13-
import * as encoding_csv_stringify from "https://deno.land/[email protected]/encoding/csv_stringify.ts";
14-
import * as encoding_csv from "https://deno.land/[email protected]/encoding/csv.ts";
15-
import * as encoding_hex from "https://deno.land/[email protected]/encoding/hex.ts";
16-
import * as encoding_toml from "https://deno.land/[email protected]/encoding/toml.ts";
17-
import * as encoding_yaml from "https://deno.land/[email protected]/encoding/yaml.ts";
18-
import * as flags from "https://deno.land/[email protected]/flags/mod.ts";
19-
import * as fmt_bytes from "https://deno.land/[email protected]/fmt/bytes.ts";
20-
import * as fmt_colors from "https://deno.land/[email protected]/fmt/colors.ts";
21-
import * as fmt_printf from "https://deno.land/[email protected]/fmt/printf.ts";
22-
import * as fs from "https://deno.land/[email protected]/fs/mod.ts";
23-
import * as fs_copy from "https://deno.land/[email protected]/fs/copy.ts";
24-
import * as hash from "https://deno.land/[email protected]/hash/mod.ts";
25-
import * as http from "https://deno.land/[email protected]/http/mod.ts";
26-
import * as io from "https://deno.land/[email protected]/io/mod.ts";
27-
import * as log from "https://deno.land/[email protected]/log/mod.ts";
28-
import * as media_types from "https://deno.land/[email protected]/media_types/mod.ts";
29-
import * as path from "https://deno.land/[email protected]/path/mod.ts";
30-
import * as permissions from "https://deno.land/[email protected]/permissions/mod.ts";
31-
import * as signal from "https://deno.land/[email protected]/signal/mod.ts";
32-
import * as streams from "https://deno.land/[email protected]/streams/mod.ts";
33-
import * as textproto from "https://deno.land/[email protected]/textproto/mod.ts";
34-
import * as uuid from "https://deno.land/[email protected]/uuid/mod.ts";
2+
import * as archive from "https://deno.land/[email protected]/archive/tar.ts";
3+
import * as async from "https://deno.land/[email protected]/async/mod.ts";
4+
import * as bytes from "https://deno.land/[email protected]/bytes/mod.ts";
5+
import * as collections from "https://deno.land/[email protected]/collections/mod.ts";
6+
import * as crypto from "https://deno.land/[email protected]/crypto/mod.ts";
7+
import * as datetime from "https://deno.land/[email protected]/datetime/mod.ts";
8+
import * as encoding_ascii85 from "https://deno.land/[email protected]/encoding/ascii85.ts";
9+
import * as encoding_base32 from "https://deno.land/[email protected]/encoding/base32.ts";
10+
import * as encoding_base64 from "https://deno.land/[email protected]/encoding/base64.ts";
11+
import * as encoding_base64url from "https://deno.land/[email protected]/encoding/base64url.ts";
12+
import * as encoding_binary from "https://deno.land/[email protected]/encoding/binary.ts";
13+
import * as encoding_csv from "https://deno.land/[email protected]/encoding/csv.ts";
14+
import * as encoding_hex from "https://deno.land/[email protected]/encoding/hex.ts";
15+
import * as encoding_toml from "https://deno.land/[email protected]/encoding/toml.ts";
16+
import * as encoding_yaml from "https://deno.land/[email protected]/encoding/yaml.ts";
17+
import * as flags from "https://deno.land/[email protected]/flags/mod.ts";
18+
import * as fmt_bytes from "https://deno.land/[email protected]/fmt/bytes.ts";
19+
import * as fmt_colors from "https://deno.land/[email protected]/fmt/colors.ts";
20+
import * as fmt_printf from "https://deno.land/[email protected]/fmt/printf.ts";
21+
import * as fs from "https://deno.land/[email protected]/fs/mod.ts";
22+
import * as fs_copy from "https://deno.land/[email protected]/fs/copy.ts";
23+
import * as hash from "https://deno.land/[email protected]/hash/mod.ts";
24+
import * as http from "https://deno.land/[email protected]/http/mod.ts";
25+
import * as io from "https://deno.land/[email protected]/io/mod.ts";
26+
import * as log from "https://deno.land/[email protected]/log/mod.ts";
27+
import * as media_types from "https://deno.land/[email protected]/media_types/mod.ts";
28+
import * as path from "https://deno.land/[email protected]/path/mod.ts";
29+
import * as permissions from "https://deno.land/[email protected]/permissions/mod.ts";
30+
import * as signal from "https://deno.land/[email protected]/signal/mod.ts";
31+
import * as streams from "https://deno.land/[email protected]/streams/mod.ts";
32+
import * as textproto from "https://deno.land/[email protected]/textproto/mod.ts";
33+
import * as uuid from "https://deno.land/[email protected]/uuid/mod.ts";

package/scripts/vendoring/vendor.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
#!/bin/bash
22

3-
# Before you run this, make sure that you've edited the quarto source code
4-
# to remove the references to JSON imports, since these currently
5-
# trigger bugs in `deno vendor`.
6-
7-
# The easy way to find these is to search for 'assert: { type: "json" }'
8-
# in VS code:
9-
10-
# src/core/schema/utils.ts:23
11-
# src/core/lib/yaml-intelligence/yaml-intelligence.ts:1175
12-
# src/core/lib/yaml-intelligence/parsing.ts:60
13-
143
source configuration
154

165
# Defaults are set in configuration file, but can be overridden here.

package/src/common/configure.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ export async function configure(
6666
join(config.directoryInfo.bin, "quarto.cmd"),
6767
);
6868
} else {
69+
const out = join(config.directoryInfo.bin, "quarto");
6970
Deno.copyFileSync(
7071
join(config.directoryInfo.pkg, "scripts", "common", "quarto"),
71-
join(config.directoryInfo.bin, "quarto"),
72+
out,
7273
);
74+
Deno.chmodSync(out, 0o755);
7375
}
7476

7577
// record dev config. These are versions as defined in the root configuration file.

package/src/common/prepare-dist.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { buildFilter } from "./package-filters.ts";
1414
import { bundle } from "../util/deno.ts";
1515
import { info } from "log/mod.ts";
1616
import { buildAssets } from "../../../src/command/build-js/cmd.ts";
17-
import { initTreeSitter } from "../../../src/core/lib/yaml-validation/deno-init-tree-sitter.ts";
17+
import { initTreeSitter } from "../../../src/core/schema/deno-init-tree-sitter.ts";
1818

1919
export async function prepareDist(
2020
config: Configuration,
@@ -143,14 +143,9 @@ function inlineFilters(config: Configuration) {
143143
info("Building inlined filters");
144144
const outDir = join(config.directoryInfo.share, "filters");
145145
const filtersToInline: Filter[] = [
146-
{ name: "quarto-init" },
147-
{ name: "authors" },
148-
{ name: "quarto-pre" },
149-
{ name: "crossref" },
150-
{ name: "layout" },
151-
{ name: "quarto-post" },
146+
{ name: "main", dir: "." },
152147
{ name: "pagebreak", dir: "rmarkdown" },
153-
{ name: "quarto-finalize" },
148+
{ name: "customwriter", dir: "customwriter" },
154149
];
155150

156151
filtersToInline.forEach((filter) => {

package/src/util/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { writeAll } from "io/mod.ts";
1+
import { writeAll } from "streams/conversion.ts";
22
import { CmdResult, runCmd } from "./cmd.ts";
33

44
// Read an environment variable

src/command/capabilities/cmd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*/
77

8-
import { writeAllSync } from "io/mod.ts";
8+
import { writeAllSync } from "streams/conversion.ts";
99

1010
import { Command } from "cliffy/command/mod.ts";
1111
import { capabilities } from "./capabilities.ts";

src/command/convert/observable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { info, warning } from "log/mod.ts";
99
import * as colors from "fmt/colors.ts";
1010

1111
import { basename, dirname, join } from "path/mod.ts";
12-
import { writeAll } from "io/mod.ts";
12+
import { writeAll } from "streams/conversion.ts";
1313
import { ensureDirSync } from "fs/mod.ts";
1414
import { pandocAutoIdentifier } from "../../core/pandoc/pandoc-id.ts";
1515

src/command/create/cmd.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const createCommand = new Command()
100100
open?: string | boolean;
101101
},
102102
type?: string,
103-
commands?: string[],
103+
...commands: string[]
104104
) => {
105105
if (options.json) {
106106
await createFromStdin();
@@ -122,7 +122,7 @@ export const createCommand = new Command()
122122
// If we aliased the type, shift the args (including what was
123123
// the type alias in the list of args for the artifact creator
124124
// to resolve)
125-
const args = commands || [];
125+
const args = commands;
126126

127127
const commandOpts = resolvedArtifact.resolveOptions(args);
128128
const createOptions = {

0 commit comments

Comments
 (0)