Skip to content

Commit 8079769

Browse files
committed
feat: upgrade to support deno 2
1 parent 8f1af9e commit 8079769

File tree

16 files changed

+360
-666
lines changed

16 files changed

+360
-666
lines changed

.github/demos/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/charmbracelet/vhs:v0.7.2-devel
1+
FROM ghcr.io/charmbracelet/vhs:v0.8.1-devel
22

33
ARG MDRB_HASH
44

@@ -13,12 +13,8 @@ RUN apt install curl unzip bat -y \
1313

1414
ADD . /vhs/
1515

16-
RUN deno install -Arfn mdrb /vhs/mod.ts
16+
RUN deno install --global --config=/vhs/deno.jsonc -Arfn mdrb /vhs/mod.ts
1717

1818
RUN deno cache --lock=/vhs/deno.lock /vhs/deps.ts /vhs/deps.dev.ts
1919

2020
RUN mdrb /vhs/demo.md --mode isolated
21-
22-
ENTRYPOINT [] # override parent layer
23-
24-
CMD [ "/usr/bin/vhs" ]

.github/demos/generate.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expandGlob, joinGlobs } from "../../deps.dev.ts";
22
import { $ } from "../../deps.ts";
3+
import { invariant } from "../../src/util.ts";
34

45
const root = $.relativePath(import.meta.url, "..", "..");
56
const latestHash = await $`git rev-parse HEAD`.cwd(root).text();
@@ -12,10 +13,13 @@ await $`docker build --build-arg MDRB_HASH=${latestHash} -t ${img} -f ${dockerfi
1213
const demos = [];
1314
for await (const tape of expandGlob(joinGlobs([demosDir.toString(), "**", "vhs.tape"]))) {
1415
const mount = $.path(tape.path).dirname();
15-
demos.push($`docker run --rm -v ${mount}:/vhs/demos ${img} vhs /vhs/demos/vhs.tape`.cwd(root));
16+
demos.push($`docker run --rm -v ${mount}:/vhs/demos ${img} /vhs/demos/vhs.tape`.cwd(root));
1617
}
1718

1819
await Promise.all(demos);
1920

2021
const me = Deno.env.get("USER");
22+
23+
invariant(typeof me === "string");
24+
2125
await $`sudo chown -R ${me}:${me} ${demosDir}`;

.github/demos/usage-basic/demo.gif

-1.81 KB
Loading

.github/demos/usage-dax/demo.gif

560 KB
Loading

.github/demos/usage-no-dax/demo.gif

2.63 KB
Loading
14.9 KB
Loading

.github/demos/usage-remote/demo.gif

12.6 KB
Loading

.hooks/pre-commit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { daxVersion, version } from "../mod.ts";
77
const root = $.relativePath(import.meta.url, "..");
88

99
const latestTag = await $`git describe --tags --abbrev=0`.cwd(root).text();
10-
const depsDaxVersion = Deno.readTextFileSync($.path(root).join("deps.ts").toString())
11-
.match(/deno.land\/x\/dax@([^\/]+)/)?.at(1) ?? "";
10+
const depsDaxVersion = Deno.readTextFileSync($.path(root).join("deno.jsonc").toString())
11+
.match(/@david\/dax@([^"]+)/)?.at(1) ?? "";
1212

1313
const nextIsNewer = greaterThan(parse(version), parse(latestTag));
1414
if (!nextIsNewer) {

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"deno.enable": true,
33
"deno.lint": true,
4-
"deno.unstable": true,
54
"deno.cacheOnSave": true,
65
"deno.config": "deno.jsonc",
76
"[json]": { "editor.defaultFormatter": "denoland.vscode-deno" },

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ When provided a Markdown file (or a remote URL that points to one, or pipe the c
6161
## Installation
6262

6363
```sh
64-
deno install -Arfn mdrb https://deno.land/x/mdrb/mod.ts
64+
deno install --global --config=https://deno.land/x/mdrb/deno.jsonc -Arfn mdrb https://deno.land/x/mdrb/mod.ts
6565
```
6666

6767
> Note: if you prefer not to bake `--allow-all` permissions (with the `-A` flag) into the installed command, you can

deno.jsonc

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,26 @@
44
"tasks": {
55
"test": "deno test -A --no-check",
66
"lint": "deno check mod.ts && deno lint && deno fmt --check",
7-
"deps": "deno run --allow-read=. --allow-write=. --allow-net https://deno.land/x/udd/main.ts deps.ts deps.dev.ts && deno cache --reload --lock=deno.lock deps.ts deps.dev.ts",
7+
// Bump dependencies using @molt/cli (https://jsr.io/@molt/cli) - may prompt for read perms on ~/.local/share/deno-wasmbuild
8+
"deps": "deno run -E=XDG_DATA_HOME,HOME,GITHUB_TOKEN -R='./' -W=deno.jsonc -N=api.jsr.io,jsr.io,deno.land,registry.npmjs.org,esm.sh jsr:@molt/cli --write deno.jsonc",
89
"demos": "deno run -A .github/demos/generate.ts",
910
"hooks": "export GITROOT=$(git rev-parse --show-toplevel); git config core.hooksPath $GITROOT/.hooks"
11+
},
12+
"imports": {
13+
"@cliffy/ansi": "jsr:@cliffy/ansi@1.0.0-rc.7",
14+
"@cliffy/command": "jsr:@cliffy/command@1.0.0-rc.7",
15+
"@cliffy/table": "jsr:@cliffy/table@1.0.0-rc.7",
16+
"@david/dax": "jsr:@david/dax@0.42.0",
17+
"@esm.sh/cheerio": "npm:cheerio@1.0.0",
18+
"@littletof/charmd": "jsr:@littletof/charmd@0.1.2",
19+
"@std/assert": "jsr:@std/assert@1.0.6",
20+
"@std/fs": "jsr:@std/fs@1.0.4",
21+
"@std/io": "jsr:@std/io@0.225.0",
22+
"@std/path": "jsr:@std/path@1.0.6",
23+
"@std/semver": "jsr:@std/semver@1.0.3",
24+
"@std/toml": "jsr:@std/toml@1.0.1",
25+
"@x/hue/theme": "https://deno.land/x/hue@0.0.0-alpha.1/themes/mod.ts",
26+
"@x/hue/typescript": "https://deno.land/x/hue@0.0.0-alpha.1/languages/typescript/typescript.ts",
27+
"@x/rusty_markdown": "https://deno.land/x/rusty_markdown@v0.4.1/mod.ts"
1028
}
1129
}

0 commit comments

Comments
 (0)