Skip to content

node: Fails to read package-lock.json entries without resolved field #295

@gasinvein

Description

@gasinvein

flatpak-builder version

1.2.2

Linux distribution and version

Fedora 36

Affected flatpak-builder tool

node/flatpak-node-generator.py

flatpak-builder tool cli args

-r

Source repository URL

https://github.com/bitwarden/desktop.git

Flatpak-builder manifest URL

No response

Description

Seems like a regression introduced in #287, merged as part of #289
Quickfix is as simple as making the ResolvedSource.resolved property optional:

diff --git a/node/flatpak_node_generator/providers/npm.py b/node/flatpak_node_generator/providers/npm.py
index eeab9cf..e991884 100644
--- a/node/flatpak_node_generator/providers/npm.py
+++ b/node/flatpak_node_generator/providers/npm.py
@@ -65,7 +65,7 @@ class NpmLockfileProvider(LockfileProvider):
                 source = LocalSource(path=version[len('file:'):])
             else:
                 integrity = Integrity.parse(info['integrity'])
-                source = ResolvedSource(resolved=info['resolved'], integrity=integrity)
+                source = ResolvedSource(resolved=info.get('resolved'), integrity=integrity)
 
             yield Package(name=name, version=version, source=source, lockfile=lockfile)
 

although I'm not sure if it's a proper fix.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions