diff --git a/bundles/element-web/items.py b/bundles/element-web/items.py index d006df3..0edf9c9 100644 --- a/bundles/element-web/items.py +++ b/bundles/element-web/items.py @@ -25,11 +25,15 @@ files = { }, } +extra_install_cmds = [] +if node.metadata.get('nodejs/version') >= 17: + # TODO verify this is still needed when upgrading to 1.12 + extra_install_cmds.append('export NODE_OPTIONS=--openssl-legacy-provider') + actions = { 'element-web_yarn': { 'command': ' && '.join([ - # TODO verify this is still needed when upgrading to 1.12 - 'export NODE_OPTIONS=--openssl-legacy-provider', + *extra_install_cmds, 'cd /opt/element-web', 'yarn install --pure-lockfile --ignore-scripts', 'yarn build', diff --git a/bundles/nodejs/metadata.py b/bundles/nodejs/metadata.py index f41aa5e..4609903 100644 --- a/bundles/nodejs/metadata.py +++ b/bundles/nodejs/metadata.py @@ -9,13 +9,16 @@ defaults = { 'nodejs': {}, }, }, + 'nodejs': { + 'version': 18, + }, } @metadata_reactor.provides( 'apt/repos/nodejs/items', ) def nodejs_from_version(metadata): - version = metadata.get('nodejs/version', 18) + version = metadata.get('nodejs/version') return { 'apt': { 'repos': {