Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli): handle npx for mobile commands, closes #7209 #7218

Merged
merged 3 commits into from
Jun 16, 2023
Merged

fix(cli): handle npx for mobile commands, closes #7209 #7218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2afb57a
fix(cli): handle `npx` for mobile commands, closes #7209
amrbashir Jun 15, 2023
9e39f53
Update .changes/cli-npx-mobile.md
amrbashir Jun 15, 2023
1a86ba7
remove double negation [skip ci]
lucasfernog Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/cli-npx-mobile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'tauri-cli': 'patch'
'@tauri-apps/cli': 'patch'
amrbashir marked this conversation as resolved.
Show resolved Hide resolved
---

Fix `tauri (android|ios) (dev|build)` failing when using `npx tauri`
2 changes: 1 addition & 1 deletion tooling/cli/node/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function isMusl() {
// For Node 10
if (!process.report || typeof process.report.getReport !== 'function') {
try {
const lddPath = require('child_process').execSync('which ldd').toString().trim();
const lddPath = require('child_process').execSync('which ldd').toString().trim()
return readFileSync(lddPath, 'utf8').includes('musl')
} catch (e) {
return true
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ pub fn setup(options: &mut Options, mobile: bool) -> Result<AppInterface> {
.any(|ch| !(ch.is_alphanumeric() || ch == '-' || ch == '.'))
{
error!(
"The bundle identifier \"{}\" set in `{} > tauri > bundle > identifier`. The bundle identifier string must contain only alphanumeric characters (A–Z, a–z, and 0–9), hyphens (-), and periods (.).",
"The bundle identifier \"{}\" set in `{} > tauri > bundle > identifier`. The bundle identifier string must contain only alphanumeric characters (A-Z, a-z, and 0-9), hyphens (-), and periods (.).",
config_.tauri.bundle.identifier,
bundle_identifier_source
);
Expand Down
16 changes: 11 additions & 5 deletions tooling/cli/src/mobile/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,26 @@ pub fn exec(
if r.is_match(&bin_stem) {
if let Some(npm_execpath) = var_os("npm_execpath").map(PathBuf::from) {
let manager_stem = npm_execpath.file_stem().unwrap().to_os_string();
binary = if manager_stem == "npm-cli" {
let is_npm = manager_stem == "npm-cli";
let is_npx = manager_stem == "npx-cli";
binary = if is_npm {
"npm".into()
} else if is_npx {
"npx".into()
} else {
manager_stem
};
if !build_args.is_empty() {
if !build_args.is_empty() && !is_npx {
// remove script path, we'll use `npm_lifecycle_event` instead
build_args.remove(0);
}
if binary == "npm" {
if is_npm {
build_args.insert(0, "--".into());
}
build_args.insert(0, var("npm_lifecycle_event").unwrap());
if binary == "npm" {
if !is_npx {
build_args.insert(0, var("npm_lifecycle_event").unwrap());
}
if is_npm {
build_args.insert(0, "run".into());
}
}
Expand Down