Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into feat/2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Oct 26, 2024
2 parents ad1908c + c09aeec commit c6fc23c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"ajv": "^8.17.1",
"bind-decorator": "^1.0.11",
"connect-gzip-static": "3.0.1",
"debounce": "^2.1.1",
"debounce": "^2.2.0",
"fast-deep-equal": "^3.1.3",
"finalhandler": "^1.3.1",
"git-last-commit": "^1.0.1",
Expand Down Expand Up @@ -70,27 +70,27 @@
"@babel/plugin-proposal-decorators": "^7.25.7",
"@babel/preset-env": "^7.25.8",
"@babel/preset-typescript": "^7.25.7",
"@eslint/core": "^0.6.0",
"@eslint/js": "^9.12.0",
"@eslint/core": "^0.7.0",
"@eslint/js": "^9.13.0",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@types/eslint__js": "^8.42.3",
"@types/finalhandler": "^1.2.3",
"@types/humanize-duration": "^3.27.4",
"@types/jest": "^29.5.13",
"@types/js-yaml": "^4.0.9",
"@types/node": "^22.7.5",
"@types/node": "^22.7.7",
"@types/object-assign-deep": "^0.4.3",
"@types/readable-stream": "4.0.15",
"@types/sd-notify": "^2.8.2",
"@types/ws": "8.5.12",
"babel-jest": "^29.7.0",
"eslint": "^9.12.0",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"jest": "^29.7.0",
"prettier": "^3.3.3",
"tmp": "^0.2.3",
"typescript": "^5.6.3",
"typescript-eslint": "^8.8.1"
"typescript-eslint": "^8.10.0"
},
"pnpm": {
"overrides": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/testExternalConverter.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ const sandbox = {
};
vm.runInNewContext(moduleCode, sandbox, moduleFakePath);
const converter = sandbox.module.exports;
assert(!converter.toZigbee.includes(undefined));
assert(!converter.fromZigbee.includes(undefined));
assert(!converter.toZigbee || !converter.toZigbee.includes(undefined));
assert(!converter.fromZigbee || !converter.fromZigbee.includes(undefined));
12 changes: 4 additions & 8 deletions test/extensions/bridge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,7 @@ describe('Extension: Bridge', () => {
{
access: 7,
category: 'config',
description:
'Controls the behavior when the device is powered on after power loss. If you get an `UNSUPPORTED_ATTRIBUTE` error, the device does not support it.',
description: 'Controls the behavior when the device is powered on after power loss',
label: 'Power-on behavior',
name: 'power_on_behavior',
property: 'power_on_behavior',
Expand Down Expand Up @@ -586,8 +585,7 @@ describe('Extension: Bridge', () => {
{
access: 7,
category: 'config',
description:
'Controls the behavior when the device is powered on after power loss. If you get an `UNSUPPORTED_ATTRIBUTE` error, the device does not support it.',
description: 'Controls the behavior when the device is powered on after power loss',
label: 'Power-on behavior',
name: 'power_on_behavior',
property: 'power_on_behavior',
Expand Down Expand Up @@ -1954,8 +1952,7 @@ describe('Extension: Bridge', () => {
{
access: 7,
category: 'config',
description:
'Controls the behavior when the device is powered on after power loss. If you get an `UNSUPPORTED_ATTRIBUTE` error, the device does not support it.',
description: 'Controls the behavior when the device is powered on after power loss',
label: 'Power-on behavior',
name: 'power_on_behavior',
property: 'power_on_behavior',
Expand Down Expand Up @@ -2382,8 +2379,7 @@ describe('Extension: Bridge', () => {
{
access: 7,
category: 'config',
description:
'Controls the behavior when the device is powered on after power loss. If you get an `UNSUPPORTED_ATTRIBUTE` error, the device does not support it.',
description: 'Controls the behavior when the device is powered on after power loss',
label: 'Power-on behavior',
name: 'power_on_behavior',
property: 'power_on_behavior',
Expand Down

0 comments on commit c6fc23c

Please sign in to comment.