Merge branch 'master' into feat/less-globalVars

umijs · Aug 6, 2024 · 37211de · 37211de
2 parents ab4a961 + 2a9d2b5
commit 37211de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/crates/mako/src/generate/chunk.rs b/crates/mako/src/generate/chunk.rs
@@ -74,8 +74,8 @@ impl Chunk {
                     .components()
                     .filter(|c| !matches!(c, Component::RootDir | Component::CurDir))
                     .map(|c| match c {
-                        Component::ParentDir => "_pd_".to_string(),
-                        Component::Prefix(_) => "_ps_".to_string(),
+                        Component::ParentDir => "pd_".to_string(),
+                        Component::Prefix(_) => "ps_".to_string(),
                         Component::RootDir => "".to_string(),
                         Component::CurDir => "".to_string(),
                         Component::Normal(seg) => {

diff --git a/justfile b/justfile
@@ -1,4 +1,6 @@
 #!/usr/bin/env -S just --justfile
+set windows-shell := ["powershell"]
+set shell := ["bash", "-cu"]
 
 _default:
   just --list -u