From: Stefano Tondo <stondo@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>,
Joshua Watt <JPEWhacker@gmail.com>,
Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>,
Peter Marko <peter.marko@siemens.com>,
stefano.tondo.ext@siemens.com
Subject: [PATCH 08/10] npm: Check that SRC_URI lists all dependencies of the shrinkwrap file
Date: Fri, 20 Nov 2026 14:53:39 +0100 [thread overview]
Message-ID: <20261120135342.2628228-9-stondo@gmail.com> (raw)
In-Reply-To: <20261120135342.2628228-1-stondo@gmail.com>
From: Stefano Tondo <stefano.tondo.ext@siemens.com>
When a recipe lists the npm dependencies in SRC_URI, the list can become
different from npm-shrinkwrap.json, for example after an upgrade. Then
npm.bbclass packs a wrong set of dependencies.
If SRC_URI has no npmsw:// entry, compare SRC_URI with the shrinkwrap
file in do_configure. Fail if a dependency is missing, or if an entry
unpacks into node_modules but the shrinkwrap file does not have it. The
error tells the user to run the update task.
Do not check with externalsrc, which removes the dependencies from
SRC_URI. There the external source tree must contain them.
Signed-off-by: Stefano Tondo <stefano.tondo.ext@siemens.com>
---
meta/classes-recipe/npm.bbclass | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/meta/classes-recipe/npm.bbclass b/meta/classes-recipe/npm.bbclass
index 6f3261238d..e0d3d88d2b 100644
--- a/meta/classes-recipe/npm.bbclass
+++ b/meta/classes-recipe/npm.bbclass
@@ -111,6 +111,24 @@ def npm_pack(env, srcdir, workdir, excludes=None):
return (tarball, j)
+def npm_check_src_uri(d, shrinkwrap):
+ """Check that SRC_URI has one entry for each dependency of the shrinkwrap file"""
+ import oe.npm
+
+ destdir = os.path.relpath(d.getVar("S"), d.getVar("UNPACKDIR"))
+ dev = bb.utils.to_boolean(d.getVar("NPM_INSTALL_DEV"), False)
+ try:
+ expected = oe.npm.shrinkwrap_src_uri(shrinkwrap, destdir, dev)
+ except ValueError as e:
+ bb.fatal("npm-shrinkwrap.json: %s" % e)
+
+ missing, extra = oe.npm.src_uri_differences(expected, d.getVar("SRC_URI").split())
+ if missing or extra:
+ bb.fatal("SRC_URI does not match npm-shrinkwrap.json (%d missing, %d extra entries). "
+ "Inherit npm-update-dependencies and run 'bitbake -c update_npm_deps %s'.\n%s"
+ % (len(missing), len(extra), d.getVar("PN"),
+ "\n".join(["missing: " + url for url in missing] + ["extra: " + url for url in extra])))
+
python npm_do_configure() {
"""
Step one: configure the npm cache and the main npm package
@@ -177,6 +195,12 @@ python npm_do_configure() {
if int(orig_shrinkwrap.get("lockfileVersion", 0)) < 2:
bb.fatal("%s: lockfileVersion version 2 or later is required" % orig_shrinkwrap_file)
+ # externalsrc removes the dependencies from SRC_URI: the external
+ # source tree must contain them
+ if not d.getVar("EXTERNALSRC") and \
+ not any(url.startswith("npmsw://") for url in d.getVar("SRC_URI").split()):
+ npm_check_src_uri(d, orig_shrinkwrap)
+
cached_shrinkwrap = copy.deepcopy(orig_shrinkwrap)
for package in orig_shrinkwrap["packages"]:
if package != "":
--
2.56.1
next prev parent reply other threads:[~2026-11-20 13:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 13:53 [PATCH 00/10] npm: list the dependencies in SRC_URI Stefano Tondo
2026-11-20 13:53 ` [PATCH 01/10] recipetool: create_npm: Give the fallback licenses as a string Stefano Tondo
2026-11-20 13:53 ` [PATCH 02/10] recipetool: create: Get the checksum of npm packages from the registry Stefano Tondo
2026-11-20 13:53 ` [PATCH 03/10] recipetool: create_npm: Give the package fallback licenses as strings Stefano Tondo
2026-11-20 13:53 ` [PATCH 04/10] recipetool: create_npm: Remove the "@" of a scope from generated names Stefano Tondo
2026-11-20 14:04 ` Patchtest results for " patchtest
2026-11-20 13:53 ` [PATCH 05/10] oeqa/selftest: recipetool: Expect the npm source in UNPACKDIR Stefano Tondo
2026-11-20 13:53 ` [PATCH 06/10] lib/oe/npm: Add SRC_URI entries for the dependencies of a shrinkwrap file Stefano Tondo
2026-11-20 13:53 ` [PATCH 07/10] npm-update-dependencies: Add a class to list the npm dependencies Stefano Tondo
2026-11-20 13:53 ` Stefano Tondo [this message]
2026-11-20 13:53 ` [PATCH 09/10] recipetool: create: Clean the recipe after its tasks Stefano Tondo
2026-11-20 13:53 ` [PATCH 10/10] recipetool: create_npm: List the npm dependencies in SRC_URI Stefano Tondo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120135342.2628228-9-stondo@gmail.com \
--to=stondo@gmail.com \
--cc=JPEWhacker@gmail.com \
--cc=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=peter.marko@siemens.com \
--cc=stefan.herbrechtsmeier@weidmueller.com \
--cc=stefano.tondo.ext@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox