Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/21.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Oct 31, 2024
2 parents 56210a0 + a1fc163 commit 11fdb1f
Show file tree
Hide file tree
Showing 60 changed files with 6,821 additions and 8,389 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"image": "mcr.microsoft.com/devcontainers/javascript-node:20",

"postCreateCommand": "npm install",
"postCreateCommand": "pnpm i --frozen-lockfile",

"customizations": {
"vscode": {
Expand Down
4 changes: 4 additions & 0 deletions .github/nitpicks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
Since you are the file owner, could you check this @martyn-vesternet?
pathFilter:
- 'src/devices/vesternet.ts'
- markdown: |
Since you are the file owner, could you check this @candeodevelopment / @dhc25?
pathFilter:
- 'src/devices/candeo.ts'
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,31 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache: pnpm
- name: Install dependencies
run: npm ci
run: pnpm i --frozen-lockfile
- name: Build
run: npm run build
run: pnpm run build
- name: Lint
run: |
npm run pretty:check
npm run eslint
pnpm run pretty:check
pnpm run eslint
- name: Test
run: npm test
run: pnpm test
- name: Publish new release
if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
run: |
npm publish
pnpm publish --no-git-checks
PACKAGE=$(node -p "require('./package.json').name")
VERSION=$(node -p "require('./package.json').version")
until [ $(npm view $PACKAGE --json | jq --arg version "$VERSION" -r '.versions[] | select (. == $version)') ];
until [ $(pnpm view $PACKAGE --json | jq --arg version "$VERSION" -r '.versions[] | select (. == $version)') ];
do
echo "Waiting for publish to complete"
sleep 5s
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/update_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ jobs:
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_TOKEN }}
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
- run: npx npm-check-updates -u
- run: rm -f package-lock.json
- run: npm install
cache: pnpm
- run: pnpm up --latest
- uses: peter-evans/create-pull-request@v7
env:
HUSKY: '0'
Expand Down
8 changes: 4 additions & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
npm run pretty:check
npm run eslint
npm run test
npm run build
pnpm run pretty:check
pnpm run eslint
pnpm run test
pnpm run build
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
package-lock.json
pnpm-lock.yaml
CHANGELOG.md
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "20.25.0"
".": "20.38.0"
}
245 changes: 245 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ See [Zigbee2MQTT how to support new devices](https://www.zigbee2mqtt.io/advanced
If you'd like to submit a pull request, you should run the following commands to ensure your changes will pass the tests:

```sh
npm install
npm run eslint -- --fix
npm run pretty:write
npm run build
npm test
npm install -g pnpm
pnpm install --frozen-lockfile
pnpm run eslint -- --fix
pnpm run pretty:write
pnpm run build
pnpm test
```

If any of those commands finish with an error your PR won't pass the tests and will likely be rejected.
Loading

0 comments on commit 11fdb1f

Please sign in to comment.