Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2023-11 dependency refresh #7419

Merged
merged 18 commits into from
Nov 8, 2023
Merged

2023-11 dependency refresh #7419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
58ee92a
version refresh: deno -> 1.37.2, pandoc -> 3.1.9, deno_std -> 0.204.0
cscheid Oct 29, 2023
b6edcc3
fix path
cscheid Oct 29, 2023
db8036c
revert deno_dom until i find the right binaries
cscheid Oct 29, 2023
2accdb0
Merge branch 'main' into feature/2023-11-dependency-refresh
cscheid Oct 30, 2023
6fbba05
update lock
cscheid Oct 30, 2023
9247b67
update to pandoc 3.1.9 typst output
cscheid Oct 30, 2023
252fce8
put comment in own line because of windows
cscheid Oct 30, 2023
37140ac
put comment in own line because of windows
cscheid Oct 30, 2023
48b8d61
Merge branch 'main' into feature/2023-11-dependency-refresh
cscheid Nov 1, 2023
87ed929
typst 0.9.0
cscheid Nov 1, 2023
f04ca43
quarto-ojs-runtime bump
cscheid Nov 4, 2023
6dac94b
merge
cscheid Nov 4, 2023
f5ed680
Merge branch 'main' into feature/2023-11-dependency-refresh
cscheid Nov 7, 2023
cdc32eb
run update-pandoc script
jjallaire Nov 7, 2023
1a2af10
List known kernels found by Quarto in the error message when a specif…
cderv Nov 8, 2023
beb6de7
avoid combineFilters type mismatch by early exiting
cscheid Nov 8, 2023
930952b
scaffold in-filter markdown parsing to work well in combineFilters
cscheid Nov 8, 2023
acb9d80
use Blocks instead of List for better type information
cscheid Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 16 additions & 6 deletions configuration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,26 @@
# deno_dom should match release at https://github.com/b-fuze/deno-dom/releases

# Binary dependencies
export DENO=v1.33.4
export DENO=v1.37.2
# TODO figure out where 0.1.41 apple silicon libs are available
export DENO_DOM=v0.1.35-alpha-artifacts
export PANDOC=3.1.8
export DARTSASS=1.55.0
export ESBUILD=0.18.15
export TYPST=0.8.0
export PANDOC=3.1.9
export DARTSASS=1.69.5
export ESBUILD=0.19.5
export TYPST=0.9.0


# NB: we can't put comments in the same line as export statements because it
# messes up our windows setup

# Bootstrap dependencies from bslib
# (use commit hash from bslib repo)
export BOOTSTRAP=ad946cafdbf1c91cfd714cb39948bb203ae66e66 # 0.5.1 + consolidated components

# 0.5.1 + consolidated components
export BOOTSTRAP=ad946cafdbf1c91cfd714cb39948bb203ae66e66
# NOTE: HTML TOOLS has a manually committed fill.css file which will be officially
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This note is stale and can be removed (probably slipped in via a merge as it was true for about a day or so ;-) ).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that was my bad merge. Thanks!

# released in htmltools 0.5.7

export HTMLTOOLS=0.5.7
export BOOTSTRAP_FONT=1.11.1
export BOOTSWATCH=5.3.1
Expand Down
1 change: 1 addition & 0 deletions news/changelog-1.4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
- Support for `plotly-connected` option to determine where Plotly is embedded or loaded from CDN
- Reduce default margins for Plotly figures (t=30,r=0,b=0,l=0)
- Restart kernel daemon when non-package Python modules change
- ([#7512](https://github.com/quarto-dev/quarto-cli/issues/7512): Improved error message listing known kernels, when a kernel set with `jupyter` key in YAML is not found.

## Knitr

Expand Down
180 changes: 90 additions & 90 deletions package/scripts/deno_std/deno_std.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,104 +39,104 @@ import * as textproto from "https://deno.land/[email protected]/textproto/mod.ts";
import * as uuid from "https://deno.land/[email protected]/uuid/mod.ts";
*/

import * as tar from "https://deno.land/std@0.185.0/archive/tar.ts";
import * as async from "https://deno.land/std@0.185.0/async/mod.ts";
import * as bytes from "https://deno.land/std@0.185.0/bytes/mod.ts";
import * as collections from "https://deno.land/std@0.185.0/collections/mod.ts";
import * as crypto from "https://deno.land/std@0.185.0/crypto/mod.ts";
import * as datetime from "https://deno.land/std@0.185.0/datetime/mod.ts";
import * as dotenv from "https://deno.land/std@0.185.0/dotenv/mod.ts";
import * as tar from "https://deno.land/std@0.204.0/archive/tar.ts";
import * as async from "https://deno.land/std@0.204.0/async/mod.ts";
import * as bytes from "https://deno.land/std@0.204.0/bytes/mod.ts";
import * as collections from "https://deno.land/std@0.204.0/collections/mod.ts";
import * as crypto from "https://deno.land/std@0.204.0/crypto/mod.ts";
import * as datetime from "https://deno.land/std@0.204.0/datetime/mod.ts";
import * as dotenv from "https://deno.land/std@0.204.0/dotenv/mod.ts";

// encoding has no mod.ts
import * as ascii85 from "https://deno.land/std@0.185.0/encoding/ascii85.ts";
import * as base32 from "https://deno.land/std@0.185.0/encoding/base32.ts";
import * as base58 from "https://deno.land/std@0.185.0/encoding/base58.ts";
import * as base64 from "https://deno.land/std@0.185.0/encoding/base64.ts";
import * as base64url from "https://deno.land/std@0.185.0/encoding/base64url.ts";
import * as binary from "https://deno.land/std@0.185.0/encoding/binary.ts";
import * as csv from "https://deno.land/std@0.185.0/csv/mod.ts";
import * as front_matter from "https://deno.land/std@0.185.0/front_matter/mod.ts";
import * as hex from "https://deno.land/std@0.185.0/encoding/hex.ts";
import * as jsonc from "https://deno.land/std@0.185.0/jsonc/mod.ts";
import * as toml from "https://deno.land/std@0.185.0/toml/mod.ts";
import * as varint from "https://deno.land/std@0.185.0/encoding/varint.ts";
import * as yaml from "https://deno.land/std@0.185.0/yaml/mod.ts";
import * as ascii85 from "https://deno.land/std@0.204.0/encoding/ascii85.ts";
import * as base32 from "https://deno.land/std@0.204.0/encoding/base32.ts";
import * as base58 from "https://deno.land/std@0.204.0/encoding/base58.ts";
import * as base64 from "https://deno.land/std@0.204.0/encoding/base64.ts";
import * as base64url from "https://deno.land/std@0.204.0/encoding/base64url.ts";
import * as binary from "https://deno.land/std@0.204.0/encoding/binary.ts";
import * as csv from "https://deno.land/std@0.204.0/csv/mod.ts";
import * as front_matter from "https://deno.land/std@0.204.0/front_matter/mod.ts";
import * as hex from "https://deno.land/std@0.204.0/encoding/hex.ts";
import * as jsonc from "https://deno.land/std@0.204.0/jsonc/mod.ts";
import * as toml from "https://deno.land/std@0.204.0/toml/mod.ts";
import * as varint from "https://deno.land/std@0.204.0/encoding/varint.ts";
import * as yaml from "https://deno.land/std@0.204.0/yaml/mod.ts";

import * as flags from "https://deno.land/std@0.185.0/flags/mod.ts";
import * as fmt_bytes from "https://deno.land/std@0.185.0/fmt/bytes.ts";
import * as fmt_colors from "https://deno.land/std@0.185.0/fmt/colors.ts";
import * as fmt_printf from "https://deno.land/std@0.185.0/fmt/printf.ts";
import * as fs from "https://deno.land/std@0.185.0/fs/mod.ts";
import * as http from "https://deno.land/std@0.185.0/http/mod.ts";
import * as io from "https://deno.land/std@0.185.0/io/mod.ts";
import * as log from "https://deno.land/std@0.185.0/log/mod.ts";
import * as mediaTypes from "https://deno.land/std@0.185.0/media_types/mod.ts";
import * as path from "https://deno.land/std@0.185.0/path/mod.ts";
import * as permissions from "https://deno.land/std@0.185.0/permissions/mod.ts";
import * as semver from "https://deno.land/std@0.185.0/semver/mod.ts";
import * as signal from "https://deno.land/std@0.185.0/signal/mod.ts";
import * as streams from "https://deno.land/std@0.185.0/streams/mod.ts";
import * as uuid from "https://deno.land/std@0.185.0/uuid/mod.ts";
import * as version from "https://deno.land/std@0.185.0/version.ts";
import * as flags from "https://deno.land/std@0.204.0/flags/mod.ts";
import * as fmt_bytes from "https://deno.land/std@0.204.0/fmt/bytes.ts";
import * as fmt_colors from "https://deno.land/std@0.204.0/fmt/colors.ts";
import * as fmt_printf from "https://deno.land/std@0.204.0/fmt/printf.ts";
import * as fs from "https://deno.land/std@0.204.0/fs/mod.ts";
import * as http from "https://deno.land/std@0.204.0/http/mod.ts";
import * as io from "https://deno.land/std@0.204.0/io/mod.ts";
import * as log from "https://deno.land/std@0.204.0/log/mod.ts";
import * as mediaTypes from "https://deno.land/std@0.204.0/media_types/mod.ts";
import * as path from "https://deno.land/std@0.204.0/path/mod.ts";
import * as permissions from "https://deno.land/std@0.204.0/permissions/mod.ts";
import * as semver from "https://deno.land/std@0.204.0/semver/mod.ts";
import * as signal from "https://deno.land/std@0.204.0/signal/mod.ts";
import * as streams from "https://deno.land/std@0.204.0/streams/mod.ts";
import * as uuid from "https://deno.land/std@0.204.0/uuid/mod.ts";
import * as version from "https://deno.land/std@0.204.0/version.ts";

/*

These would be useful imports to add, but they increase the
size of the download cache significantly, so we're skipping
them until they are needed.

import "https://deno.land/std@0.185.0/node/assert/strict.ts";
import "https://deno.land/std@0.185.0/node/dns/promises.ts";
import "https://deno.land/std@0.185.0/node/fs/promises.ts";
import "https://deno.land/std@0.185.0/node/path/mod.ts";
import "https://deno.land/std@0.185.0/node/readline/promises.ts";
import "https://deno.land/std@0.185.0/node/stream/web.ts";
import "https://deno.land/std@0.185.0/node/timers/promises.ts";
import "https://deno.land/std@0.185.0/node/util/types.ts";
import "https://deno.land/std@0.185.0/node/assert.ts";
import "https://deno.land/std@0.185.0/node/assertion_error.ts";
import "https://deno.land/std@0.185.0/node/async_hooks.ts";
import "https://deno.land/std@0.185.0/node/async_hooks.ts";
import "https://deno.land/std@0.185.0/node/buffer.ts";
import "https://deno.land/std@0.185.0/node/child_process.ts";
import "https://deno.land/std@0.185.0/node/cluster.ts";
import "https://deno.land/std@0.185.0/node/console.ts";
import "https://deno.land/std@0.185.0/node/constants.ts";
import "https://deno.land/std@0.185.0/node/crypto.ts";
import "https://deno.land/std@0.185.0/node/dgram.ts";
import "https://deno.land/std@0.185.0/node/diagnostics_channel.ts";
import "https://deno.land/std@0.185.0/node/dns.ts";
import "https://deno.land/std@0.185.0/node/domain.ts";
import "https://deno.land/std@0.185.0/node/events.ts";
import "https://deno.land/std@0.185.0/node/fs.ts";
import "https://deno.land/std@0.185.0/node/http.ts";
import "https://deno.land/std@0.185.0/node/http2.ts";
import "https://deno.land/std@0.185.0/node/https.ts";
import "https://deno.land/std@0.185.0/node/inspector.ts";
import "https://deno.land/std@0.185.0/node/module_all.ts";
import "https://deno.land/std@0.185.0/node/module_esm.ts";
import "https://deno.land/std@0.185.0/node/module.ts";
import "https://deno.land/std@0.185.0/node/net.ts";
import "https://deno.land/std@0.185.0/node/os.ts";
import "https://deno.land/std@0.185.0/node/path.ts";
import "https://deno.land/std@0.185.0/node/perf_hooks.ts";
import "https://deno.land/std@0.185.0/node/process.ts";
import "https://deno.land/std@0.185.0/node/punycode.ts";
import "https://deno.land/std@0.185.0/node/querystring.ts";
import "https://deno.land/std@0.185.0/node/readline.ts";
import "https://deno.land/std@0.185.0/node/repl.ts";
import "https://deno.land/std@0.185.0/node/stream.ts";
import "https://deno.land/std@0.185.0/node/string_decoder.ts";
import "https://deno.land/std@0.185.0/node/sys.ts";
import "https://deno.land/std@0.185.0/node/timers.ts";
import "https://deno.land/std@0.185.0/node/tls.ts";
import "https://deno.land/std@0.185.0/node/tty.ts";
import "https://deno.land/std@0.185.0/node/upstream_modules.ts";
import "https://deno.land/std@0.185.0/node/url.ts";
import "https://deno.land/std@0.185.0/node/util.ts";
import "https://deno.land/std@0.185.0/node/v8.ts";
import "https://deno.land/std@0.185.0/node/vm.ts";
import "https://deno.land/std@0.185.0/node/wasi.ts";
import "https://deno.land/std@0.185.0/node/worker_threads.ts";
import "https://deno.land/std@0.185.0/node/zlib.ts";
import "https://deno.land/std@0.204.0/node/assert/strict.ts";
import "https://deno.land/std@0.204.0/node/dns/promises.ts";
import "https://deno.land/std@0.204.0/node/fs/promises.ts";
import "https://deno.land/std@0.204.0/node/path/mod.ts";
import "https://deno.land/std@0.204.0/node/readline/promises.ts";
import "https://deno.land/std@0.204.0/node/stream/web.ts";
import "https://deno.land/std@0.204.0/node/timers/promises.ts";
import "https://deno.land/std@0.204.0/node/util/types.ts";
import "https://deno.land/std@0.204.0/node/assert.ts";
import "https://deno.land/std@0.204.0/node/assertion_error.ts";
import "https://deno.land/std@0.204.0/node/async_hooks.ts";
import "https://deno.land/std@0.204.0/node/async_hooks.ts";
import "https://deno.land/std@0.204.0/node/buffer.ts";
import "https://deno.land/std@0.204.0/node/child_process.ts";
import "https://deno.land/std@0.204.0/node/cluster.ts";
import "https://deno.land/std@0.204.0/node/console.ts";
import "https://deno.land/std@0.204.0/node/constants.ts";
import "https://deno.land/std@0.204.0/node/crypto.ts";
import "https://deno.land/std@0.204.0/node/dgram.ts";
import "https://deno.land/std@0.204.0/node/diagnostics_channel.ts";
import "https://deno.land/std@0.204.0/node/dns.ts";
import "https://deno.land/std@0.204.0/node/domain.ts";
import "https://deno.land/std@0.204.0/node/events.ts";
import "https://deno.land/std@0.204.0/node/fs.ts";
import "https://deno.land/std@0.204.0/node/http.ts";
import "https://deno.land/std@0.204.0/node/http2.ts";
import "https://deno.land/std@0.204.0/node/https.ts";
import "https://deno.land/std@0.204.0/node/inspector.ts";
import "https://deno.land/std@0.204.0/node/module_all.ts";
import "https://deno.land/std@0.204.0/node/module_esm.ts";
import "https://deno.land/std@0.204.0/node/module.ts";
import "https://deno.land/std@0.204.0/node/net.ts";
import "https://deno.land/std@0.204.0/node/os.ts";
import "https://deno.land/std@0.204.0/node/path.ts";
import "https://deno.land/std@0.204.0/node/perf_hooks.ts";
import "https://deno.land/std@0.204.0/node/process.ts";
import "https://deno.land/std@0.204.0/node/punycode.ts";
import "https://deno.land/std@0.204.0/node/querystring.ts";
import "https://deno.land/std@0.204.0/node/readline.ts";
import "https://deno.land/std@0.204.0/node/repl.ts";
import "https://deno.land/std@0.204.0/node/stream.ts";
import "https://deno.land/std@0.204.0/node/string_decoder.ts";
import "https://deno.land/std@0.204.0/node/sys.ts";
import "https://deno.land/std@0.204.0/node/timers.ts";
import "https://deno.land/std@0.204.0/node/tls.ts";
import "https://deno.land/std@0.204.0/node/tty.ts";
import "https://deno.land/std@0.204.0/node/upstream_modules.ts";
import "https://deno.land/std@0.204.0/node/url.ts";
import "https://deno.land/std@0.204.0/node/util.ts";
import "https://deno.land/std@0.204.0/node/v8.ts";
import "https://deno.land/std@0.204.0/node/vm.ts";
import "https://deno.land/std@0.204.0/node/wasi.ts";
import "https://deno.land/std@0.204.0/node/worker_threads.ts";
import "https://deno.land/std@0.204.0/node/zlib.ts";
*/
2 changes: 1 addition & 1 deletion package/src/common/create-deno-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expandGlobSync } from "https://deno.land/std@0.185.0/fs/mod.ts";
import { expandGlobSync } from "https://deno.land/std@0.204.0/fs/mod.ts";

const json = JSON.parse(
Deno.readTextFileSync("package/src/common/deno-meta.json"),
Expand Down
14 changes: 12 additions & 2 deletions src/core/jupyter/jupyter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,12 @@ export async function jupyterKernelspecFromMarkdown(
return [kernelspec, {}];
} else {
return Promise.reject(
new Error("Jupyter kernel '" + kernel + "' not found."),
new Error(
`Jupyter kernel '${kernel}' not found. Known kernels: ${
Array.from((await jupyterKernelspecs()).values())
.map((kernel: JupyterKernelspec) => kernel.name).join(", ")
}. Run 'quarto check jupyter' with your python environment activated to check python version used.`,
),
);
}
} else if (typeof (yamlJupyter) === "object") {
Expand All @@ -529,7 +534,12 @@ export async function jupyterKernelspecFromMarkdown(
return [kernelspec, jupyter];
} else {
return Promise.reject(
new Error("Jupyter kernel '" + jupyter.kernel + "' not found."),
new Error(
`Jupyter kernel '${jupyter.kernel}' not found. Known kernels: ${
Array.from((await jupyterKernelspecs()).values())
.map((kernel: JupyterKernelspec) => kernel.name).join(", ")
}. Run 'quarto check jupyter' with your python environment activated to check python version used.`,
),
);
}
} else {
Expand Down
2 changes: 2 additions & 0 deletions src/core/pandoc/format-extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ export const kPandocExtensions = [
"-tex_math_dollars",
"+tex_math_double_backslash",
"-tex_math_double_backslash",
"+tex_math_gfm",
"-tex_math_gfm",
"+tex_math_single_backslash",
"-tex_math_single_backslash",
"+wikilinks_title_after_pipe",
Expand Down
Loading
Loading