Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 28 additions & 8 deletions crates/tauri-cli/src/info/packages_nodejs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,27 @@ pub fn items(
) -> Vec<SectionItem> {
let mut items = Vec::new();
if let Some(frontend_dir) = frontend_dir {
for (package, version) in [
("@tauri-apps/api", None),
("@tauri-apps/cli", Some(metadata.js_cli.version.clone())),
] {
let mut packages = vec![("@tauri-apps/api", None)];
if let Some(cli) = &metadata.js_cli.version {
packages.push(("@tauri-apps/cli", Some(cli.clone())));
}
Comment on lines +140 to +143
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change doesn't really do anything, please revert


let versions = package_manager
.current_package_versions(
&packages.iter().map(|(p, _)| p.to_string()).collect::<Vec<_>>(),
frontend_dir,
)
.unwrap_or_default();

for (package, version) in packages {
let frontend_dir = frontend_dir.clone();
let item = nodejs_section_item(package.into(), version, frontend_dir, package_manager);
let item = nodejs_section_item(
package.into(),
version,
frontend_dir,
package_manager,
versions.get(package).cloned(),
);
items.push(item);
}
}
Expand All @@ -155,12 +170,17 @@ pub fn nodejs_section_item(
version: Option<String>,
frontend_dir: PathBuf,
package_manager: PackageManager,
current_version: Option<semver::Version>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any differences between this and the version parameter above?

) -> SectionItem {
SectionItem::new().action(move || {
let version = version.clone().unwrap_or_else(|| {
package_manager
.current_package_version(&package, &frontend_dir)
.unwrap_or_default()
current_version
.map(|v| v.to_string())
.or_else(|| {
package_manager
.current_package_version(&package, &frontend_dir)
.unwrap_or_default()
})
.unwrap_or_default()
});

Expand Down
18 changes: 16 additions & 2 deletions crates/tauri-cli/src/info/plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,20 @@ pub fn items(
if let Some(tauri_dir) = tauri_dir {
let (manifest, lock) = cargo_manifest_and_lock(tauri_dir);

for p in helpers::plugins::known_plugins().keys() {
let known_plugins = helpers::plugins::known_plugins();
let npm_plugins = if let Some(frontend_dir) = frontend_dir {
let npm_names: Vec<String> = known_plugins
.keys()
.map(|plugin_name| format!("@tauri-apps/plugin-{plugin_name}"))
.collect();
package_manager
.current_package_versions(&npm_names, frontend_dir)
.unwrap_or_default()
} else {
HashMap::new()
};

for p in known_plugins.keys() {
let dep = format!("tauri-plugin-{p}");
let crate_version = crate_version(tauri_dir, manifest.as_ref(), lock.as_ref(), &dep);
if !crate_version.has_version() {
Expand All @@ -131,10 +144,11 @@ pub fn items(
let package = format!("@tauri-apps/plugin-{p}");

let item = packages_nodejs::nodejs_section_item(
package,
package.clone(),
None,
frontend_dir.clone(),
package_manager,
npm_plugins.get(&package).cloned(),
);
items.push(item);
}
Expand Down
Loading