langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SvelteCheck and ViteTest respect YARN_BINARY (#3231)

Browse Source
This commit is contained in:
antecrescent 2024-06-28 13:00:38 +02:00 committed by GitHub
parent fe86401f88
commit 60b25535ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/ninja_gen/src/node.rs
View File

@ -214,16 +214,13 @@ pub struct SvelteCheck {
impl BuildAction for SvelteCheck { impl BuildAction for SvelteCheck {
fn command(&self) -> &str { fn command(&self) -> &str {
if cfg!(windows) { "$yarn svelte-check:once"
"cmd /c yarn svelte-check:once"
} else {
"./yarn svelte-check:once"
}
} }
fn files(&mut self, build: &mut impl build::FilesHandle) { fn files(&mut self, build: &mut impl build::FilesHandle) {
build.add_inputs("svelte-check", inputs![":node_modules:svelte-check"]); build.add_inputs("svelte-check", inputs![":node_modules:svelte-check"]);
build.add_inputs("tsconfig", &self.tsconfig); build.add_inputs("tsconfig", &self.tsconfig);
build.add_inputs("yarn", inputs![":yarn:bin"]);
build.add_inputs("", &self.inputs); build.add_inputs("", &self.inputs);
build.add_inputs("", inputs!["yarn.lock"]); build.add_inputs("", inputs!["yarn.lock"]);
build.add_variable( build.add_variable(
@ -298,15 +295,12 @@ pub struct ViteTest {
impl BuildAction for ViteTest { impl BuildAction for ViteTest {
fn command(&self) -> &str { fn command(&self) -> &str {
if cfg!(windows) { "$yarn vitest:once"
"cmd /c yarn vitest:once"
} else {
"./yarn vitest:once"
}
} }
fn files(&mut self, build: &mut impl build::FilesHandle) { fn files(&mut self, build: &mut impl build::FilesHandle) {
build.add_inputs("vitest", inputs![":node_modules:vitest"]); build.add_inputs("vitest", inputs![":node_modules:vitest"]);
build.add_inputs("yarn", inputs![":yarn:bin"]);
build.add_inputs("", &self.deps); build.add_inputs("", &self.deps);
build.add_output_stamp("tests/vitest"); build.add_output_stamp("tests/vitest");
} }
@ -457,11 +451,7 @@ pub struct SveltekitBuild {
impl BuildAction for SveltekitBuild { impl BuildAction for SveltekitBuild {
fn command(&self) -> &str { fn command(&self) -> &str {
if std::env::var("HMR").is_err() { if std::env::var("HMR").is_err() {
if cfg!(windows) { "$yarn build"
"cmd /c yarn build"
} else {
"$yarn build"
}
} else { } else {
"echo" "echo"
} }