Skip to content

fix: Fix error when input file is on different drive on Windows #727

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

Open
MurakamiShinyu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Fix error when input file is on different drive on Windows #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fine-flies-drum.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@vivliostyle/cli': patch
---

Fix error when input file is on different drive on Windows
14 changes: 10 additions & 4 deletions src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,16 @@ export async function getSourceUrl({
'viewerInput' | 'base' | 'workspaceDir' | 'rootUrl'
>) {
let input: string;
let isUrlPath = false;
switch (viewerInput.type) {
case 'webpub':
input = viewerInput.manifestPath;
break;
case 'webbook':
input = viewerInput.webbookEntryUrl;
// webbookEntryUrl is already a URL path (e.g., "/vivliostyle/test.html")
// or a full URL (e.g., "https://example.com/test.html")
isUrlPath = !isValidUri(input);
break;
case 'epub-opf':
input = viewerInput.epubOpfPath;
Expand All @@ -145,10 +149,12 @@ export async function getSourceUrl({
return (
isValidUri(input)
? new URL(input)
: new URL(
upath.posix.join(base, upath.relative(workspaceDir, input)),
rootUrl,
)
: isUrlPath
? new URL(input, rootUrl)
: new URL(
upath.posix.join(base, upath.relative(workspaceDir, input)),
rootUrl,
)
).href;
}

Expand Down
3 changes: 2 additions & 1 deletion src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ export function pathEquals(path1: string, path2: string): boolean {

export function pathContains(parentPath: string, childPath: string): boolean {
const rel = upath.relative(parentPath, childPath);
return rel !== '' && !rel.startsWith('..');
// If relative path is absolute (different drives on Windows), they are not related
return rel !== '' && !rel.startsWith('..') && !upath.isAbsolute(rel);
}

export function isValidUri(str: string): boolean {
Expand Down