Skip to content

Try to read dependency from the current package. #7770

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

Merged
merged 7 commits into from
Aug 15, 2025
Merged

Try to read dependency from the current package. #7770

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d82a5f6
Try to read dependency from the current package.
nojaf Aug 14, 2025
eca8651
Ensure hoisted package is found.
nojaf Aug 14, 2025
ee354f5
Ensure no warnings in sample
nojaf Aug 14, 2025
8a1603e
Add nohoist config
nojaf Aug 14, 2025
134e587
Update numbers in snapshots
nojaf Aug 14, 2025
d87451c
Update numbers in custom suffix
nojaf Aug 14, 2025
7933dea
Lockfile
nojaf Aug 14, 2025
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
20 changes: 16 additions & 4 deletions rewatch/src/build/packages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,25 @@ pub fn read_config(package_dir: &Path) -> Result<Config> {
}
}

pub fn read_dependency(package_name: &str, project_context: &ProjectContext) -> Result<PathBuf, String> {
pub fn read_dependency(package_name: &str, project_context: &ProjectContext) -> Result<PathBuf> {
// current folder + node_modules + package_name
let path_from_current_config = {
match project_context.current_config.path.parent() {
None => Err(anyhow!(
"Expected {} to have a parent folder",
project_context.current_config.path.to_string_lossy()
)),
Some(parent_path) => Ok(helpers::package_path(parent_path, package_name)),
}
}?;
// root folder + node_modules + package_name
let path_from_root = helpers::package_path(project_context.get_root_path(), package_name);
let path = (if path_from_root.exists() {
let path = (if path_from_current_config.exists() {
Ok(path_from_current_config)
} else if path_from_root.exists() {
Ok(path_from_root)
} else {
Err(format!(
Err(anyhow!(
"The package \"{package_name}\" is not found (are node_modules up-to-date?)..."
))
})?;
Expand All @@ -266,7 +278,7 @@ pub fn read_dependency(package_name: &str, project_context: &ProjectContext) ->
.map(StrippedVerbatimPath::to_stripped_verbatim_path)
{
Ok(canonical_path) => Ok(canonical_path),
Err(e) => Err(format!(
Err(e) => Err(anyhow!(
"Failed canonicalizing the package \"{}\" path \"{}\" (are node_modules up-to-date?)...\nMore details: {}",
package_name,
path.to_string_lossy(),
Expand Down
Loading