Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-setopbject-return
Browse files Browse the repository at this point in the history
foxriver76 authored Nov 17, 2024
2 parents b5653b0 + 48cb996 commit f57945b
Showing 310 changed files with 1,835 additions and 1,784 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.0.3",
"version": "7.0.4-alpha.0-20241116-db3148f4f",
"command": {
"run": {
"stream": true
35 changes: 17 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@iobroker/js-controller-adapter",
"type": "module",
"version": "7.0.3",
"version": "7.0.4-alpha.0-20241116-db3148f4f",
"engines": {
"node": ">=18.0.0"
},
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@iobroker/js-controller-cli",
"type": "module",
"version": "7.0.3",
"version": "7.0.4-alpha.0-20241116-db3148f4f",
"engines": {
"node": ">=18.0.0"
},
2 changes: 1 addition & 1 deletion packages/common-db/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@iobroker/js-controller-common-db",
"type": "module",
"version": "7.0.3",
"version": "7.0.4-alpha.0-20241116-db3148f4f",
"engines": {
"node": ">=18.0.0"
},
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@iobroker/js-controller-common",
"type": "module",
"version": "7.0.3",
"version": "7.0.4-alpha.0-20241116-db3148f4f",
"engines": {
"node": ">=12.0.0"
},
4 changes: 3 additions & 1 deletion packages/controller/doc/-internal-/README.md
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
- [LicenseInformationFree](interfaces/LicenseInformationFree.md)
- [LicenseInformationWithPayment](interfaces/LicenseInformationWithPayment.md)
- [Logger](interfaces/Logger.md)
- [LogObject](interfaces/LogObject.md)
- [LogMessage](interfaces/LogMessage.md)
- [Message](interfaces/Message.md)
- [MessageCallbackInfo](interfaces/MessageCallbackInfo.md)
- [MessageCallbackObject](interfaces/MessageCallbackObject.md)
@@ -272,7 +272,9 @@
- [Languages](type-aliases/Languages.md)
- [LicenseInformation](type-aliases/LicenseInformation.md)
- [LocalLink](type-aliases/LocalLink.md)
- [LogFunction](type-aliases/LogFunction.md)
- [LogLevel](type-aliases/LogLevel.md)
- [LogMessageInternal](type-aliases/LogMessageInternal.md)
- [MaybePromise](type-aliases/MaybePromise.md)
- [MessageCallback](type-aliases/MessageCallback.md)
- [MessageHandler](type-aliases/MessageHandler.md)
14 changes: 7 additions & 7 deletions packages/controller/doc/-internal-/classes/Log.md
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ logger instance

#### Defined in

[adapter/src/lib/adapter/log.ts:17](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L17)
[adapter/src/lib/adapter/log.ts:25](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L25)

## Properties

@@ -56,7 +56,7 @@ Verbosity of the log output

#### Defined in

[adapter/src/lib/adapter/log.ts:8](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L8)
[adapter/src/lib/adapter/log.ts:10](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L10)

## Methods

@@ -80,7 +80,7 @@ log a message with debug level

#### Defined in

[adapter/src/lib/adapter/log.ts:37](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L37)
[adapter/src/lib/adapter/log.ts:45](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L45)

***

@@ -104,7 +104,7 @@ log a message with error severity

#### Defined in

[adapter/src/lib/adapter/log.ts:45](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L45)
[adapter/src/lib/adapter/log.ts:53](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L53)

***

@@ -128,7 +128,7 @@ log a message with info level (default output level for all adapters)

#### Defined in

[adapter/src/lib/adapter/log.ts:41](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L41)
[adapter/src/lib/adapter/log.ts:49](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L49)

***

@@ -152,7 +152,7 @@ log a message with silly level

#### Defined in

[adapter/src/lib/adapter/log.ts:33](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L33)
[adapter/src/lib/adapter/log.ts:41](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L41)

***

@@ -176,4 +176,4 @@ log a message with warning severity

#### Defined in

[adapter/src/lib/adapter/log.ts:49](https://github.com/ioBroker/ioBroker.js-controller/blob/dae94f706cc75e41fc7f1fe6bb283f8c8f9ede06/packages/adapter/src/lib/adapter/log.ts#L49)
[adapter/src/lib/adapter/log.ts:57](https://github.com/ioBroker/ioBroker.js-controller/blob/db3148f4f009815e1f45f53311ac77bd26045ce1/packages/adapter/src/lib/adapter/log.ts#L57)
Loading

0 comments on commit f57945b

Please sign in to comment.