Skip to content

Commit

Permalink
Merge branch 'master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
xraver authored Dec 11, 2024
2 parents 20028c3 + 0aca991 commit 3e8ab80
Show file tree
Hide file tree
Showing 411 changed files with 21,428 additions and 16,176 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 config set store-dir /home/node/.local/share/pnpm/store && pnpm i --frozen-lockfile",

"customizations": {
"vscode": {
Expand Down
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

55 changes: 0 additions & 55 deletions .eslintrc.json

This file was deleted.

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:coverage
- 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
2 changes: 1 addition & 1 deletion .github/workflows/release_please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v4
- uses: googleapis/release-please-action@v4
with:
token: ${{ secrets.GH_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days'
stale-pr-message: 'This pull request is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days'
days-before-stale: 180
days-before-close: 30
days-before-stale: 60
days-before-close: 7
exempt-issue-labels: dont-stale
operations-per-run: 500
13 changes: 7 additions & 6 deletions .github/workflows/update_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ 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 -x eslint
- run: rm -f package-lock.json
- run: npm install
- uses: peter-evans/create-pull-request@v6
cache: pnpm
- run: pnpm up --latest
- uses: peter-evans/create-pull-request@v7
env:
HUSKY: '0'
with:
commit-message: 'fix(ignore): update dependencies'
branch: 'deps/all'
title: Update dependencies
title: 'fix(ignore): update dependencies'
token: ${{ secrets.GH_TOKEN }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ tmp
/converters/
/devices/
/lib/
tsconfig.tsbuildinfo
tsconfig.tsbuildinfo
coverage/
.jest-tmp/
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
20 changes: 19 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,23 @@
"printWidth": 150,
"bracketSpacing": false,
"endOfLine": "lf",
"tabWidth": 4
"tabWidth": 4,
"importOrder": [
"",
"<TYPES>^(node:)",
"",
"<TYPES>",
"",
"<TYPES>^[.]",
"",
"<BUILTIN_MODULES>",
"",
"<THIRD_PARTY_MODULES>",
"",
"^zigbee",
"",
"^[.]"
],
"importOrderParserPlugins": ["typescript", "decorators"],
"plugins": ["@ianvs/prettier-plugin-sort-imports"]
}
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "19.72.0"
".": "21.3.0"
}
Loading

0 comments on commit 3e8ab80

Please sign in to comment.