Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- Fix duplicated comments in `for`..`of` formatter. https://github.com/rescript-lang/rescript/pull/8395
- Fix issue where warning 56 would blow up with `dict{}` patterns. https://github.com/rescript-lang/rescript/pull/8403
- Acquire rewatch build lock before initialization. https://github.com/rescript-lang/rescript/pull/8409
- Rewatch: treat transitive workspace dependencies as local packages in monorepo roots. https://github.com/rescript-lang/rescript/pull/8411

#### :memo: Documentation

Expand Down
73 changes: 56 additions & 17 deletions rewatch/src/build/packages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,23 +389,7 @@ fn read_dependencies(
}
};

let is_local_dep = {
match &project_context.monorepo_context {
None => project_context.current_config.name.as_str() == package_name
,
Some(MonoRepoContext::MonorepoRoot {
local_dependencies,
local_dev_dependencies,
}) => {
local_dependencies.contains(package_name) || local_dev_dependencies.contains(package_name)
},
Some(MonoRepoContext::MonorepoPackage {
parent_config,
}) => {
helpers::is_local_package(&parent_config.path, &canonical_path)
}
}
};
let is_local_dep = is_local_dependency(project_context, package_name, &canonical_path);

let dependencies = read_dependencies(
&mut registered_dependencies_set.to_owned(),
Expand All @@ -427,6 +411,18 @@ fn read_dependencies(
.collect()
}

fn is_local_dependency(project_context: &ProjectContext, package_name: &str, canonical_path: &Path) -> bool {
match &project_context.monorepo_context {
None => project_context.current_config.name.as_str() == package_name,
Some(MonoRepoContext::MonorepoRoot { .. }) => {
helpers::is_local_package(project_context.get_root_path(), canonical_path)
}
Some(MonoRepoContext::MonorepoPackage { parent_config }) => {
helpers::is_local_package(&parent_config.path, canonical_path)
}
}
}

fn flatten_dependencies(dependencies: Vec<Dependency>) -> Vec<Dependency> {
let mut flattened: Vec<Dependency> = Vec::new();
for dep in dependencies {
Expand Down Expand Up @@ -1252,11 +1248,13 @@ pub fn validate_packages_dependencies(packages: &AHashMap<String, Package>) -> b
#[cfg(test)]
mod test {
use crate::config;
use crate::project_context::{MonoRepoContext, ProjectContext};

use super::{Namespace, Package, read_issue_tracker_url, read_package_name};
use ahash::{AHashMap, AHashSet};
use std::fs;
use std::path::PathBuf;
use std::sync::RwLock;
use tempfile::TempDir;

pub struct CreatePackageArgs {
Expand Down Expand Up @@ -1462,6 +1460,47 @@ mod test {
assert_eq!(read_issue_tracker_url(temp_dir.path()), None);
}

#[test]
fn monorepo_root_marks_transitive_workspace_dependencies_as_local() {
let temp_dir = TempDir::new().unwrap();
let root = temp_dir.path();

let mut local_dependencies = AHashSet::new();
local_dependencies.insert("direct".to_string());

let project_context = ProjectContext {
current_config: config::tests::create_config(config::tests::CreateConfigArgs {
name: "root".to_string(),
bs_deps: vec!["direct".to_string()],
build_dev_deps: vec![],
allowed_dependents: None,
path: root.join("rescript.json"),
}),
monorepo_context: Some(MonoRepoContext::MonorepoRoot {
local_dependencies,
local_dev_dependencies: AHashSet::new(),
}),
node_modules_exist_cache: RwLock::new(AHashMap::new()),
packages_cache: RwLock::new(AHashMap::new()),
};

assert!(super::is_local_dependency(
&project_context,
"direct",
&root.join("packages/direct")
));
assert!(super::is_local_dependency(
&project_context,
"transitive",
&root.join("packages/transitive")
));
assert!(!super::is_local_dependency(
&project_context,
"external",
&root.join("node_modules/external")
));
}

fn root_package_with_features(
features_map: Option<std::collections::HashMap<String, Vec<String>>>,
tagged_sources: Vec<(&str, Option<&str>)>,
Expand Down
Loading