Update

5 files changed, 38 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fc7b76bdc16..c11bc8e0ec1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zigbee2mqtt-git
 	pkgdesc = A Zigbee to MQTT bridge
-	pkgver = 1.17.1.r0.g99274c72
+	pkgver = 1.25.0.r68.g7d7f8aab
 	pkgrel = 1
 	url = https://www.zigbee2mqtt.io
 	install = zigbee2mqtt.install
@@ -11,22 +11,23 @@ pkgbase = zigbee2mqtt-git
 	arch = aarch64
 	license = GPL3
 	makedepends = git
+	makedepends = typescript
 	makedepends = npm
 	depends = nodejs>=10.0
+	depends = nodejs<17
 	optdepends = cc-tool: To flash Texas Instruments CC2531 debugger
 	optdepends = mosquitto: MQTT broker
 	provides = zigbee2mqtt
 	conflicts = zigbee2mqtt
 	options = !strip
 	backup = etc/zigbee2mqtt/configuration.yaml
-	source = zigbee2mqtt::git+https://github.com/Koenkk/zigbee2mqtt.git
+	source = zigbee2mqtt::git+https://github.com/Koenkk/zigbee2mqtt.git#branch=dev
 	source = zigbee2mqtt.service
 	source = zigbee2mqtt.sysusers
 	source = zigbee2mqtt.tmpfiles
 	sha256sums = SKIP
-	sha256sums = 36fdca9c274fc143a85cc57d70a36e0ec9455cf86b85d0690ccf0090ee8d682d
-	sha256sums = 3a86716e9036e97d885e9b5f37c7f87d9c2872435e4acf9fc4c9157264cf387b
+	sha256sums = 386ec3aa56c0ce0a761459fe72c2852e05eb094b49ff02d8911ac63cbc708ab7
+	sha256sums = 8a0e9967ad95ee2464b08cf6e985c6b358272214fceb8fdee2eeaaf92e48d32a
 	sha256sums = 8f0fbe06c8d6e8fdf37feb31f244930025d76785451f9049fd90fe6e23c259f6
 
 pkgname = zigbee2mqtt-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..fbcff7666528
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg
+src
+zigbee2mqtt
diff --git a/PKGBUILD b/PKGBUILD
index 3287325e358b..9525fc3e669f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,23 @@
-# Maintainer: buckket <felix@buckket.org>
-
 _pkgname=zigbee2mqtt
 pkgname=zigbee2mqtt-git
-pkgver=1.17.1.r0.g99274c72
+pkgver=1.25.0.r68.g7d7f8aab
 pkgrel=1
 pkgdesc='A Zigbee to MQTT bridge'
 arch=('x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://www.zigbee2mqtt.io'
 license=('GPL3')
-depends=('nodejs>=10.0')
+depends=('nodejs>=10.0' 'nodejs<17')
 conflicts=('zigbee2mqtt')
 provides=('zigbee2mqtt')
-makedepends=('git' 'npm')
+makedepends=('git' 'typescript' 'npm')
 optdepends=(
   'cc-tool: To flash Texas Instruments CC2531 debugger'
   'mosquitto: MQTT broker')
 source=(
-  'zigbee2mqtt::git+https://github.com/Koenkk/zigbee2mqtt.git'
+  'zigbee2mqtt::git+https://github.com/Koenkk/zigbee2mqtt.git#branch=dev'
   'zigbee2mqtt.service'
   'zigbee2mqtt.sysusers'
   'zigbee2mqtt.tmpfiles')
-sha256sums=('SKIP'
-            '36fdca9c274fc143a85cc57d70a36e0ec9455cf86b85d0690ccf0090ee8d682d'
-            '3a86716e9036e97d885e9b5f37c7f87d9c2872435e4acf9fc4c9157264cf387b'
-            '8f0fbe06c8d6e8fdf37feb31f244930025d76785451f9049fd90fe6e23c259f6')
 backup=('etc/zigbee2mqtt/configuration.yaml')
 install='zigbee2mqtt.install'
 options=('!strip')
@@ -34,8 +28,22 @@ pkgver() {
 }
 
 package() {
-  cd "${_pkgname}"
-  npm install -g --user root --prefix "${pkgdir}/usr" --cache "${srcdir}/npm-cache"
+  cd "$srcdir"
+  local _tmp_tar="_tmp.tar"
+  tar cf "$_tmp_tar" --exclude=".git" ${_pkgname}
+  npm install -g --prefix "${pkgdir}/usr" --cache "${srcdir}/npm-cache" "$_tmp_tar"
+  rm "$_tmp_tar"
+
+  cd "${pkgdir}/usr/lib/node_modules/zigbee2mqtt"
+  npm install --save-dev
+  tsc -b .
+  npm prune --production
+  node index.js writehash
+
+  cp lib/util/settings.schema.json dist/util
+  find ${pkgdir} -name "*.d.ts" -delete
+  find ${pkgdir} -name "*.d.ts.map" -delete
+  find ${pkgdir} -name "*.js.map" -delete
 
   find "${pkgdir}/usr" -type d -exec chmod 755 {} +
   chown -R root:root "${pkgdir}"
@@ -48,3 +56,8 @@ package() {
   install -Dm644 "${srcdir}/${_pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf"
   install -Dm644 "${srcdir}/${_pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
 }
+
+sha256sums=('SKIP'
+            '386ec3aa56c0ce0a761459fe72c2852e05eb094b49ff02d8911ac63cbc708ab7'
+            '8a0e9967ad95ee2464b08cf6e985c6b358272214fceb8fdee2eeaaf92e48d32a'
+            '8f0fbe06c8d6e8fdf37feb31f244930025d76785451f9049fd90fe6e23c259f6')
diff --git a/zigbee2mqtt.service b/zigbee2mqtt.service
index a0aed1e61a21..c212e173b33a 100644
--- a/zigbee2mqtt.service
+++ b/zigbee2mqtt.service
@@ -3,12 +3,13 @@ Description=zigbee2mqtt
 After=network.target
 
 [Service]
-ExecStart=node /usr/lib/node_modules/zigbee2mqtt/index.js
+ExecStart=node index.js
 Environment=ZIGBEE2MQTT_DATA=/var/lib/zigbee2mqtt
+WorkingDirectory=/usr/lib/node_modules/zigbee2mqtt
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
 User=zigbee2mqtt
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/zigbee2mqtt.sysusers b/zigbee2mqtt.sysusers
index 44c4d49112cc..30ae76d02930 100644
--- a/zigbee2mqtt.sysusers
+++ b/zigbee2mqtt.sysusers
@@ -1,2 +1,2 @@
 u zigbee2mqtt - "zigbee2mqtt service user"
-m zigbee2mqtt uucp
+m zigbee2mqtt uucp
\ No newline at end of file