fix within on Windows #1804
Merged
fix within on Windows #1804
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbostock
force-pushed
the
mbostock/windows-within
branch
from
191a578
to
28ac2c1
Compare
mbostock
commented
Nov 7, 2024
Comment on lines
+10
to
+11
| export const toOsPath = sep === op.sep ? (path: string) => path : (path: string) => path.split(sep).join(op.sep); | ||
| export const fromOsPath = sep === op.sep ? (path: string) => path : (path: string) => path.split(op.sep).join(sep); |
There was a problem hiding this comment.
This doesn’t change functionality; just trivial optimization.
mbostock
force-pushed
the
mbostock/windows-within
branch
from
28ac2c1
to
ea24610
Compare
mbostock
commented
Nov 7, 2024
| @@ -86,6 +87,7 @@ export function parseRelativeUrl(url: string): {pathname: string; search: string | |||
| } | |||
|
|
|||
| export function within(root: string, path: string): boolean { | |||
| const {relative, normalize, resolve, isAbsolute} = op; | |||
| path = relative(normalize(resolve(root)), normalize(resolve(path))); | |||
There was a problem hiding this comment.
The main issue was that process.cwd() returns a “namespaced” absolute path starting with e.g. D:\, whereas resolve(path) returns a non-namespaced absolute path. See these logs for reference:
https://github.com/observablehq/framework/actions/runs/11717337869/job/32636834499
Fil
approved these changes
Nov 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref. #1792