Unverified Commit 77571a84 authored by Lily Foster's avatar Lily Foster
Browse files

prefetch-npm-deps: use default value when lockfile has no deps

parent daec4bf7

pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs

+9 −12
Original line number Diff line number Diff line
@@ -18,23 +18,20 @@ pub(super) fn packages(content: &str) -> anyhow::Result<Vec<Package>> { 
        1 => {

            let initial_url = get_initial_url()?;



            lockfile

                .dependencies

                .map(|p| to_new_packages(p, &initial_url))

                .transpose()?

            to_new_packages(lockfile.dependencies.unwrap_or_default(), &initial_url)?

        }

        2 | 3 => lockfile.packages.map(|pkgs| {

            pkgs.into_iter()

        2 | 3 => lockfile

            .packages

            .unwrap_or_default()

            .into_iter()

            .filter(|(n, p)| !n.is_empty() && matches!(p.resolved, Some(UrlOrString::Url(_))))

            .map(|(n, p)| Package { name: Some(n), ..p })

                .collect()

        }),

            .collect(),

        _ => bail!(

            "We don't support lockfile version {}, please file an issue.",

            lockfile.version

        ),

    }

    .expect("lockfile should have packages");

    };



    packages.par_sort_by(|x, y| {

        x.resolved