Skip to content

Commit 23ea14b

Browse files
cscheidcscheid
authored
Merge pull request #10940 from quarto-dev/chore/deno-update-2024-09
Chore/deno update 2024 09
2 parents 01b2f04 + 6c6d7fc commit 23ea14b

File tree

921 files changed

+45389
-12181
lines changed

Some content is hidden

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

921 files changed

+45389
-12181
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*.Rproj
55
*.Rhistory
66
__pycache__/
7-
build
87
quarto_cli.egg-info
98
.Rproj.user
109
package/dist/**
@@ -18,6 +17,9 @@ package/dist/**
1817
src/resources/deno_std/cache
1918
src/vendor-*
2019

20+
# deno lock file
21+
deno.lock
22+
2123
# windows configuration file
2224
win_configuration.bat
2325
/package/pkg-working

‎configuration

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
99

1010
# Binary dependencies
11-
export DENO=v1.41.0
11+
export DENO=v1.46.3
1212
# TODO figure out where 0.1.41 apple silicon libs are available
13-
export DENO_DOM=v0.1.35-alpha-artifacts
13+
export DENO_DOM=v0.1.41-alpha-artifacts
1414
export PANDOC=3.4
1515
export DARTSASS=1.70.0
1616
export ESBUILD=0.19.12

‎dev-docs/add-typescript-dependency.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## Adding a new Typescript dependency to the project
22

3+
FIXME THIS ALL NEEDS UPDATING FOR 1.46.3 AND LATER
4+
35
We vendor all external dependencies to avoid downloads during the execution of quarto in installed environments. To add a new dependency, edit the `./src/import_map.json` file.
46

57
- If the dependency comes from the Deno standard library, make sure you match the version number (otherwise we can end up with duplicate imports from different versions)

‎news/changelog-1.6.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
All changes included in 1.6:
22

3+
## Breaking changes
4+
5+
- The syntax for standard library imports in `quarto run` TypeScript files (`*.ts`) changed. Please see https://prerelease.quarto.org/docs/projects/scripts.html#deno-scripts for how to make the necessary changes.
6+
37
## `quarto inspect`
48

59
- ([#10039](https://github.com/quarto-dev/quarto-cli/issues/10039)): `quarto inspect` properly handles `!expr` tag in metadata.
@@ -81,6 +85,7 @@ All changes included in 1.6:
8185

8286
- Upgrade `mermaidjs` to 11.2.0.
8387
- Upgrade Pandoc to 3.4.
88+
- Upgrade `deno` to 1.46.3.
8489
- ([#10162](https://github.com/quarto-dev/quarto-cli/issues/10162)): Use Edge on `macOS` as a Chromium browser when available.
8590
- ([#10235](https://github.com/quarto-dev/quarto-cli/issues/10235)): Configure the CI schedule trigger to activate exclusively for the upstream repository.
8691
- ([#10295](https://github.com/quarto-dev/quarto-cli/issues/10235)): Fix regression to return error status to shell when `CommandError` is thrown.

‎package/scripts/common/quarto

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [ -f "$DEV_PATH" ]; then
4949
fi
5050

5151
# Local import map
52-
QUARTO_IMPORT_MAP_ARG=--importmap=$QUARTO_SRC_PATH/dev_import_map.json
52+
QUARTO_IMPORT_MAP_ARG=--importmap=$QUARTO_SRC_PATH/import_map.json
5353

5454
# Turn on type checking for dev version
5555
QUARTO_DENO_OPTIONS=--check
@@ -63,7 +63,7 @@ if [ -f "$DEV_PATH" ]; then
6363
if [ -z ${QUARTO_DEBUG+x} ]; then
6464
export QUARTO_DEBUG=true
6565
fi
66-
QUARTO_CACHE_OPTIONS="--cached-only"
66+
# QUARTO_CACHE_OPTIONS="--cached-only"
6767

6868
# Check for deno update
6969
QUARTO_DIST_CONFIG=$QUARTO_BIN_PATH/../config

‎package/scripts/deno_std/deno_std.ts

+93-88
Original file line numberDiff line numberDiff line change
@@ -39,43 +39,48 @@ import * as textproto from "https://deno.land/std@0.159.0/textproto/mod.ts";
3939
import * as uuid from "https://deno.land/std@0.159.0/uuid/mod.ts";
4040
*/
4141

42-
import * as tar from "https://deno.land/std@0.217.0/archive/tar.ts";
43-
import * as async from "https://deno.land/std@0.217.0/async/mod.ts";
44-
import * as bytes from "https://deno.land/std@0.217.0/bytes/mod.ts";
45-
import * as collections from "https://deno.land/std@0.217.0/collections/mod.ts";
46-
import * as crypto from "https://deno.land/std@0.217.0/crypto/mod.ts";
47-
import * as datetime from "https://deno.land/std@0.217.0/datetime/mod.ts";
48-
import * as dotenv from "https://deno.land/std@0.217.0/dotenv/mod.ts";
42+
// The import map "run_import_map.json" needs to mirror these imports
43+
// If you edit this file, you need to update the import map as well
44+
45+
import * as tar from "jsr:/@std/archive@^0.224.0/tar";
46+
import * as async from "jsr:/@std/async@^0.224.0";
47+
import * as bytes from "jsr:/@std/bytes@^0.224.0";
48+
import * as collections from "jsr:/@std/collections@^0.224.0";
49+
import * as crypto from "jsr:/@std/crypto@^0.224.0";
50+
import * as datetime from "jsr:/@std/datetime@^0.224.0";
51+
import * as dotenv from "jsr:/@std/dotenv@^0.224.0";
4952

5053
// encoding has no mod.ts
51-
import * as ascii85 from "https://deno.land/std@0.217.0/encoding/ascii85.ts";
52-
import * as base32 from "https://deno.land/std@0.217.0/encoding/base32.ts";
53-
import * as base58 from "https://deno.land/std@0.217.0/encoding/base58.ts";
54-
import * as base64 from "https://deno.land/std@0.217.0/encoding/base64.ts";
55-
import * as base64url from "https://deno.land/std@0.217.0/encoding/base64url.ts";
56-
import * as csv from "https://deno.land/std@0.217.0/csv/mod.ts";
57-
import * as front_matter from "https://deno.land/std@0.217.0/front_matter/mod.ts";
58-
import * as hex from "https://deno.land/std@0.217.0/encoding/hex.ts";
59-
import * as jsonc from "https://deno.land/std@0.217.0/jsonc/mod.ts";
60-
import * as toml from "https://deno.land/std@0.217.0/toml/mod.ts";
61-
import * as varint from "https://deno.land/std@0.217.0/encoding/varint.ts";
62-
import * as yaml from "https://deno.land/std@0.217.0/yaml/mod.ts";
54+
import * as ascii85 from "https://deno.land/std@0.224.0/encoding/ascii85.ts";
55+
import * as base32 from "https://deno.land/std@0.224.0/encoding/base32.ts";
56+
import * as base58 from "https://deno.land/std@0.224.0/encoding/base58.ts";
57+
import * as base64 from "https://deno.land/std@0.224.0/encoding/base64.ts";
58+
import * as base64url from "https://deno.land/std@0.224.0/encoding/base64url.ts";
59+
import * as csv from "jsr:/@std/csv@^0.224.0";
60+
import * as front_matter from "jsr:/@std/front-matter@^0.224.0";
61+
import * as hex from "https://deno.land/std@0.224.0/encoding/hex.ts";
62+
import * as jsonc from "jsr:/@std/jsonc@^0.224.0";
63+
import * as toml from "jsr:/@std/toml@^0.224.0";
64+
import * as varint from "https://deno.land/std@0.224.0/encoding/varint.ts";
65+
import * as yaml from "jsr:/@std/yaml@^0.224.0";
66+
67+
import * as flags from "jsr:/@std/flags@^0.224.0";
68+
import * as fmt_bytes from "https://deno.land/std@0.224.0/fmt/bytes.ts";
69+
import * as fmt_colors from "https://deno.land/std@0.224.0/fmt/colors.ts";
70+
import * as fmt_printf from "https://deno.land/std@0.224.0/fmt/printf.ts";
71+
import * as fs from "jsr:/@std/fs@^0.224.0";
72+
import * as http from "jsr:/@std/http@^0.224.0";
73+
import * as io from "jsr:/@std/io@^0.224.0";
74+
import * as log from "jsr:/@std/log@^0.224.0";
75+
import * as mediaTypes from "jsr:/@std/media-types@^0.224.0";
76+
import * as path from "jsr:/@std/path@^0.224.0";
77+
import * as permissions from "jsr:/@std/permissions@^0.224.0";
78+
import * as semver from "jsr:/@std/semver@^0.224.0";
79+
import * as streams from "jsr:/@std/streams@^0.224.0";
80+
import * as uuid from "jsr:/@std/uuid@^0.224.0";
6381

64-
import * as flags from "https://deno.land/std@0.217.0/flags/mod.ts";
65-
import * as fmt_bytes from "https://deno.land/std@0.217.0/fmt/bytes.ts";
66-
import * as fmt_colors from "https://deno.land/std@0.217.0/fmt/colors.ts";
67-
import * as fmt_printf from "https://deno.land/std@0.217.0/fmt/printf.ts";
68-
import * as fs from "https://deno.land/std@0.217.0/fs/mod.ts";
69-
import * as http from "https://deno.land/std@0.217.0/http/mod.ts";
70-
import * as io from "https://deno.land/std@0.217.0/io/mod.ts";
71-
import * as log from "https://deno.land/std@0.217.0/log/mod.ts";
72-
import * as mediaTypes from "https://deno.land/std@0.217.0/media_types/mod.ts";
73-
import * as path from "https://deno.land/std@0.217.0/path/mod.ts";
74-
import * as permissions from "https://deno.land/std@0.217.0/permissions/mod.ts";
75-
import * as semver from "https://deno.land/std@0.217.0/semver/mod.ts";
76-
import * as streams from "https://deno.land/std@0.217.0/streams/mod.ts";
77-
import * as uuid from "https://deno.land/std@0.217.0/uuid/mod.ts";
78-
import * as version from "https://deno.land/std@0.217.0/version.ts";
82+
// seems like jsr doesn't export version numbers?!
83+
// import * as version from "jsr:/@std/version@^0.224.0";
7984
import juice from "https://cdn.skypack.dev/juice@10.0.0";
8085

8186
/*
@@ -84,58 +89,58 @@ These would be useful imports to add, but they increase the
8489
size of the download cache significantly, so we're skipping
8590
them until they are needed.
8691
87-
import "https://deno.land/std@0.217.0/node/assert/strict.ts";
88-
import "https://deno.land/std@0.217.0/node/dns/promises.ts";
89-
import "https://deno.land/std@0.217.0/node/fs/promises.ts";
90-
import "https://deno.land/std@0.217.0/node/path/mod.ts";
91-
import "https://deno.land/std@0.217.0/node/readline/promises.ts";
92-
import "https://deno.land/std@0.217.0/node/stream/web.ts";
93-
import "https://deno.land/std@0.217.0/node/timers/promises.ts";
94-
import "https://deno.land/std@0.217.0/node/util/types.ts";
95-
import "https://deno.land/std@0.217.0/node/assert.ts";
96-
import "https://deno.land/std@0.217.0/node/assertion_error.ts";
97-
import "https://deno.land/std@0.217.0/node/async_hooks.ts";
98-
import "https://deno.land/std@0.217.0/node/async_hooks.ts";
99-
import "https://deno.land/std@0.217.0/node/buffer.ts";
100-
import "https://deno.land/std@0.217.0/node/child_process.ts";
101-
import "https://deno.land/std@0.217.0/node/cluster.ts";
102-
import "https://deno.land/std@0.217.0/node/console.ts";
103-
import "https://deno.land/std@0.217.0/node/constants.ts";
104-
import "https://deno.land/std@0.217.0/node/crypto.ts";
105-
import "https://deno.land/std@0.217.0/node/dgram.ts";
106-
import "https://deno.land/std@0.217.0/node/diagnostics_channel.ts";
107-
import "https://deno.land/std@0.217.0/node/dns.ts";
108-
import "https://deno.land/std@0.217.0/node/domain.ts";
109-
import "https://deno.land/std@0.217.0/node/events.ts";
110-
import "https://deno.land/std@0.217.0/node/fs.ts";
111-
import "https://deno.land/std@0.217.0/node/http.ts";
112-
import "https://deno.land/std@0.217.0/node/http2.ts";
113-
import "https://deno.land/std@0.217.0/node/https.ts";
114-
import "https://deno.land/std@0.217.0/node/inspector.ts";
115-
import "https://deno.land/std@0.217.0/node/module_all.ts";
116-
import "https://deno.land/std@0.217.0/node/module_esm.ts";
117-
import "https://deno.land/std@0.217.0/node/module.ts";
118-
import "https://deno.land/std@0.217.0/node/net.ts";
119-
import "https://deno.land/std@0.217.0/node/os.ts";
120-
import "https://deno.land/std@0.217.0/node/path.ts";
121-
import "https://deno.land/std@0.217.0/node/perf_hooks.ts";
122-
import "https://deno.land/std@0.217.0/node/process.ts";
123-
import "https://deno.land/std@0.217.0/node/punycode.ts";
124-
import "https://deno.land/std@0.217.0/node/querystring.ts";
125-
import "https://deno.land/std@0.217.0/node/readline.ts";
126-
import "https://deno.land/std@0.217.0/node/repl.ts";
127-
import "https://deno.land/std@0.217.0/node/stream.ts";
128-
import "https://deno.land/std@0.217.0/node/string_decoder.ts";
129-
import "https://deno.land/std@0.217.0/node/sys.ts";
130-
import "https://deno.land/std@0.217.0/node/timers.ts";
131-
import "https://deno.land/std@0.217.0/node/tls.ts";
132-
import "https://deno.land/std@0.217.0/node/tty.ts";
133-
import "https://deno.land/std@0.217.0/node/upstream_modules.ts";
134-
import "https://deno.land/std@0.217.0/node/url.ts";
135-
import "https://deno.land/std@0.217.0/node/util.ts";
136-
import "https://deno.land/std@0.217.0/node/v8.ts";
137-
import "https://deno.land/std@0.217.0/node/vm.ts";
138-
import "https://deno.land/std@0.217.0/node/wasi.ts";
139-
import "https://deno.land/std@0.217.0/node/worker_threads.ts";
140-
import "https://deno.land/std@0.217.0/node/zlib.ts";
92+
import "https://deno.land/std@0.224.0/node/assert/strict.ts";
93+
import "https://deno.land/std@0.224.0/node/dns/promises.ts";
94+
import "https://deno.land/std@0.224.0/node/fs/promises.ts";
95+
import "https://deno.land/std@0.224.0/node/path/mod.ts";
96+
import "https://deno.land/std@0.224.0/node/readline/promises.ts";
97+
import "https://deno.land/std@0.224.0/node/stream/web.ts";
98+
import "https://deno.land/std@0.224.0/node/timers/promises.ts";
99+
import "https://deno.land/std@0.224.0/node/util/types.ts";
100+
import "https://deno.land/std@0.224.0/node/assert.ts";
101+
import "https://deno.land/std@0.224.0/node/assertion_error.ts";
102+
import "https://deno.land/std@0.224.0/node/async_hooks.ts";
103+
import "https://deno.land/std@0.224.0/node/async_hooks.ts";
104+
import "https://deno.land/std@0.224.0/node/buffer.ts";
105+
import "https://deno.land/std@0.224.0/node/child_process.ts";
106+
import "https://deno.land/std@0.224.0/node/cluster.ts";
107+
import "https://deno.land/std@0.224.0/node/console.ts";
108+
import "https://deno.land/std@0.224.0/node/constants.ts";
109+
import "https://deno.land/std@0.224.0/node/crypto.ts";
110+
import "https://deno.land/std@0.224.0/node/dgram.ts";
111+
import "https://deno.land/std@0.224.0/node/diagnostics_channel.ts";
112+
import "https://deno.land/std@0.224.0/node/dns.ts";
113+
import "https://deno.land/std@0.224.0/node/domain.ts";
114+
import "https://deno.land/std@0.224.0/node/events.ts";
115+
import "https://deno.land/std@0.224.0/node/fs.ts";
116+
import "https://deno.land/std@0.224.0/node/http.ts";
117+
import "https://deno.land/std@0.224.0/node/http2.ts";
118+
import "https://deno.land/std@0.224.0/node/https.ts";
119+
import "https://deno.land/std@0.224.0/node/inspector.ts";
120+
import "https://deno.land/std@0.224.0/node/module_all.ts";
121+
import "https://deno.land/std@0.224.0/node/module_esm.ts";
122+
import "https://deno.land/std@0.224.0/node/module.ts";
123+
import "https://deno.land/std@0.224.0/node/net.ts";
124+
import "https://deno.land/std@0.224.0/node/os.ts";
125+
import "https://deno.land/std@0.224.0/node/path.ts";
126+
import "https://deno.land/std@0.224.0/node/perf_hooks.ts";
127+
import "https://deno.land/std@0.224.0/node/process.ts";
128+
import "https://deno.land/std@0.224.0/node/punycode.ts";
129+
import "https://deno.land/std@0.224.0/node/querystring.ts";
130+
import "https://deno.land/std@0.224.0/node/readline.ts";
131+
import "https://deno.land/std@0.224.0/node/repl.ts";
132+
import "https://deno.land/std@0.224.0/node/stream.ts";
133+
import "https://deno.land/std@0.224.0/node/string_decoder.ts";
134+
import "https://deno.land/std@0.224.0/node/sys.ts";
135+
import "https://deno.land/std@0.224.0/node/timers.ts";
136+
import "https://deno.land/std@0.224.0/node/tls.ts";
137+
import "https://deno.land/std@0.224.0/node/tty.ts";
138+
import "https://deno.land/std@0.224.0/node/upstream_modules.ts";
139+
import "https://deno.land/std@0.224.0/node/url.ts";
140+
import "https://deno.land/std@0.224.0/node/util.ts";
141+
import "https://deno.land/std@0.224.0/node/v8.ts";
142+
import "https://deno.land/std@0.224.0/node/vm.ts";
143+
import "https://deno.land/std@0.224.0/node/wasi.ts";
144+
import "https://deno.land/std@0.224.0/node/worker_threads.ts";
145+
import "https://deno.land/std@0.224.0/node/zlib.ts";
141146
*/

‎package/scripts/windows/quarto.cmd

+6-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ IF EXIST "!QUARTO_TS_PATH!" (
2828
IF NOT DEFINED QUARTO_ACTION (
2929
SET QUARTO_ACTION=run
3030
)
31-
SET "QUARTO_IMPORT_MAP_ARG=--importmap=""!QUARTO_SRC_PATH!\dev_import_map.json"""
31+
SET "QUARTO_IMPORT_MAP_ARG=--importmap=""!QUARTO_SRC_PATH!\import_map.json"""
3232

3333
IF NOT DEFINED QUARTO_TARGET (
3434
SET "QUARTO_TARGET=!QUARTO_TS_PATH!"
@@ -57,6 +57,8 @@ IF EXIST "!QUARTO_TS_PATH!" (
5757
echo !DENO!>"!DENO_VERSION_FILE!"
5858
)
5959

60+
SET QUARTO_CACHE_OPTIONS=
61+
6062
) ELSE (
6163

6264
IF NOT DEFINED QUARTO_SHARE_PATH (
@@ -78,6 +80,7 @@ IF EXIST "!QUARTO_TS_PATH!" (
7880
SET "QUARTO_TARGET=%SCRIPT_PATH%\quarto.js"
7981
SET "QUARTO_BIN_PATH=%SCRIPT_PATH%"
8082
SET "QUARTO_IMPORT_MAP_ARG=--importmap=""%SCRIPT_PATH%\vendor\import_map.json"""
83+
SET QUARTO_CACHE_OPTIONS="--cached-only"
8184
)
8285

8386
IF "%1"=="--paths" (
@@ -99,7 +102,7 @@ IF NOT DEFINED QUARTO_DENO (
99102

100103
SET "DENO_TLS_CA_STORE=system,mozilla"
101104
SET "DENO_NO_UPDATE_CHECK=1"
102-
SET "QUARTO_DENO_OPTIONS=--unstable-kv --unstable-ffi --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
105+
SET "QUARTO_DENO_OPTIONS=--unstable-kv --unstable-ffi --no-config --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi"
103106

104107
REM Add expected V8 options to QUARTO_DENO_V8_OPTIONS
105108
IF DEFINED QUARTO_DENO_V8_OPTIONS (
@@ -128,7 +131,7 @@ IF NOT DEFINED QUARTO_DENO_EXTRA_OPTIONS (
128131
)
129132
)
130133

131-
!QUARTO_DENO! !QUARTO_ACTION! !QUARTO_DENO_OPTIONS! !QUARTO_DENO_EXTRA_OPTIONS! !QUARTO_IMPORT_MAP_ARG! !QUARTO_TARGET! %*
134+
!QUARTO_DENO! !QUARTO_ACTION! !QUARTO_CACHE_OPTIONS! !QUARTO_DENO_OPTIONS! !QUARTO_DENO_EXTRA_OPTIONS! !QUARTO_IMPORT_MAP_ARG! !QUARTO_TARGET! %*
132135

133136

134137
:end

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
import { Command } from "cliffy/command/mod.ts";
88
import { basename, join } from "../../../src/deno_ral/path.ts";
9-
import { ensureDirSync } from "fs/mod.ts";
9+
import { ensureDirSync } from "../../../src/deno_ral/fs.ts";
1010
import { info } from "../../../src/deno_ral/log.ts";
1111

1212
import { Configuration, readConfiguration } from "../common/config.ts";

‎package/src/common/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export function readConfiguration(
102102
);
103103
}
104104

105-
const importmap = join(src, "dev_import_map.json");
105+
const importmap = join(src, "import_map.json");
106106

107107
return {
108108
productName,

‎package/src/common/configure.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
* Copyright (C) 2020-2022 Posit Software, PBC
55
*/
66
import { dirname, join, SEP } from "../../../src/deno_ral/path.ts";
7-
import { existsSync } from "fs/mod.ts";
8-
import { ensureDirSync } from "fs/mod.ts";
7+
import { existsSync, ensureDirSync } from "../../../src/deno_ral/fs.ts";
98
import { info, warning } from "../../../src/deno_ral/log.ts";
109

1110
import { expandPath } from "../../../src/core/path.ts";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expandGlobSync } from "fs/mod.ts";
1+
import { expandGlobSync } from "../../../src/deno_ral/fs.ts";
22

33
const json = JSON.parse(
44
Deno.readTextFileSync("package/src/common/deno-meta.json"),

‎package/src/common/dependencies/dartsass.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright (C) 2020-2022 Posit Software, PBC
55
*
66
*/
7-
import { ensureDirSync, existsSync } from "fs/mod.ts";
7+
import { ensureDirSync, existsSync } from "../../../../src/deno_ral/fs.ts";
88
import { dirname, join } from "../../../../src/deno_ral/path.ts";
99

1010
import { unTar } from "../../util/tar.ts";

‎package/src/common/dependencies/deno_dom.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*/
77

8-
import { ensureDir } from "fs/mod.ts";
8+
import { ensureDir } from "../../../../src/deno_ral/fs.ts";
99
import { basename, dirname, join } from "../../../../src/deno_ral/path.ts";
1010
import { Configuration } from "../config.ts";
1111

@@ -34,8 +34,8 @@ export function deno_dom(version: string): Dependency {
3434
};
3535
};
3636

37-
const deno_dom_release_dragonstyle = (filename: string, targetFileName: string) => {
38-
return deno_dom_release(filename, "https://github.com/dragonstyle/deno-dom", targetFileName)
37+
const deno_dom_release_quarto_dev = (filename: string, targetFileName: string) => {
38+
return deno_dom_release(filename, "https://github.com/quarto-dev/deno-dom-apple-silicon", targetFileName)
3939
}
4040

4141
return {
@@ -50,7 +50,7 @@ export function deno_dom(version: string): Dependency {
5050
},
5151
"aarch64": {
5252
linux: deno_dom_release("libplugin-linux-aarch64.so"),
53-
darwin: deno_dom_release_dragonstyle("libplugin-aarch64.dylib", "libplugin.dylib")
53+
darwin: deno_dom_release_quarto_dev("libplugin-aarch64.dylib", "libplugin.dylib")
5454
},
5555
},
5656
};

‎package/src/common/dependencies/esbuild.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (C) 2020-2022 Posit Software, PBC
55
*/
6-
import { ensureDirSync, existsSync } from "fs/mod.ts";
6+
import { ensureDirSync, existsSync } from "../../../../src/deno_ral/fs.ts";
77
import { dirname, join } from "../../../../src/deno_ral/path.ts";
88

99
import { unTar } from "../../util/tar.ts";

0 commit comments

Comments
 (0)