@@ -5,11 +5,13 @@
#
import errno
+import json
import os
import shutil
import tempfile
import urllib.parse
+import oe.npm
import oe.spdx_license
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
@@ -452,16 +454,26 @@ class RecipetoolCreateTests(RecipetoolBase):
urls.append('npm://registry.npmjs.org/;package=@savoirfairelinux/node-server-example;version=${PV}'
';sha512sum=f2dd7d88cb9a129fbb97eb87a8b5103bab24f783420fd7587f8000a355a12bf7'
'83f1263230afc588123958b73e36bb241f63eaf08119aac5aa2a870bc4de9223')
- urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json')
+ urls.append('file://npm-shrinkwrap.json;subdir=npm')
checkvars['SRC_URI'] = set(urls)
checkvars['S'] = '${UNPACKDIR}/npm'
checkvars['LICENSE:${PN}'] = 'MIT'
checkvars['LICENSE:${PN}-base64'] = 'Unknown'
checkvars['LICENSE:${PN}-accepts'] = 'MIT'
checkvars['LICENSE:${PN}-inherits'] = 'ISC'
- inherits = ['npm']
+ inherits = ['npm', 'npm-update-dependencies']
self._test_recipe_contents(recipefile, checkvars, inherits)
+ # The update task writes one SRC_URI entry for each dependency
+ with open(shrinkwrap) as f:
+ expected = oe.npm.shrinkwrap_src_uri(json.load(f), 'npm')
+ deps_require_file = os.path.join(temprecipe, 'savoirfairelinux-node-server-example-npm-deps.inc')
+ self.assertFileExists(deps_require_file)
+ checkvars = {'SRC_URI': set(expected)}
+ self._test_recipe_contents(deps_require_file, checkvars, [])
+ self.assertTrue(any(url.startswith('npm://registry.npmjs.org/;package=accepts;')
+ and url.endswith(';destsuffix=npm/node_modules/accepts') for url in expected))
+
def test_recipetool_create_github(self):
# Basic test to see if github URL mangling works. Deliberately use an
# older release of Meson at present so we don't need a toml parser.
@@ -784,8 +784,12 @@ def create_recipe(args):
classes.append('bin_package')
handled.append('buildsystem')
+ # Handlers can read the source subdirectory (S relative to UNPACKDIR),
+ # when S is set to it above
+ extravalues['srcsubdir'] = srcsubdir if not args.binary else ''
for handler in handlers:
handler.process(srctree_use, classes, lines_before, lines_after, handled, extravalues)
+ extravalues.pop('srcsubdir', None)
# native and nativesdk classes are special and must be inherited last
# If present, put them at the end of the classes list
@@ -12,6 +12,7 @@ import re
import sys
import tempfile
import bb
+import oe.npm
from bb.fetch.npm import NpmEnvironment
from bb.fetch.npm import npm_package
from bb.fetch.npmsw import foreach_dependencies
@@ -257,33 +258,39 @@ class NpmRecipeHandler(RecipeHandler):
extravalues.setdefault("extrafiles", {})
extravalues["extrafiles"]["npm-shrinkwrap.json"] = shrinkwrap_copy
- url_local = "npmsw://%s" % shrinkwrap_file
- url_recipe= "npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json"
+ has_dependencies = "dependencies" in shrinkwrap.get("packages", {}).get("", {})
- if dev:
- url_local += ";dev=1"
- url_recipe += ";dev=1"
+ # The shrinkwrap file must be in ${S}, where npm.bbclass reads it
+ srcsubdir = extravalues.get("srcsubdir") or "${BP}"
+ url_recipe = "file://npm-shrinkwrap.json;subdir=%s" % srcsubdir
- # Add the npmsw url in the SRC_URI of the generated recipe
+ # Add the shrinkwrap file to the SRC_URI of the generated recipe
def _handle_srcuri(varname, origvalue, op, newlines):
- """Update the version value and add the 'npmsw://' url"""
+ """Update the version value and add the shrinkwrap file"""
value = origvalue.replace("version=" + data["version"], "version=${PV}")
value = value.replace("version=latest", "version=${PV}")
values = [line.strip() for line in value.strip('\n').splitlines()]
- if "dependencies" in shrinkwrap.get("packages", {}).get("", {}):
+ if has_dependencies:
values.append(url_recipe)
return values, None, 4, False
(_, newlines) = bb.utils.edit_metadata(lines_before, ["SRC_URI"], _handle_srcuri)
lines_before[:] = [line.rstrip('\n') for line in newlines]
+ try:
+ dependency_urls = oe.npm.shrinkwrap_src_uri(shrinkwrap, "", dev)
+ except ValueError as e:
+ bb.error("%s: %s" % (shrinkwrap_file, e))
+ sys.exit(14)
+
# In order to generate correct licence checksums in the recipe the
- # dependencies have to be fetched again using the npmsw url
+ # dependencies have to be fetched again
bb.note("Fetching npm dependencies ...")
bb.utils.remove(os.path.join(srctree, "node_modules"), recurse=True)
- fetcher = bb.fetch.Fetch([url_local], d)
- fetcher.download()
- fetcher.unpack(srctree)
+ if dependency_urls:
+ fetcher = bb.fetch.Fetch(dependency_urls, d)
+ fetcher.download()
+ fetcher.unpack(srctree)
bb.note("Handling licences ...")
(licfiles, packages, fallback_licenses) = self._handle_licenses(srctree, shrinkwrap_file, dev)
@@ -297,6 +304,17 @@ class NpmRecipeHandler(RecipeHandler):
classes.append("npm")
handled.append("buildsystem")
+ if has_dependencies:
+ # npm-update-dependencies writes the dependencies to
+ # ${BPN}-npm-deps.inc. Write a stub file, which the task replaces.
+ classes.append("npm-update-dependencies")
+ extravalues["run_tasks"] = "update_npm_deps"
+ stub = os.path.join(tempfile.mkdtemp(prefix="recipetool-npm-"), "npm-deps.inc")
+ with open(stub, "w") as f:
+ f.write("# FROM RECIPETOOL\n")
+ extravalues["extrafiles"]["../{pn}-npm-deps.inc"] = stub
+ lines_before.append("require ${BPN}-npm-deps.inc")
+
# Check if package has peer dependencies and inform the user
self._handle_peer_dependency(shrinkwrap_file)