Skip to content

Commit 18d71c6

Browse files
committed
Fix: update to newer pdfjs.
1 parent d2ed400 commit 18d71c6

File tree

3 files changed

+6
-33
lines changed

3 files changed

+6
-33
lines changed

builder/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ edition = "2024"
2525

2626
[dependencies]
2727
clap = { version = "4.5.19", features = ["derive"] }
28-
cmd_lib = "1.9.5"
28+
cmd_lib = "2.0.0"
2929
current_platform = "0.2.0"
3030
dunce = "1.0.5"
3131
path-slash = "0.2.1"

builder/src/main.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,7 @@ fn run_install(dev: bool) -> io::Result<()> {
338338
}
339339
// See [the client manifest](../../client/package.json5) for an explanation
340340
// of `--no-frozen-lockfile`.
341-
run_script(
342-
"pnpm",
343-
&["install", "--no-frozen-lockfile"],
344-
"../client",
345-
true,
346-
)?;
341+
run_script("pnpm", &["install"], "../client", true)?;
347342
patch_client_libs()?;
348343
run_script("npm", &["install"], "../extensions/VSCode", true)?;
349344
run_cmd!(

client/package.json5

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,8 @@
6464
'graphviz-webcomponent': '^2.0.0',
6565
mathjax: '4.0.0',
6666
mermaid: '^11.10.1',
67-
'npm-check-updates': '^18.0.2',
68-
/* Per [this pdfjs-dist
69-
issue](https://github.com/mozilla/pdf.js/issues/20127), avoid v5.4.54
70-
of this library. Per [this pnpm
71-
issue](https://github.com/pnpm/pnpm/issues/6714), `pnpm` will
72-
auto-rewrite this incorrectly, so manually revert changes after each
73-
`pnpm update`. However, reverting these changes causes the following
74-
error:
75-
76-
```
77-
ERR_PNPM_OUTDATED_LOCKFILE  Cannot install with "frozen-lockfile" because pnpm-lock.
78-
yaml is not up to date with <ROOT>/package.json
79-
80-
Note that in CI environments this setting is true by default. If you still need to
81-
run install in such cases, use "pnpm install --no-frozen-lockfile"
82-
83-
Failure reason:
84-
specifiers in the lockfile don't match specifiers in package.json:
85-
* 1 dependencies are mismatched:
86-
- pdfjs-dist (lockfile: ^5.3.93, manifest: ~5 < 5.4.54 || ~5.4.55)
87-
```
88-
89-
So, installs in CI must have the `--no-frozen-lockfile` CLI flag. */
90-
'pdfjs-dist': '~5 < 5.4.54 || ~5.4.55',
67+
'npm-check-updates': '^18.0.3',
68+
'pdfjs-dist': '^5.4.149',
9169
tinymce: '^8.0.2',
9270
'toastify-js': '^1.12.0',
9371
},
@@ -97,8 +75,8 @@
9775
'@types/mocha': '^10.0.10',
9876
'@types/node': '^24.3.0',
9977
'@types/toastify-js': '^1.12.4',
100-
'@typescript-eslint/eslint-plugin': '^8.40.0',
101-
'@typescript-eslint/parser': '^8.40.0',
78+
'@typescript-eslint/eslint-plugin': '^8.41.0',
79+
'@typescript-eslint/parser': '^8.41.0',
10280
chai: '^6.0.1',
10381
esbuild: '^0.25.9',
10482
eslint: '^9.34.0',

0 commit comments

Comments
 (0)