Merge pull request #8907 from quarto-dev/chore/1.5-dependency-refresh

chore: deno upgrade

.vscode/launch.json

@@ -14,7 +14,7 @@
       "runtimeExecutable": "${workspaceFolder}/package/dist/bin/tools/deno",
       "runtimeArgs": [
         "run",
-        "--unstable",
+        "--unstable-ffi",
         "--importmap=${workspaceFolder}/src/import_map.json",
         "--inspect-brk",
         "--allow-all"
@@ -39,7 +39,7 @@
       "runtimeArgs": [
         "test",
         "--config=test-conf.json",
-        "--unstable",
+        "--unstable-ffi",
         "--allow-all",
         "--check",
         "--importmap=${workspaceFolder}/src/import_map.json",

configuration

@@ -8,12 +8,12 @@
 # deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
 
 # Binary dependencies
-export DENO=v1.37.2
+export DENO=v1.41.0
 # TODO figure out where 0.1.41 apple silicon libs are available
 export DENO_DOM=v0.1.35-alpha-artifacts
-export PANDOC=3.1.11
-export DARTSASS=1.69.5
-export ESBUILD=0.19.5
+export PANDOC=3.1.11.1
+export DARTSASS=1.70.0
+export ESBUILD=0.19.12
 export TYPST=0.10.0
 
 

package/launcher/src/main.rs

@@ -82,7 +82,7 @@ fn main() {
 
     // Define the base deno options
     let mut deno_options: Vec<String> = vec![
-        String::from("--unstable"),
+        String::from("--unstable-ffi"),
         String::from("--no-config"),
         String::from("--cached-only"),
         String::from("--allow-read"),

package/scripts/common/quarto

@@ -167,7 +167,7 @@ fi
 export DENO_TLS_CA_STORE=system,mozilla
 export DENO_NO_UPDATE_CHECK=1
 # Be sure to include any already defined QUARTO_DENO_OPTIONS
-QUARTO_DENO_OPTIONS="--unstable --no-config ${QUARTO_CACHE_OPTIONS} --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
+QUARTO_DENO_OPTIONS="--unstable-ffi --no-config ${QUARTO_CACHE_OPTIONS} --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
 
 if [ "$QUARTO_DENO_EXTRA_OPTIONS" == "" ]; then
   QUARTO_DENO_EXTRA_OPTIONS="--v8-flags=--max-old-space-size=8192,--max-heap-size=8192"

package/scripts/deno_std/deno_std.ts

@@ -39,104 +39,102 @@ 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.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";
+import * as tar from "https://deno.land/std@0.217.0/archive/tar.ts";
+import * as async from "https://deno.land/std@0.217.0/async/mod.ts";
+import * as bytes from "https://deno.land/std@0.217.0/bytes/mod.ts";
+import * as collections from "https://deno.land/std@0.217.0/collections/mod.ts";
+import * as crypto from "https://deno.land/std@0.217.0/crypto/mod.ts";
+import * as datetime from "https://deno.land/std@0.217.0/datetime/mod.ts";
+import * as dotenv from "https://deno.land/std@0.217.0/dotenv/mod.ts";
 
 // encoding has no mod.ts
-import * as ascii85 from "https://deno.land/[email protected]/encoding/ascii85.ts";
-import * as base32 from "https://deno.land/[email protected]/encoding/base32.ts";
-import * as base58 from "https://deno.land/[email protected]/encoding/base58.ts";
-import * as base64 from "https://deno.land/[email protected]/encoding/base64.ts";
-import * as base64url from "https://deno.land/[email protected]/encoding/base64url.ts";
-import * as binary from "https://deno.land/[email protected]/encoding/binary.ts";
-import * as csv from "https://deno.land/[email protected]/csv/mod.ts";
-import * as front_matter from "https://deno.land/[email protected]/front_matter/mod.ts";
-import * as hex from "https://deno.land/[email protected]/encoding/hex.ts";
-import * as jsonc from "https://deno.land/[email protected]/jsonc/mod.ts";
-import * as toml from "https://deno.land/[email protected]/toml/mod.ts";
-import * as varint from "https://deno.land/[email protected]/encoding/varint.ts";
-import * as yaml from "https://deno.land/[email protected]/yaml/mod.ts";
+import * as ascii85 from "https://deno.land/[email protected]/encoding/ascii85.ts";
+import * as base32 from "https://deno.land/[email protected]/encoding/base32.ts";
+import * as base58 from "https://deno.land/[email protected]/encoding/base58.ts";
+import * as base64 from "https://deno.land/[email protected]/encoding/base64.ts";
+import * as base64url from "https://deno.land/[email protected]/encoding/base64url.ts";
+import * as csv from "https://deno.land/[email protected]/csv/mod.ts";
+import * as front_matter from "https://deno.land/[email protected]/front_matter/mod.ts";
+import * as hex from "https://deno.land/[email protected]/encoding/hex.ts";
+import * as jsonc from "https://deno.land/[email protected]/jsonc/mod.ts";
+import * as toml from "https://deno.land/[email protected]/toml/mod.ts";
+import * as varint from "https://deno.land/[email protected]/encoding/varint.ts";
+import * as yaml from "https://deno.land/[email protected]/yaml/mod.ts";
 
-import * as flags from "https://deno.land/[email protected]/flags/mod.ts";
-import * as fmt_bytes from "https://deno.land/[email protected]/fmt/bytes.ts";
-import * as fmt_colors from "https://deno.land/[email protected]/fmt/colors.ts";
-import * as fmt_printf from "https://deno.land/[email protected]/fmt/printf.ts";
-import * as fs from "https://deno.land/[email protected]/fs/mod.ts";
-import * as http from "https://deno.land/[email protected]/http/mod.ts";
-import * as io from "https://deno.land/[email protected]/io/mod.ts";
-import * as log from "https://deno.land/[email protected]/log/mod.ts";
-import * as mediaTypes from "https://deno.land/[email protected]/media_types/mod.ts";
-import * as path from "https://deno.land/[email protected]/path/mod.ts";
-import * as permissions from "https://deno.land/[email protected]/permissions/mod.ts";
-import * as semver from "https://deno.land/[email protected]/semver/mod.ts";
-import * as signal from "https://deno.land/[email protected]/signal/mod.ts";
-import * as streams from "https://deno.land/[email protected]/streams/mod.ts";
-import * as uuid from "https://deno.land/[email protected]/uuid/mod.ts";
-import * as version from "https://deno.land/[email protected]/version.ts";
+import * as flags from "https://deno.land/[email protected]/flags/mod.ts";
+import * as fmt_bytes from "https://deno.land/[email protected]/fmt/bytes.ts";
+import * as fmt_colors from "https://deno.land/[email protected]/fmt/colors.ts";
+import * as fmt_printf from "https://deno.land/[email protected]/fmt/printf.ts";
+import * as fs from "https://deno.land/[email protected]/fs/mod.ts";
+import * as http from "https://deno.land/[email protected]/http/mod.ts";
+import * as io from "https://deno.land/[email protected]/io/mod.ts";
+import * as log from "https://deno.land/[email protected]/log/mod.ts";
+import * as mediaTypes from "https://deno.land/[email protected]/media_types/mod.ts";
+import * as path from "https://deno.land/[email protected]/path/mod.ts";
+import * as permissions from "https://deno.land/[email protected]/permissions/mod.ts";
+import * as semver from "https://deno.land/[email protected]/semver/mod.ts";
+import * as streams from "https://deno.land/[email protected]/streams/mod.ts";
+import * as uuid from "https://deno.land/[email protected]/uuid/mod.ts";
+import * as version from "https://deno.land/[email protected]/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.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";
+import "https://deno.land/std@0.217.0/node/assert/strict.ts";
+import "https://deno.land/std@0.217.0/node/dns/promises.ts";
+import "https://deno.land/std@0.217.0/node/fs/promises.ts";
+import "https://deno.land/std@0.217.0/node/path/mod.ts";
+import "https://deno.land/std@0.217.0/node/readline/promises.ts";
+import "https://deno.land/std@0.217.0/node/stream/web.ts";
+import "https://deno.land/std@0.217.0/node/timers/promises.ts";
+import "https://deno.land/std@0.217.0/node/util/types.ts";
+import "https://deno.land/std@0.217.0/node/assert.ts";
+import "https://deno.land/std@0.217.0/node/assertion_error.ts";
+import "https://deno.land/std@0.217.0/node/async_hooks.ts";
+import "https://deno.land/std@0.217.0/node/async_hooks.ts";
+import "https://deno.land/std@0.217.0/node/buffer.ts";
+import "https://deno.land/std@0.217.0/node/child_process.ts";
+import "https://deno.land/std@0.217.0/node/cluster.ts";
+import "https://deno.land/std@0.217.0/node/console.ts";
+import "https://deno.land/std@0.217.0/node/constants.ts";
+import "https://deno.land/std@0.217.0/node/crypto.ts";
+import "https://deno.land/std@0.217.0/node/dgram.ts";
+import "https://deno.land/std@0.217.0/node/diagnostics_channel.ts";
+import "https://deno.land/std@0.217.0/node/dns.ts";
+import "https://deno.land/std@0.217.0/node/domain.ts";
+import "https://deno.land/std@0.217.0/node/events.ts";
+import "https://deno.land/std@0.217.0/node/fs.ts";
+import "https://deno.land/std@0.217.0/node/http.ts";
+import "https://deno.land/std@0.217.0/node/http2.ts";
+import "https://deno.land/std@0.217.0/node/https.ts";
+import "https://deno.land/std@0.217.0/node/inspector.ts";
+import "https://deno.land/std@0.217.0/node/module_all.ts";
+import "https://deno.land/std@0.217.0/node/module_esm.ts";
+import "https://deno.land/std@0.217.0/node/module.ts";
+import "https://deno.land/std@0.217.0/node/net.ts";
+import "https://deno.land/std@0.217.0/node/os.ts";
+import "https://deno.land/std@0.217.0/node/path.ts";
+import "https://deno.land/std@0.217.0/node/perf_hooks.ts";
+import "https://deno.land/std@0.217.0/node/process.ts";
+import "https://deno.land/std@0.217.0/node/punycode.ts";
+import "https://deno.land/std@0.217.0/node/querystring.ts";
+import "https://deno.land/std@0.217.0/node/readline.ts";
+import "https://deno.land/std@0.217.0/node/repl.ts";
+import "https://deno.land/std@0.217.0/node/stream.ts";
+import "https://deno.land/std@0.217.0/node/string_decoder.ts";
+import "https://deno.land/std@0.217.0/node/sys.ts";
+import "https://deno.land/std@0.217.0/node/timers.ts";
+import "https://deno.land/std@0.217.0/node/tls.ts";
+import "https://deno.land/std@0.217.0/node/tty.ts";
+import "https://deno.land/std@0.217.0/node/upstream_modules.ts";
+import "https://deno.land/std@0.217.0/node/url.ts";
+import "https://deno.land/std@0.217.0/node/util.ts";
+import "https://deno.land/std@0.217.0/node/v8.ts";
+import "https://deno.land/std@0.217.0/node/vm.ts";
+import "https://deno.land/std@0.217.0/node/wasi.ts";
+import "https://deno.land/std@0.217.0/node/worker_threads.ts";
+import "https://deno.land/std@0.217.0/node/zlib.ts";
 */

package/scripts/deno_std/download.bat

@@ -6,4 +6,4 @@ if NOT DEFINED QUARTO_DENO (
 )
 
 set DENO_DIR=%~dp0\..\..\..\src\resources\deno_std\cache
-%QUARTO_DENO% cache --unstable --lock %~dp0\..\..\..\src\resources\deno_std\deno_std.lock %~dp0\deno_std.ts
+%QUARTO_DENO% cache --unstable-ffi --lock %~dp0\..\..\..\src\resources\deno_std\deno_std.lock %~dp0\deno_std.ts

package/scripts/deno_std/download.sh

@@ -10,4 +10,4 @@ fi
 
 
 export DENO_DIR="$QUARTO_SRC_PATH/resources/deno_std/cache"
-"$QUARTO_DENO" cache --no-config --unstable --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"
+"$QUARTO_DENO" cache --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"

package/scripts/vendoring/vendor.sh

@@ -34,7 +34,7 @@ pushd ${QUARTO_SRC_PATH}
 today=`date +%Y-%m-%d`
 mv vendor vendor-${today}
 set +e
-$DENO_BIN_PATH vendor --no-config quarto.ts $QUARTO_ROOT/tests/test-deps.ts $QUARTO_ROOT/package/scripts/deno_std/deno_std.ts --importmap=$QUARTO_SRC_PATH/import_map.json
+$DENO_BIN_PATH vendor --no-config quarto.ts $QUARTO_ROOT/src/vendor_deps.ts $QUARTO_ROOT/tests/test-deps.ts $QUARTO_ROOT/package/scripts/deno_std/deno_std.ts --importmap=$QUARTO_SRC_PATH/import_map.json
 return_code="$?"
 set -e
 if [[ ${return_code} -ne 0 ]]; then
@@ -45,4 +45,4 @@ if [[ ${return_code} -ne 0 ]]; then
 else
   rm -rf vendor-${today}
 fi
-$DENO_BIN_PATH run --no-config --unstable --allow-all --importmap=$QUARTO_SRC_PATH/import_map.json $QUARTO_PACKAGE_PATH/src/common/create-dev-import-map.ts
+$DENO_BIN_PATH run --no-config --unstable-ffi --allow-all --importmap=$QUARTO_SRC_PATH/import_map.json $QUARTO_PACKAGE_PATH/src/common/create-dev-import-map.ts

package/scripts/windows/quarto.cmd

@@ -96,7 +96,7 @@ IF NOT DEFINED QUARTO_DENO (
 
 SET "DENO_TLS_CA_STORE=system,mozilla"
 SET "DENO_NO_UPDATE_CHECK=1"
-SET "QUARTO_DENO_OPTIONS=--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
+SET "QUARTO_DENO_OPTIONS=--unstable-ffi --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
 
 IF NOT DEFINED QUARTO_DENO_EXTRA_OPTIONS (
 		set "QUARTO_DENO_EXTRA_OPTIONS=--v8-flags=--max-old-space-size=8192,--max-heap-size=8192"

package/src/cmd/pkg-cmd.ts

@@ -5,7 +5,7 @@
 *
 */
 import { Command } from "cliffy/command/mod.ts";
-import { join } from "path/mod.ts";
+import { join } from "../../../src/deno_ral/path.ts";
 
 import { printConfiguration } from "../common/config.ts";
 

package/src/common/archive-binary-dependencies.ts

@@ -3,8 +3,8 @@
  *
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
-import { join } from "path/mod.ts";
-import { info } from "log/mod.ts";
+import { join } from "../../../src/deno_ral/path.ts";
+import { info } from "../../../src/deno_ral/log.ts";
 
 import { execProcess } from "../../../src/core/process.ts";
 import { Configuration, withWorkingDir } from "./config.ts";

package/src/common/compile-quarto-latexmk.ts

@@ -5,9 +5,9 @@
 *
 */
 import { Command } from "cliffy/command/mod.ts";
-import { basename, join } from "path/mod.ts";
+import { basename, join } from "../../../src/deno_ral/path.ts";
 import { ensureDirSync } from "fs/mod.ts";
-import { info } from "log/mod.ts";
+import { info } from "../../../src/deno_ral/log.ts";
 
 import { Configuration, readConfiguration } from "../common/config.ts";
 import { compile, install, updateDenoPath } from "../util/deno.ts";

package/src/common/config.ts

@@ -5,8 +5,8 @@
 *
 */
 
-import { join } from "path/mod.ts";
-import { info } from "log/mod.ts";
+import { join } from "../../../src/deno_ral/path.ts";
+import { info } from "../../../src/deno_ral/log.ts";
 
 import { getEnv } from "../util/utils.ts";
 

package/src/common/configure.ts

@@ -3,10 +3,10 @@
  *
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
-import { dirname, join, SEP } from "path/mod.ts";
+import { dirname, join, SEP } from "../../../src/deno_ral/path.ts";
 import { existsSync } from "fs/mod.ts";
 import { ensureDirSync } from "fs/mod.ts";
-import { info, warning } from "log/mod.ts";
+import { info, warning } from "../../../src/deno_ral/log.ts";
 
 import { expandPath } from "../../../src/core/path.ts";
 import {

package/src/common/create-deno-config.ts

@@ -1,4 +1,4 @@
-import { expandGlobSync } from "https://deno.land/[email protected]/fs/mod.ts";
+import { expandGlobSync } from "fs/mod.ts";
 
 const json = JSON.parse(
   Deno.readTextFileSync("package/src/common/deno-meta.json"),

package/src/common/create-dev-import-map.ts

@@ -6,7 +6,7 @@
 */
 
 import { mergeImportMaps } from "../../../src/core/deno/import-maps.ts";
-import { join } from "path/mod.ts";
+import { join } from "../../../src/deno_ral/path.ts";
 
 const QUARTO_SRC_PATH = Deno.env.get("QUARTO_SRC_PATH") || ".";
 

package/src/common/cyclic-dependencies.ts

@@ -4,12 +4,12 @@
 * Copyright (C) 2020-2022 Posit Software, PBC
 *
 */
-import { basename, isAbsolute, join } from "path/mod.ts";
+import { basename, isAbsolute, join } from "../../../src/deno_ral/path.ts";
 import { Command } from "cliffy/command/mod.ts";
 
 import { runCmd } from "../util/cmd.ts";
 import { Configuration, readConfiguration } from "./config.ts";
-import { error, info } from "log/mod.ts";
+import { error, info } from "../../../src/deno_ral/log.ts";
 import { progressBar } from "../../../src/core/console.ts";
 import { md5Hash } from "../../../src/core/hash.ts";
 

package/src/common/dependencies/dartsass.ts

@@ -5,7 +5,7 @@
 *
 */
 import { ensureDirSync, existsSync } from "fs/mod.ts";
-import { dirname, join } from "path/mod.ts";
+import { dirname, join } from "../../../../src/deno_ral/path.ts";
 
 import { unTar } from "../../util/tar.ts";
 import { Configuration } from "../config.ts";

package/src/common/dependencies/deno.ts

@@ -6,7 +6,7 @@
 */
 import { Dependency } from "./dependencies.ts";
 import { Configuration } from "../config.ts";
-import { join, dirname } from "path/mod.ts";
+import { join, dirname } from "../../../../src/deno_ral/path.ts";
 import { unzip } from "../../util/utils.ts";
 
 export function deno(version: string): Dependency {

package/src/common/dependencies/deno_dom.ts

@@ -6,7 +6,7 @@
 */
 
 import { ensureDir } from "fs/mod.ts";
-import { basename, dirname, join } from "path/mod.ts";
+import { basename, dirname, join } from "../../../../src/deno_ral/path.ts";
 import { Configuration } from "../config.ts";
 
 import { Dependency } from "./dependencies.ts";