Skip to content

Commit

Permalink
Merge branch 'dev' into fix/refactor-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk authored Dec 15, 2024
2 parents 2344ffd + 9822c75 commit 0d5245e
Show file tree
Hide file tree
Showing 3 changed files with 172 additions and 189 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ COPY package.json pnpm-lock.yaml ./
RUN apk add make gcc g++ python3 linux-headers npm && \
npm install -g pnpm && \
pnpm install --frozen-lockfile --no-optional && \
# Serialport requires to be re-build, otherwise starts fails
# See e.g. https://github.com/Koenkk/zigbee2mqtt/issues/25092
pnpm rebuild
# serialport has outdated prebuilds that appear to fail on some archs, force build on target platform
rm -rf `find ./node_modules/.pnpm/ -wholename "*/@serialport/bindings-cpp/prebuilds" -type d` && \
pnpm rebuild @serialport/bindings-cpp

# Release
FROM base AS release
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"winston-transport": "^4.9.0",
"ws": "^8.18.0",
"zigbee-herdsman": "3.0.4",
"zigbee-herdsman-converters": "21.4.0",
"zigbee-herdsman-converters": "21.5.0",
"zigbee2mqtt-frontend": "0.9.1"
},
"devDependencies": {
Expand All @@ -70,27 +70,27 @@
"@babel/preset-env": "^7.26.0",
"@babel/preset-typescript": "^7.26.0",
"@eslint/core": "^0.9.1",
"@eslint/js": "^9.16.0",
"@eslint/js": "^9.17.0",
"@ianvs/prettier-plugin-sort-imports": "^4.4.0",
"@types/eslint__js": "^8.42.3",
"@types/finalhandler": "^1.2.3",
"@types/humanize-duration": "^3.27.4",
"@types/jest": "^29.5.14",
"@types/js-yaml": "^4.0.9",
"@types/node": "^22.10.1",
"@types/node": "^22.10.2",
"@types/object-assign-deep": "^0.4.3",
"@types/readable-stream": "4.0.18",
"@types/sd-notify": "^2.8.2",
"@types/serve-static": "^1.15.7",
"@types/ws": "8.5.13",
"babel-jest": "^29.7.0",
"eslint": "^9.16.0",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"jest": "^29.7.0",
"prettier": "^3.4.2",
"tmp": "^0.2.3",
"typescript": "^5.7.2",
"typescript-eslint": "^8.17.0"
"typescript-eslint": "^8.18.0"
},
"pnpm": {
"overrides": {
Expand Down
Loading

0 comments on commit 0d5245e

Please sign in to comment.