From fb7ef8dacd9ade96976c84d22507782cdaf38acf Mon Sep 17 00:00:00 2001 From: Nathanael Rea Date: Mon, 22 May 2023 18:09:49 -0400 Subject: [PATCH] fix(cli.js): detect node-20 binary (#6667) * fix nodejs binary regex * Update clijs-node-version-20.md --- .changes/clijs-node-version-20.md | 5 +++++ tooling/cli/node/tauri.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changes/clijs-node-version-20.md diff --git a/.changes/clijs-node-version-20.md b/.changes/clijs-node-version-20.md new file mode 100644 index 000000000..4653a985c --- /dev/null +++ b/.changes/clijs-node-version-20.md @@ -0,0 +1,5 @@ +--- +'@tauri-apps/cli': patch +--- + +Fix nodejs binary regex when `0` is in the version name, for example `node-20` diff --git a/tooling/cli/node/tauri.js b/tooling/cli/node/tauri.js index 3bd320171..1516306df 100755 --- a/tooling/cli/node/tauri.js +++ b/tooling/cli/node/tauri.js @@ -20,7 +20,7 @@ if (bin === '@tauri-apps/cli') { } // Even if started by a package manager, the binary will be NodeJS. // Some distribution still use "nodejs" as the binary name. -else if (binStem.match(/(nodejs|node)\-?([1-9]*)*$/g)) { +else if (binStem.match(/(nodejs|node)\-?([0-9]*)*$/g)) { const managerStem = process.env.npm_execpath ? path.parse(process.env.npm_execpath).name.toLowerCase() : null