miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(core): show warning if workspaceRoot starts with ! (#20705)

Browse Source
This commit is contained in:
Jonathan Cammisuli 2023-12-12 09:10:06 -05:00 committed by GitHub
parent 73f4829ba7
commit f1ff0b465e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/nx/src/native/tasks/hashers/hash_workspace_files.rs
View File

@ -2,24 +2,25 @@ use std::sync::Arc;
use anyhow::*;
use dashmap::DashMap;
use tracing::trace;
use tracing::{trace, warn};
use crate::native::glob::build_glob_set;
use crate::native::types::FileData;
use crate::native::{glob::build_glob_set, hasher::hash};
pub fn hash_workspace_files(
workspace_file_set: &str,
all_workspace_files: &[FileData],
cache: Arc<DashMap<String, String>>,
) -> Result<String> {
let file_set = workspace_file_set
.strip_prefix("{workspaceRoot}/")
.ok_or_else(|| {
anyhow!(
"{workspace_file_set} does not start with {}",
"{workspaceRoot}/"
)
})?;
let file_set = workspace_file_set.strip_prefix("{workspaceRoot}/");
let Some(file_set) = file_set else {
warn!(
"{workspace_file_set} does not start with {}. This will throw an error in Nx 18.",
"{workspaceRoot}/"
);
return Ok(hash(b""));
};
if let Some(cache_results) = cache.get(file_set) {
return Ok(cache_results.clone());
@ -50,9 +51,10 @@ mod test {
use std::sync::Arc;
#[test]
fn test_hash_workspace_files_error() {
let result = hash_workspace_files("packages/{package}", &[], Arc::new(DashMap::new()));
assert!(result.is_err());
fn invalid_workspace_input_is_just_empty_hash() {
let result =
hash_workspace_files("packages/{package}", &[], Arc::new(DashMap::new())).unwrap();
assert_eq!(result, hash(b""));
}
#[test]