Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into XRT-2801-branch
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/stale.yml
#	.github/workflows/update_deps.yml
#	CHANGELOG.md
#	src/controller/model/endpoint.ts
  • Loading branch information
AIM289 committed Feb 15, 2024
2 parents 37c5ceb + 1c68ce3 commit ac1954c
Show file tree
Hide file tree
Showing 108 changed files with 6,646 additions and 6,582 deletions.
4 changes: 0 additions & 4 deletions .babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ module.exports = {
'@babel/env',
'@babel/typescript',
],
plugins: [
"@babel/proposal-object-rest-spread",
"@babel/proposal-class-properties"
]
};
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ module.exports = {
"@typescript-eslint/semi": ["error"],
"array-bracket-spacing": ["error", "never"],
"indent": ["error", 4],
"max-len": ["error", { "code": 120 }],
"max-len": ["error", { "code": 150 }],
"no-return-await": "error",
"object-curly-spacing": ["error", "never"],
"@typescript-eslint/no-floating-promises": "error",
}
}
18 changes: 18 additions & 0 deletions .github/workflows/release_please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: release-please

on:
push:
branches:
- master

permissions:
contents: write
pull-requests: write

jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v4
with:
token: ${{ secrets.GH_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist/
.idea
temp/
.remote-sync.json
tsconfig.tsbuildinfo
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ coverage
.travis.yml
.jenkins.yml
.codeclimate.yml
tsconfig.tsbuildinfo

#linters
.jscsrc
Expand Down
3 changes: 3 additions & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
".": "0.33.9"
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"typescript.preferences.importModuleSpecifier": "relative",
"[typescript]": {
"editor.codeActionsOnSave": {
"source.organizeImports": false
"source.organizeImports": "never"
}
},
}
517 changes: 517 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ It was originally forked from zigbee-shepherd with the goal to refactor it to im

# API Documentation

* [Class Controller](docs/api/classes/_src_controller_controller_.controller.md)
* [Events emitted by Controller](docs/api/modules/_src_controller_events_.md)
* [Class Device](docs/api/classes/_src_controller_model_device_.device.md)
* [Class Endpoint](docs/api/classes/_src_controller_model_endpoint_.endpoint.md)
* [Class Group](docs/api/classes/_src_controller_model_group_.group.md)
For automatically generated API reference documentation, see: [tsdocs.dev](https://tsdocs.dev/docs/zigbee-herdsman).


# Changelog
Expand Down Expand Up @@ -47,7 +43,7 @@ It was originally forked from zigbee-shepherd with the goal to refactor it to im

## Zigbee2MQTT

[Zigbee2MQTT](https://github.com/Koenkk/zigbee2mqtt) is a Zigbee to MQTT gateway. It bridges events and allows you to control your Zigbee devices via MQTT. Allows you to use your Zigbee devices without the vendors or propritary and closed sources bridges or gateways. Zigbee2MQTT also keeps track of the state of the system and the capabilities of connected devices. It uses zigbee-herdsman as a module to handle low-level core Zigbee communication.
[Zigbee2MQTT](https://github.com/Koenkk/zigbee2mqtt) is a Zigbee to MQTT gateway. It bridges events and allows you to control your Zigbee devices via MQTT. Allows you to use your Zigbee devices without the vendors or propritary and closed sources bridges or gateways. Zigbee2MQTT also keeps track of the state of the system and the capabilities of connected devices. It uses zigbee-herdsman and [zigbee-herdsman-converters](https://github.com/Koenkk/zigbee-herdsman-converters) as modules to handle low-level core Zigbee communication.

## ioBroker

Expand Down
17 changes: 0 additions & 17 deletions docs/api/README.md

This file was deleted.

Loading

0 comments on commit ac1954c

Please sign in to comment.