diff --git a/lib/extension/entityPublish.js b/lib/extension/entityPublish.js index 1d41e961..beca138b 100644 --- a/lib/extension/entityPublish.js +++ b/lib/extension/entityPublish.js @@ -84,8 +84,7 @@ class EntityPublish extends BaseExtension { mapped = entity.mapped; target = entity.endpoint; converters = entity.mapped.toZigbee; - options = entity.mapped.meta && entity.mapped.meta.options ? entity.mapped.meta.options : {}; - options = {...options, ...entity.settings}; + options = entity.settings; } else { converters = groupConverters; target = entity.group; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 33656442..50fbf0f2 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2767,9 +2767,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "inquirer": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.6.tgz", - "integrity": "sha512-7SVO4h+QIdMq6XcqIqrNte3gS5MzCCKZdsq9DO4PJziBFNYzP3PGFbDjgadDb//MCahzgjCxvQ/O2wa7kx9o4w==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", @@ -14813,9 +14813,9 @@ } }, "zigbee-herdsman-converters": { - "version": "12.0.42", - "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.42.tgz", - "integrity": "sha512-vVgl7SAWIYWT3nHUTDp2+H65E/s9I4VzK/Rid/3tInZHrSMrOWJ3KpbWEJfAHIoVIe/keSCV50Lh1seKnPEc0A==", + "version": "12.0.43", + "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.43.tgz", + "integrity": "sha512-NaU15sX105c3pfailoQYe9hYueRXzYRYkjbDZSPqWFSsgKaLOayIzBl79EV+HjOSSHD/jymM0CJeYOeLpTFWtg==", "requires": { "axios": "*", "tar-stream": "*" diff --git a/package.json b/package.json index b7008be7..12f72355 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "semver": "*", "winston": "*", "zigbee-herdsman": "0.12.60", - "zigbee-herdsman-converters": "12.0.42" + "zigbee-herdsman-converters": "12.0.43" }, "devDependencies": { "eslint": "*",