From bc4498e13c562ef732c54e7667c106dc6a461d4f Mon Sep 17 00:00:00 2001 From: w451 <115924828+w451@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:47:30 -0400 Subject: [PATCH] fix(build/composer): npx command (#1159) Co-authored-by: w451 --- composer/build.gradle.kts | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/composer/build.gradle.kts b/composer/build.gradle.kts index 132a1456..a9de74e0 100644 --- a/composer/build.gradle.kts +++ b/composer/build.gradle.kts @@ -1,3 +1,4 @@ +import org.apache.tools.ant.taskdefs.condition.Os plugins { alias(libs.plugins.androidLibrary) alias(libs.plugins.kotlinAndroid) @@ -16,12 +17,22 @@ android { task("compileTypeScript") { doLast { - project.exec { - commandLine("npx", "--yes", "tsc", "--project", "tsconfig.json") - } - project.exec { - commandLine("npx", "--yes", "rollup", "--config", "rollup.config.js", "--bundleConfigAsCjs") + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + project.exec { + commandLine("npx.cmd", "--yes", "tsc", "--project", "tsconfig.json") + } + project.exec { + commandLine("npx.cmd", "--yes", "rollup", "--config", "rollup.config.js", "--bundleConfigAsCjs") + } + } else { + project.exec { + commandLine("npx", "--yes", "tsc", "--project", "tsconfig.json") + } + project.exec { + commandLine("npx", "--yes", "rollup", "--config", "rollup.config.js", "--bundleConfigAsCjs") + } } + project.copy { from("build/loader.js") into("build/assets/composer") @@ -31,4 +42,4 @@ task("compileTypeScript") { tasks.named("preBuild").configure { dependsOn("compileTypeScript") -} +} \ No newline at end of file