From ea49dba084da39db4aa45f79039c6b12b20f2497 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Mon, 16 Mar 2026 17:17:07 +0100 Subject: [PATCH 1/3] Use OpenRemote 1.20.0 --- gradle.properties | 2 +- ui/app/custom-react/package.json | 6 +- ui/app/custom/package.json | 6 +- ui/component/model/package.json | 2 +- ui/component/rest/package.json | 4 +- yarn.lock | 1053 +++++++++++++++++++----------- 6 files changed, 694 insertions(+), 379 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9020ef34d..c25d642c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.parallel=true projectName = custom-project version = 1.0-SNAPSHOT -openremoteVersion = 1.18.0 +openremoteVersion = 1.20.0 jacksonVersion = 2.20.1 testLoggerVersion = 4.0.0 diff --git a/ui/app/custom-react/package.json b/ui/app/custom-react/package.json index e454d1b58..d5c503a22 100644 --- a/ui/app/custom-react/package.json +++ b/ui/app/custom-react/package.json @@ -11,9 +11,9 @@ "serve": "npx cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 rspack serve" }, "dependencies": { - "@openremote/core": "~1.18.0", - "@openremote/model": "~1.18.0", - "@openremote/or-mwc-components": "~1.18.0", + "@openremote/core": "~1.20.0", + "@openremote/model": "~1.20.0", + "@openremote/or-mwc-components": "~1.20.0", "react": "^19.2.0", "react-dom": "^19.2.0" }, diff --git a/ui/app/custom/package.json b/ui/app/custom/package.json index c426cd714..15882d882 100644 --- a/ui/app/custom/package.json +++ b/ui/app/custom/package.json @@ -18,14 +18,14 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@openremote/manager": "~1.18.0", - "@openremote/or-app": "~1.18.0", + "@openremote/manager": "~1.20.0", + "@openremote/or-app": "~1.20.0", "lit": "^3.3.1", "model": "workspace:*", "rest": "workspace:*" }, "devDependencies": { - "@openremote/util": "~1.18.0", + "@openremote/util": "~1.20.0", "@rspack/cli": "*", "@rspack/core": "*", "cross-env": "*", diff --git a/ui/component/model/package.json b/ui/component/model/package.json index fb3780c38..0495d49bc 100644 --- a/ui/component/model/package.json +++ b/ui/component/model/package.json @@ -22,7 +22,7 @@ "author": "OpenRemote", "license": "AGPL-3.0-or-later", "devDependencies": { - "@openremote/util": "~1.18.0" + "@openremote/util": "~1.20.0" }, "publishConfig": { "access": "restricted" diff --git a/ui/component/rest/package.json b/ui/component/rest/package.json index 90566ca47..d8fc61922 100644 --- a/ui/component/rest/package.json +++ b/ui/component/rest/package.json @@ -22,11 +22,11 @@ "author": "OpenRemote", "license": "AGPL-3.0-or-later", "dependencies": { - "@openremote/rest": "~1.18.0", + "@openremote/rest": "~1.20.0", "model": "workspace:*" }, "devDependencies": { - "@openremote/util": "~1.18.0", + "@openremote/util": "~1.20.0", "@rspack/core": "*", "typescript": "^5.9.3" }, diff --git a/yarn.lock b/yarn.lock index bac79c080..0f889d701 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,11 +23,11 @@ __metadata: languageName: node linkType: hard -"@custom-elements-manifest/analyzer@npm:^0.10.4": - version: 0.10.10 - resolution: "@custom-elements-manifest/analyzer@npm:0.10.10" +"@custom-elements-manifest/analyzer@npm:^0.11.0": + version: 0.11.0 + resolution: "@custom-elements-manifest/analyzer@npm:0.11.0" dependencies: - "@custom-elements-manifest/find-dependencies": "npm:^0.0.6" + "@custom-elements-manifest/find-dependencies": "npm:^0.0.7" "@github/catalyst": "npm:^1.6.0" "@web/config-loader": "npm:0.1.3" chokidar: "npm:3.5.2" @@ -40,16 +40,17 @@ __metadata: bin: cem: cem.js custom-elements-manifest: cem.js - checksum: 10/e80192497fe8e70fb52c71fda3d1ba21e5ee004df101a2f2654fa3e374b7d52852b853db77377fe8b62b2e1f0d432ae15f7003b2a92b83e1af198eb21c5e2946 + checksum: 10/25774fb464f9b2706c38d02f8b3331528945317a3a86e090ca281b00efd81f727e1dda4a5c3bfa21069a597250d764a209d44774e70b0246e331847e2baa4b2b languageName: node linkType: hard -"@custom-elements-manifest/find-dependencies@npm:^0.0.6": - version: 0.0.6 - resolution: "@custom-elements-manifest/find-dependencies@npm:0.0.6" +"@custom-elements-manifest/find-dependencies@npm:^0.0.7": + version: 0.0.7 + resolution: "@custom-elements-manifest/find-dependencies@npm:0.0.7" dependencies: + oxc-resolver: "npm:^11.9.0" rs-module-lexer: "npm:^2.5.1" - checksum: 10/149fce84ca5dc82b5cb8475d31d4c8828c06c33959d14ca1b14d64e8d831fbcce751dfc3301bfefd1bcd9c2f309533c59c7fb36ec49644747f09c7d7c9a02c95 + checksum: 10/b34c51795d963a39046f4bb125f2da2cbe2f42e11200f6acadb296afa3ad9881aba3ef91fe75cc7266d2e3507784ca99859baf8cca842a68872630b58330e931 languageName: node linkType: hard @@ -70,6 +71,16 @@ __metadata: languageName: node linkType: hard +"@emnapi/core@npm:^1.7.1": + version: 1.8.1 + resolution: "@emnapi/core@npm:1.8.1" + dependencies: + "@emnapi/wasi-threads": "npm:1.1.0" + tslib: "npm:^2.4.0" + checksum: 10/904ea60c91fc7d8aeb4a8f2c433b8cfb47c50618f2b6f37429fc5093c857c6381c60628a5cfbc3a7b0d75b0a288f21d4ed2d4533e82f92c043801ef255fd6a5c + languageName: node + linkType: hard + "@emnapi/runtime@npm:^1.5.0": version: 1.6.0 resolution: "@emnapi/runtime@npm:1.6.0" @@ -79,6 +90,15 @@ __metadata: languageName: node linkType: hard +"@emnapi/runtime@npm:^1.7.1": + version: 1.8.1 + resolution: "@emnapi/runtime@npm:1.8.1" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10/26725e202d4baefdc4a6ba770f703dfc80825a27c27a08c22bac1e1ce6f8f75c47b4fe9424d9b63239463c33ef20b650f08d710da18dfa1164a95e5acb865dba + languageName: node + linkType: hard + "@emnapi/wasi-threads@npm:1.1.0": version: 1.1.0 resolution: "@emnapi/wasi-threads@npm:1.1.0" @@ -245,6 +265,24 @@ __metadata: languageName: node linkType: hard +"@jsep-plugin/assignment@npm:^1.3.0": + version: 1.3.0 + resolution: "@jsep-plugin/assignment@npm:1.3.0" + peerDependencies: + jsep: ^0.4.0||^1.0.0 + checksum: 10/0c93b703d84af95b4be9fb6c23fbdbe7c7b6985b41c98fd10386cd54686ed1eb751cb39f5d54abcb621e4da2a0900a3b2a852e5bf7f2d322b756db3b22e42a45 + languageName: node + linkType: hard + +"@jsep-plugin/regex@npm:^1.0.4": + version: 1.0.4 + resolution: "@jsep-plugin/regex@npm:1.0.4" + peerDependencies: + jsep: ^0.4.0||^1.0.0 + checksum: 10/0ea6ba81f03955972b762fd9fbc8e3fd7e1c1c12e52ce3d4366e23c0a63c8bff8528687b8b3d8f641cf9f626f8bf5a7841efcd31a2489fe967e1900e5738ee3a + languageName: node + linkType: hard + "@jsonforms/core@npm:^3.5.1": version: 3.7.0 resolution: "@jsonforms/core@npm:3.7.0" @@ -487,6 +525,15 @@ __metadata: languageName: node linkType: hard +"@maplibre/mlt@npm:^1.1.6": + version: 1.1.7 + resolution: "@maplibre/mlt@npm:1.1.7" + dependencies: + "@mapbox/point-geometry": "npm:^1.1.0" + checksum: 10/42facefd954d0bfdf5253a267b9b4a950c360dc8c2ded8f87a744f6d2d2d79a09813010092259752b1f86363965b096c62f679d420703c81b7fae8bb0868dbec + languageName: node + linkType: hard + "@maplibre/vt-pbf@npm:^4.2.0": version: 4.2.1 resolution: "@maplibre/vt-pbf@npm:4.2.1" @@ -502,6 +549,21 @@ __metadata: languageName: node linkType: hard +"@maplibre/vt-pbf@npm:^4.2.1": + version: 4.3.0 + resolution: "@maplibre/vt-pbf@npm:4.3.0" + dependencies: + "@mapbox/point-geometry": "npm:^1.1.0" + "@mapbox/vector-tile": "npm:^2.0.4" + "@maplibre/geojson-vt": "npm:^5.0.4" + "@types/geojson": "npm:^7946.0.16" + "@types/supercluster": "npm:^7.1.3" + pbf: "npm:^4.0.1" + supercluster: "npm:^8.0.1" + checksum: 10/2839a0ee0a2a0421f8bbc86a53b563b00b95182bef48ce32cf0bc201a3f2c616df2753e64379d703b63568b647b7ea5b46e09a3f378d11a0ee41d6e26d7f8d88 + languageName: node + linkType: hard + "@material/animation@npm:^9.0.0": version: 9.0.0 resolution: "@material/animation@npm:9.0.0" @@ -1146,6 +1208,17 @@ __metadata: languageName: node linkType: hard +"@napi-rs/wasm-runtime@npm:^1.1.1": + version: 1.1.1 + resolution: "@napi-rs/wasm-runtime@npm:1.1.1" + dependencies: + "@emnapi/core": "npm:^1.7.1" + "@emnapi/runtime": "npm:^1.7.1" + "@tybys/wasm-util": "npm:^0.10.1" + checksum: 10/080e7f2aefb84e09884d21c650a2cbafdf25bfd2634693791b27e36eec0ddaa3c1656a943f8c913ac75879a0b04e68f8a827897ee655ab54a93169accf05b194 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -1202,14 +1275,14 @@ __metadata: languageName: node linkType: hard -"@openremote/core@npm:1.18.0, @openremote/core@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/core@npm:1.18.0" +"@openremote/core@npm:1.20.0, @openremote/core@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/core@npm:1.20.0" dependencies: - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" - axios: "npm:1.13.2" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" + axios: "npm:1.13.6" i18next: "npm:^21.5.3" i18next-http-backend: "npm:^1.3.1" keycloak-js: "npm:^25.0.1" @@ -1218,7 +1291,7 @@ __metadata: platform: "npm:^1.3.6" qs: "npm:^6.8.0" url-search-params-polyfill: "npm:^8.1.0" - checksum: 10/d33fca9105b0c254aad681a5cadd6bfa74385b72451f0bb5627db6634c63ad41e4721c7f2201a08d9917ef7ce9b4c74f8512a2ab7b4b9bfdb16cf6698175ef7e + checksum: 10/adbc2b01c322aadae2c55f1689c38ce68965df58050c2ba109b60e8b7cf71b76bbda5a351383066f4a53a688a3370abb28bbb52e7b403ba0806e47ad9ceb162b languageName: node linkType: hard @@ -1226,9 +1299,9 @@ __metadata: version: 0.0.0-use.local resolution: "@openremote/custom-react@workspace:ui/app/custom-react" dependencies: - "@openremote/core": "npm:~1.18.0" - "@openremote/model": "npm:~1.18.0" - "@openremote/or-mwc-components": "npm:~1.18.0" + "@openremote/core": "npm:~1.20.0" + "@openremote/model": "npm:~1.20.0" + "@openremote/or-mwc-components": "npm:~1.20.0" "@rspack/cli": "npm:~1.7.1" "@rspack/core": "npm:~1.7.1" "@types/react": "npm:^19.2.2" @@ -1246,9 +1319,9 @@ __metadata: version: 0.0.0-use.local resolution: "@openremote/custom@workspace:ui/app/custom" dependencies: - "@openremote/manager": "npm:~1.18.0" - "@openremote/or-app": "npm:~1.18.0" - "@openremote/util": "npm:~1.18.0" + "@openremote/manager": "npm:~1.20.0" + "@openremote/or-app": "npm:~1.20.0" + "@openremote/util": "npm:~1.20.0" "@rspack/cli": "npm:*" "@rspack/core": "npm:*" cross-env: "npm:*" @@ -1262,342 +1335,342 @@ __metadata: languageName: unknown linkType: soft -"@openremote/manager@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/manager@npm:1.18.0" +"@openremote/manager@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/manager@npm:1.20.0" dependencies: "@lit/task": "npm:^1.0.3" "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-app": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-asset-viewer": "npm:1.18.0" - "@openremote/or-attribute-picker": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-dashboard-builder": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-json-forms": "npm:1.18.0" - "@openremote/or-log-viewer": "npm:1.18.0" - "@openremote/or-map": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-rules": "npm:1.18.0" - "@openremote/or-services": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-app": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-asset-viewer": "npm:1.20.0" + "@openremote/or-attribute-picker": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-dashboard-builder": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-json-forms": "npm:1.20.0" + "@openremote/or-log-viewer": "npm:1.20.0" + "@openremote/or-map": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-rules": "npm:1.20.0" + "@openremote/or-services": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" "@reduxjs/toolkit": "npm:^1.8.1" iso-639-1: "npm:^3.1.3" lit: "npm:^3.3.1" maplibre-gl: "npm:^5.12.0" moment: "npm:^2.29.4" reselect: "npm:^4.1.8" - checksum: 10/db79f99f114a4e621427b2211c2acc5f2cf29102b14818af9d66a57c8b4708378a8af940377d1eae182b6ed7008e28a0e4b71ccdebad2dd674371fd623313d7e + checksum: 10/3d341a0b0efcb7848eb8486496a736c592d06e54c7e215e566a994c665fc90a6a891877735e1f4513437a5bb6b89a5ad03dfda0cca774cfb03629cc5f036288e languageName: node linkType: hard -"@openremote/model@npm:1.18.0, @openremote/model@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/model@npm:1.18.0" - checksum: 10/4106e8d47cd884c6c29b1ccfbc1a3527f2c19ae113d2e7e5bae7b01c35e4c6f9b25717f4fb45abd5143c8ce1a36d0d913da89944e826caa208692d730dafe4f5 +"@openremote/model@npm:1.20.0, @openremote/model@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/model@npm:1.20.0" + checksum: 10/6b6c0fc23a8d7487bc5bebafd35c86e9ceb88ae2139e23eb24a6900a472a33035756bf61b4f9349aa8f11e9735a584fef5f899d41a7a39ea156250f88cdb2ef8 languageName: node linkType: hard -"@openremote/or-app@npm:1.18.0, @openremote/or-app@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/or-app@npm:1.18.0" +"@openremote/or-app@npm:1.20.0, @openremote/or-app@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/or-app@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" "@reduxjs/toolkit": "npm:^1.8.1" "@webcomponents/webcomponentsjs": "npm:^2.6.0" lit: "npm:^3.3.1" navigo: "npm:^8.11.1" pwa-helpers: "npm:^0.9.0" - checksum: 10/15ab578d914a248fe597dae9f14031a5a9dbb2e924853de8ce8e0e3b1ab22eacefb9822f29b63d26acc1edda30d6ad76b75f308f1840ec7919e863b977d9eef2 + checksum: 10/662b1aff884e3948f5813fe42393989ca7301d58f3c0f5e7c062ab8c1572cfd608d7eb4569608a66ac86c1a8fa90e14fa45ecc0a31a3209598698c6778d088b8 languageName: node linkType: hard -"@openremote/or-asset-tree@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-asset-tree@npm:1.18.0" +"@openremote/or-asset-tree@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-asset-tree@npm:1.20.0" dependencies: "@mdi/js": "npm:^5.9.55" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" qs: "npm:^6.8.0" - checksum: 10/79e9a92e1d9ebd152edf7b99597e6d6a327cdb29d97449bfb500ef8790f68da39bd73facde671e0e4f20fc201472e55a0dec869085f7939f4be2aa3afca10949 + checksum: 10/1bc512ed6adeb19e81f9249211ba74b26536f891cedac6ca70f403a26e3a9a40868f5ea07b58cdc336e9469984d9d88565d429854ba44098b4b446d77bd1045d languageName: node linkType: hard -"@openremote/or-asset-viewer@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-asset-viewer@npm:1.18.0" +"@openremote/or-asset-viewer@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-asset-viewer@npm:1.20.0" dependencies: "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-attribute-history": "npm:1.18.0" - "@openremote/or-attribute-input": "npm:1.18.0" - "@openremote/or-chart": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-attribute-history": "npm:1.20.0" + "@openremote/or-attribute-input": "npm:1.20.0" + "@openremote/or-chart": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" i18next: "npm:^21.5.3" lit: "npm:^3.3.1" - checksum: 10/4c3d945ce0a4c6f1ad54b8fb5e6f30317e0c0a95e620ca862cd5c387aedaa2756bc4eae1cccba94d683c16d3ec273e0eda550eaf95982179492f960bc5cf5f64 + checksum: 10/fddf2652c123e949ae6a637e048b3a082b6dff46dc0a4f592bc7e64ad168a81f6777f4d7f2b9c9c05c9ffd933e67983af7efae1fca423a18f074acf8c0fa1f65 languageName: node linkType: hard -"@openremote/or-attribute-barchart@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-attribute-barchart@npm:1.18.0" +"@openremote/or-attribute-barchart@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-attribute-barchart@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" echarts: "npm:~6.0.0" lit: "npm:^3.3.1" moment: "npm:^2.29.4" - checksum: 10/1fe830ddc71d85685a2a822c1a49c52e742d1888cce0518c1d37ae2e9894f9bbe791a036679aa37ea56d358c899aa212593ddc52d0f99a41fd6973f2dce69c14 + checksum: 10/96e4aa0e461274d1b2481c4bb5a9116dd4bb06da48e1250a84a8d9fdc0b9d468e1cfa03133a6c064786689a59fc2af76061be62cd446106b122ddfeae8c5925f languageName: node linkType: hard -"@openremote/or-attribute-card@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-attribute-card@npm:1.18.0" +"@openremote/or-attribute-card@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-attribute-card@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-attribute-picker": "npm:1.18.0" - "@openremote/or-chart": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-attribute-picker": "npm:1.20.0" + "@openremote/or-chart": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" chart.js: "npm:^3.6.0" chartjs-adapter-moment: "npm:^1.0.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" moment: "npm:^2.29.4" - checksum: 10/521990b574da497ccead3f0bead7349bcf125d0c95cf75b54a07c26a7c49203673ba3c77b1533eb82c7e1dec430b8e9b6495536c354a0edcd509fce175c1014a + checksum: 10/c4b421ba54d0c9d557a5b8f3b0412eff533b81e5ea55cc8f4841f004dff39d16dee15e2a59276ea91cdc38228f5dde97f1abc15a4fba02afa0a8507a4dace75d languageName: node linkType: hard -"@openremote/or-attribute-history@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-attribute-history@npm:1.18.0" +"@openremote/or-attribute-history@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-attribute-history@npm:1.20.0" dependencies: "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-chart": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-chart": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" echarts: "npm:~6.0.0" - jsonpath-plus: "npm:^6.0.1" + jsonpath-plus: "npm:^10.3.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" moment: "npm:^2.29.4" - checksum: 10/abd353431205f46c9725ec77a1790b0a04ec17785227c07545f6ca3d984ffc88ec0948d3ef57327f40e40c5cdadd7f228b579f4dc9d2c31e7ff5ce11a0ad9d28 + checksum: 10/dd5b84607750c326a3216090872f818e06cedd63ed7f4f13e647e997e0f9a8813645c63bc950f4f1a4e40e746f77d17289eb1579b0dc8e1e755b51845246466e languageName: node linkType: hard -"@openremote/or-attribute-input@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-attribute-input@npm:1.18.0" +"@openremote/or-attribute-input@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-attribute-input@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-json-forms": "npm:1.18.0" - "@openremote/or-map": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-scheduler": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-json-forms": "npm:1.20.0" + "@openremote/or-map": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-scheduler": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" lit: "npm:^3.3.1" - checksum: 10/9b7cc0c17e992393a23b09f7e3f226b50c0de82232b2a1fcd068fd0612795fff59161b400d351519926bf6299ccfff560808d4f8d505e9ef6f13486ae6545119 + checksum: 10/e48aed75e3e5ad5075ad87e5c1dbb7ad704e21178dab9f1c23b38258133e05b7879810d38779aac0841b66d1fc2f6ee191d4d6cc0d7d960a9a45c9cc370d2967 languageName: node linkType: hard -"@openremote/or-attribute-picker@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-attribute-picker@npm:1.18.0" +"@openremote/or-attribute-picker@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-attribute-picker@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" lit: "npm:^3.3.1" - checksum: 10/c43f4b05bcf918282e9ec83a81f886a0bc67fbf90c225a5320a0dae92cc47ca32d5ad2a85fd57d6b026ac876d4f4670f8ac5a6da5ecc64f39570b55365c8f655 + checksum: 10/c60ce71d221ad174f4255af7ccd8c13b43865aad38d49b86e8f745d4c103332649333a009fb6614f43538cc7d6ce1464c9fc6f01b198ce4a0dd2180bf3195990 languageName: node linkType: hard -"@openremote/or-chart@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-chart@npm:1.18.0" +"@openremote/or-chart@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-chart@npm:1.20.0" dependencies: "@material/data-table": "npm:^9.0.0" "@material/dialog": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-attribute-picker": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-attribute-picker": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" echarts: "npm:~6.0.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" moment: "npm:^2.29.4" - checksum: 10/8e176c0ffd0454e72f897126fca025de932d4d01c4a22a1b9bf570d500be60cd5af048813f450a7c28e16b7c9c44da01e3655f71167e926ef413c5d87b498628 + checksum: 10/848e73414e3bd79ca90ba04e2e163c818b5495f9e16dbae513f4db9cfbb84f51e08f4b33339f225dccfba9da8097be4035ac39683b52326532becb3f754789d3 languageName: node linkType: hard -"@openremote/or-components@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-components@npm:1.18.0" +"@openremote/or-components@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-components@npm:1.20.0" dependencies: "@material/elevation": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" ace-builds: "npm:^1.41.0" lit: "npm:^3.3.1" simplebar: "npm:^5.3.6" - checksum: 10/d7388fb5119607e2b4e4cb76333f5a4744636a8c26281c7dfdda922755b1d04fb5a3535a510c565b8cf097d42226a527dc140a2f759bf15ae16f497d851d49b2 + checksum: 10/b61392513af85d9ceb1dc426cdb459877a87220aefcfdd4d2a6584b275e57b9f70dab0cc05ca7321140ce5ebe5379d918a0d6a9113786938732adbacb519986e languageName: node linkType: hard -"@openremote/or-dashboard-builder@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-dashboard-builder@npm:1.18.0" +"@openremote/or-dashboard-builder@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-dashboard-builder@npm:1.20.0" dependencies: "@lit/task": "npm:^1.0.3" "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-attribute-barchart": "npm:1.18.0" - "@openremote/or-attribute-card": "npm:1.18.0" - "@openremote/or-attribute-input": "npm:1.18.0" - "@openremote/or-attribute-picker": "npm:1.18.0" - "@openremote/or-chart": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-gauge": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-map": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-attribute-barchart": "npm:1.20.0" + "@openremote/or-attribute-card": "npm:1.20.0" + "@openremote/or-attribute-input": "npm:1.20.0" + "@openremote/or-attribute-picker": "npm:1.20.0" + "@openremote/or-chart": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-gauge": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-map": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" gridstack: "npm:^12.4.2" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" lodash.throttle: "npm:^4.1.1" moment: "npm:^2.29.4" - checksum: 10/01ead7c9bb8a3c82d3a55de5d806f721e3a2087a41d72d16bf66897a68ef57f69c6da5afc2bf97c8f935e7b5008ebeba0662b9316855719757d92a9fbc6c1ace + checksum: 10/8fb3db0ac7e4fe92548f950c6f759ca1ed8447b928b1bc40b580ecca77b12f54f8237e50183fb1f3eb0482bbcbf7ec24c870ea2a4be70f5c115fe972b60b1d36 languageName: node linkType: hard -"@openremote/or-gauge@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-gauge@npm:1.18.0" +"@openremote/or-gauge@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-gauge@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" gaugeJS: "npm:^1.3.7" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" - checksum: 10/d2ca9f9bbd218ffe55b9c13e31706a21ef0ba07e50af977f0d0fb09a436daaa489d8e2772d8eafe1f74c8f2924f96eb46dadfbec6645be266796a6d4de83a1e3 + checksum: 10/e2d0d0fb530c7bcc0d22e4e37d438c5747193b1e4ecf64b59daa4566a93bd84a9cfdadc5a8371e698a7b5219b79477b58f72f3152f6da5d70cae7e9c2629a0e1 languageName: node linkType: hard -"@openremote/or-icon@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-icon@npm:1.18.0" +"@openremote/or-icon@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-icon@npm:1.20.0" dependencies: "@mdi/font": "npm:latest" - "@openremote/model": "npm:1.18.0" + "@openremote/model": "npm:1.20.0" lit: "npm:^3.3.1" - checksum: 10/ea1292b78681e11712005c70d85682bccdbfbf944f971b19a1084e6b7de13fee9a0926640e70601a7f4544867ab103164cebb12f719e18cfab303781244fe370 + checksum: 10/7e98bdd060704960bb25e4b8a065380ab6ead11ca2e5e840bbf26931de3c6808185a1ebda9fe7df20d0c8874ca990bf10ce57a82215733f202bf9698920d6971 languageName: node linkType: hard -"@openremote/or-json-forms@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-json-forms@npm:1.18.0" +"@openremote/or-json-forms@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-json-forms@npm:1.20.0" dependencies: "@jsonforms/core": "npm:^3.5.1" - "@openremote/core": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" ajv: "npm:^8.8.2" lit: "npm:^3.3.1" - checksum: 10/c90da6b88c8341723a3015efed988e2fad75a8560d4fd3598958d0dd5ad9a2a5d5c0de0ffa068f91086110217a4d9f9aa22b81b59742cbc8f3e13cee9e211f52 + checksum: 10/fd0048079a09384228f0b47d6dbf5153e684322d58ccb8287295bfa03acce4eaa0d820d6665267c35c8aa783c83f3907e3fcb979fd8b133f365de1b53268428a languageName: node linkType: hard -"@openremote/or-log-viewer@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-log-viewer@npm:1.18.0" +"@openremote/or-log-viewer@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-log-viewer@npm:1.20.0" dependencies: "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - axios: "npm:1.13.2" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + axios: "npm:1.13.6" http-link-header: "npm:^1.1.3" lit: "npm:^3.3.1" moment: "npm:^2.29.4" - checksum: 10/2995e6cc06bf4b0275c5e5827089bf0728dc59c14d49af7cd26e0b5264018d3fe21cb2b26f0900f4127acd862e27d2cb5cb2c13bfcbbc89c15d8c8ffb51aaa09 + checksum: 10/23c7ae2ea93ab91330e5d5686496907357b2961c271107b732cdd332b115f004fe6461f147b97a8ff211ed5f03516250a065853473b65e14ba7d1527dadd9cf5 languageName: node linkType: hard -"@openremote/or-map@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-map@npm:1.18.0" +"@openremote/or-map@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-map@npm:1.20.0" dependencies: "@maplibre/maplibre-gl-geocoder": "npm:^1.5.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" lit: "npm:^3.3.1" lit-html: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" - maplibre-gl: "npm:^5.12.0" - checksum: 10/acba52216693cc39cafdc71202f30250d2d316c363e6bd5e40c36d19af1c8899dbe43d179b5f98e61b5f6cca9d0c33a35288b61ba05ae394c8b56be95d862294 + maplibre-gl: "npm:^5.19.0" + checksum: 10/28d3b78eb150a0f3420fe8d200879601692c41ab18cdf18719219e1d9bd6cb9daf063d5ee97afd0140f8486425349499ace0f022c2f1e2703c8011152afb88f0 languageName: node linkType: hard -"@openremote/or-mwc-components@npm:1.18.0, @openremote/or-mwc-components@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/or-mwc-components@npm:1.18.0" +"@openremote/or-mwc-components@npm:1.20.0, @openremote/or-mwc-components@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/or-mwc-components@npm:1.20.0" dependencies: "@material/base": "npm:^9.0.0" "@material/button": "npm:^9.0.0" @@ -1624,33 +1697,33 @@ __metadata: "@material/tab-indicator": "npm:^9.0.0" "@material/tab-scroller": "npm:^9.0.0" "@material/textfield": "npm:^9.0.0" - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" lit: "npm:^3.3.1" moment: "npm:^2.29.4" - checksum: 10/099097f7f1579050fccb477ae8e88b53f0ae5e733d1e4736959c6b853a045284bf3cf45438a50b34199f5b9d7e6bac71df17aba3b5e0bfc3d5dc7f8d1c4ae82c - languageName: node - linkType: hard - -"@openremote/or-rules@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-rules@npm:1.18.0" - dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-asset-tree": "npm:1.18.0" - "@openremote/or-attribute-input": "npm:1.18.0" - "@openremote/or-attribute-picker": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-map": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-scheduler": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/or-tree-menu": "npm:1.18.0" - "@openremote/rest": "npm:1.18.0" + checksum: 10/e2c217d3788a1f742699deee5d0f4a6459b0c3a56b1db6fdd3747ea79cd7e85cfa02e28123540bb652ca5e3850b4be88054fa0c7d2b50584ec751fa7eb003911 + languageName: node + linkType: hard + +"@openremote/or-rules@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-rules@npm:1.20.0" + dependencies: + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-asset-tree": "npm:1.20.0" + "@openremote/or-attribute-input": "npm:1.20.0" + "@openremote/or-attribute-picker": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-map": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-scheduler": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/or-tree-menu": "npm:1.20.0" + "@openremote/rest": "npm:1.20.0" ace-builds: "npm:^1.41.0" iso-639-1: "npm:^3.1.3" linqts: "npm:^1.12.6" @@ -1658,69 +1731,69 @@ __metadata: moment: "npm:^2.29.4" resize-observer: "npm:^1.0.3" shortid: "npm:^2.2.15" - checksum: 10/2175f326413af350b826e8cef8f1cc2d00327411226a42568662ecaba43fd5605952511cf80637dd96a5ad6a9dda9f3972283f6c54a9ba3ecbfd1be053852ca8 + checksum: 10/85ff1d69309e40ac15dae96498aa7621babb110f0bd4555bd5ea67a36b6b66393ab4cc851646ef4cac6762b1f8c92f816596ab3fa0a8d2a0be52fd04ab3c5eb0 languageName: node linkType: hard -"@openremote/or-scheduler@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-scheduler@npm:1.18.0" +"@openremote/or-scheduler@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-scheduler@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/or-vaadin-components": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/or-vaadin-components": "npm:1.20.0" lit: "npm:^3.3.1" moment: "npm:^2.29.4" rrule: "npm:^2.6.4" - checksum: 10/3b6fcaa277ecf991665f8bb8c6a43e4366d965795bb49ecd5ae79de94ebbfc25b35e427d9aaff4cb71d71064efdefa75b7b576291f573a455f9b2448bb0eb5f9 + checksum: 10/17883c42f13de0e7227398403c3120a4aa61a5c28beb135b9bb9a29e1b262e75541d37fa0034ed469d5965a6971b6192e147302af2dd4ba9a6b15decec11896b languageName: node linkType: hard -"@openremote/or-services@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-services@npm:1.18.0" +"@openremote/or-services@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-services@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" - "@openremote/or-components": "npm:1.18.0" - "@openremote/or-icon": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" - "@openremote/or-tree-menu": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" + "@openremote/or-components": "npm:1.20.0" + "@openremote/or-icon": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" + "@openremote/or-tree-menu": "npm:1.20.0" lit: "npm:^3.3.1" - checksum: 10/d1a7c17d7317f3acae5aeef8f8e6ebfd8e0e29dba190409ab38f7523ececd2d13732d72da4498ca4842fb00a8a81ec64cd06f675a3a77308b8c9284bfa925089 + checksum: 10/4b7858d0f4ce5427ca4d422483ca6a4d0ccbba525bfc742f554d597b922cf05fc4d2bb40b293c5cffd6a75c36d69b6407c01d71bd83d5e7aa19d0bebe9350d5b languageName: node linkType: hard -"@openremote/or-translate@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-translate@npm:1.18.0" +"@openremote/or-translate@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-translate@npm:1.20.0" dependencies: i18next: "npm:^21.5.3" lit: "npm:^3.3.1" - checksum: 10/d58f020b3aaaea6226a966932af2a5141a43e9067205d94c5dc78485fc4b3a137c4f88a0de442263be3019b064a9fd815838805925fbd570d37f18b1bc657cf6 + checksum: 10/22897705299a54b89b4d441f6459976230649c2e3a4ad7ae184e911f6c19f423b9e9f03275fbfe832e81f930abfea991aa8360e1842993bc3032f43dacf3a628 languageName: node linkType: hard -"@openremote/or-tree-menu@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-tree-menu@npm:1.18.0" +"@openremote/or-tree-menu@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-tree-menu@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/or-mwc-components": "npm:1.18.0" - "@openremote/or-translate": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/or-mwc-components": "npm:1.20.0" + "@openremote/or-translate": "npm:1.20.0" lit: "npm:^3.3.1" - checksum: 10/41289c6abc0239c7606fabf8271bfe2053e436c40f2b4439aed20150f2d9dcdfd3019d228d01da08cd06fefdb2443b8aea0740b748403c761e359aac9c968b73 + checksum: 10/de09303821b49d53be6b07b744ae0322b9a68e0dea5d5db095d3308a919295665c8ae7840c17029e6a771ec292f3c95b58a91140ab120607fa06de0e2a986ea9 languageName: node linkType: hard -"@openremote/or-vaadin-components@npm:1.18.0": - version: 1.18.0 - resolution: "@openremote/or-vaadin-components@npm:1.18.0" +"@openremote/or-vaadin-components@npm:1.20.0": + version: 1.20.0 + resolution: "@openremote/or-vaadin-components@npm:1.20.0" dependencies: - "@openremote/core": "npm:1.18.0" - "@openremote/model": "npm:1.18.0" + "@openremote/core": "npm:1.20.0" + "@openremote/model": "npm:1.20.0" "@vaadin/button": "npm:~25.0.3" "@vaadin/checkbox": "npm:~25.0.3" "@vaadin/checkbox-group": "npm:~25.0.3" @@ -1738,31 +1811,32 @@ __metadata: "@vaadin/text-field": "npm:~25.0.3" "@vaadin/time-picker": "npm:~25.0.3" lit: "npm:^3.3.1" - checksum: 10/15e6e35bc9e91a172e2f2fc67a740c4bc84ebad61090d0e9b9287a5762f2499e15ef4a59f2c35189001b25ce1b1fdc8ee8112afdee0159c1d62c30275f5a1ce2 + checksum: 10/266aca59a00773fc7bddcede151a819b31725d7f324b1047b9e870de7219c5ad2a5936463d1009f098323e747cffd0f0152f67b4781ac6e43f65f15e2286b887 languageName: node linkType: hard -"@openremote/rest@npm:1.18.0, @openremote/rest@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/rest@npm:1.18.0" +"@openremote/rest@npm:1.20.0, @openremote/rest@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/rest@npm:1.20.0" dependencies: - axios: "npm:1.13.2" + axios: "npm:1.13.6" qs: "npm:^6.8.0" - checksum: 10/3ef4c5232c8849d5ed6475af2ba3abd6f4cc18e261c21828a9fead6c055c97fd6a1da4c46a940c13809fd63a873531f5e56b40f257f6b9f5013d5979d8a5d933 + checksum: 10/a2056d5af73d502b9afe22d62ab547c6edce1dcab800f92b8c18cd708755ffbcfe97256b8275e322fd908d6c54faad0467a53f0969162e7702cf6eb0ad7cb815 languageName: node linkType: hard -"@openremote/util@npm:~1.18.0": - version: 1.18.0 - resolution: "@openremote/util@npm:1.18.0" +"@openremote/util@npm:~1.20.0": + version: 1.20.0 + resolution: "@openremote/util@npm:1.20.0" dependencies: - "@custom-elements-manifest/analyzer": "npm:^0.10.4" + "@custom-elements-manifest/analyzer": "npm:^0.11.0" "@rspack/cli": "npm:~1.7.5" "@rspack/core": "npm:~1.7.5" "@types/react": "npm:^18" "@typescript-eslint/eslint-plugin": "npm:^5.9.0" "@typescript-eslint/parser": "npm:^5.9.0" - "@wc-toolkit/jsx-types": "npm:^1.4.2" + "@wc-toolkit/cem-inheritance": "npm:~1.2.2" + "@wc-toolkit/jsx-types": "npm:~1.4.3" "@wc-toolkit/storybook-helpers": "npm:^10.0.0" "@webcomponents/webcomponentsjs": "npm:^2.6.0" cross-env: "npm:^7.0.3" @@ -1773,7 +1847,7 @@ __metadata: eslint-plugin-import: "npm:^2.25.4" eslint-plugin-node: "npm:^11.1.0" eslint-plugin-promise: "npm:^6.0.0" - html-webpack-plugin: "npm:^5.6.3" + html-webpack-plugin: "npm:^5.6.6" moment-locales-webpack-plugin: "npm:^1.2.0" prettier: "npm:^2.5.1" querystring-es3: "npm:^0.2.1" @@ -1781,10 +1855,152 @@ __metadata: source-map-loader: "npm:^5.0.0" ts-loader: "npm:~9.5.2" typescript: "npm:5.8.3" - webpack: "npm:^5.99.8" + webpack: "npm:^5.105.4" bin: orutil: ./cli.js - checksum: 10/6a0319974d5ffca304beb2cad9d407078da2afcce3b2fd8817feb41f7deccbae7fb8b0dedfb063861c85b1a8ad14c6d90dad1949ab3670257ec96d7d27ea38e6 + checksum: 10/da73686c10100ea056dc06415ed5e3a039954a966c507619f98bcc4f1caad5eb5b22f767804ebd3cbaf61c4ef6f08dcf03066838c614c52de09728676606e9d4 + languageName: node + linkType: hard + +"@oxc-resolver/binding-android-arm-eabi@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-android-arm-eabi@npm:11.19.1" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@oxc-resolver/binding-android-arm64@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-android-arm64@npm:11.19.1" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-darwin-arm64@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-darwin-arm64@npm:11.19.1" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-darwin-x64@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-darwin-x64@npm:11.19.1" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-freebsd-x64@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-freebsd-x64@npm:11.19.1" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.19.1" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm-musleabihf@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.19.1" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm64-gnu@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-arm64-gnu@npm:11.19.1" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm64-musl@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-arm64-musl@npm:11.19.1" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-ppc64-gnu@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.19.1" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-riscv64-gnu@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.19.1" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-riscv64-musl@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-riscv64-musl@npm:11.19.1" + conditions: os=linux & cpu=riscv64 & libc=musl + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-s390x-gnu@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-s390x-gnu@npm:11.19.1" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-x64-gnu@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-x64-gnu@npm:11.19.1" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-x64-musl@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-linux-x64-musl@npm:11.19.1" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@oxc-resolver/binding-openharmony-arm64@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-openharmony-arm64@npm:11.19.1" + conditions: os=openharmony & cpu=arm64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-wasm32-wasi@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-wasm32-wasi@npm:11.19.1" + dependencies: + "@napi-rs/wasm-runtime": "npm:^1.1.1" + conditions: cpu=wasm32 + languageName: node + linkType: hard + +"@oxc-resolver/binding-win32-arm64-msvc@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-win32-arm64-msvc@npm:11.19.1" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-win32-ia32-msvc@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-win32-ia32-msvc@npm:11.19.1" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@oxc-resolver/binding-win32-x64-msvc@npm:11.19.1": + version: 11.19.1 + resolution: "@oxc-resolver/binding-win32-x64-msvc@npm:11.19.1" + conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1802,17 +2018,6 @@ __metadata: languageName: node linkType: hard -"@prettier/sync@npm:^0.6.1": - version: 0.6.1 - resolution: "@prettier/sync@npm:0.6.1" - dependencies: - make-synchronized: "npm:^0.8.0" - peerDependencies: - prettier: "*" - checksum: 10/2c53cd4ee718e2ebd2fb31aa5ec4773f743b9c29fcc6db6794dc3553bc87aa8fe7db47b51add6809cab655520b7550329d1cce2ca837f6f4643991eff44abad1 - languageName: node - linkType: hard - "@reduxjs/toolkit@npm:^1.8.1": version: 1.9.7 resolution: "@reduxjs/toolkit@npm:1.9.7" @@ -2902,12 +3107,26 @@ __metadata: languageName: node linkType: hard -"@wc-toolkit/jsx-types@npm:^1.4.2": - version: 1.5.2 - resolution: "@wc-toolkit/jsx-types@npm:1.5.2" +"@wc-toolkit/cem-inheritance@npm:~1.2.2": + version: 1.2.2 + resolution: "@wc-toolkit/cem-inheritance@npm:1.2.2" dependencies: - "@prettier/sync": "npm:^0.6.1" - checksum: 10/48f8819a48a0c440749fcc54ae26a0705b3605694ececf54792ac602524a9c85dd854cdf2addc36308841f06c732856f7bcea51cc993b11ba8d2469404388568 + "@wc-toolkit/jsdoc-tags": "npm:^1.1.0" + checksum: 10/4fcb8f09c3ba79ce0f0c1d096377a3387e4773509d4f869eabb205e97486191c8caf7e4a4024e67a3ec4c8cebf48fc767d3de289d830ef37ef5f7a5d55e47d5f + languageName: node + linkType: hard + +"@wc-toolkit/jsdoc-tags@npm:^1.1.0": + version: 1.1.0 + resolution: "@wc-toolkit/jsdoc-tags@npm:1.1.0" + checksum: 10/884de2be21292a7f35dad0f7833a8dcab365ab94f9d5318d3a6c5173a16d586a89532343ab926dc55228d99e320397ab77707b76ad8c4801e672400bc742d5f8 + languageName: node + linkType: hard + +"@wc-toolkit/jsx-types@npm:~1.4.3": + version: 1.4.3 + resolution: "@wc-toolkit/jsx-types@npm:1.4.3" + checksum: 10/4f69f12e644c1746178087f6e7741c89ce1f48c08edb3d4ba83d07388d9d42e0b75c1679d9c5182f872b212280065c4072ab75e14e49ab66d8cf43e66c039790 languageName: node linkType: hard @@ -3225,6 +3444,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.16.0": + version: 8.16.0 + resolution: "acorn@npm:8.16.0" + bin: + acorn: bin/acorn + checksum: 10/690c673bb4d61b38ef82795fab58526471ad7f7e67c0e40c4ff1e10ecd80ce5312554ef633c9995bfc4e6d170cef165711f9ca9e49040b62c0c66fbf2dd3df2b + languageName: node + linkType: hard + "agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": version: 7.1.1 resolution: "agent-base@npm:7.1.1" @@ -4567,13 +4795,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.17.4": - version: 5.18.4 - resolution: "enhanced-resolve@npm:5.18.4" +"enhanced-resolve@npm:^5.20.0": + version: 5.20.0 + resolution: "enhanced-resolve@npm:5.20.0" dependencies: graceful-fs: "npm:^4.2.4" - tapable: "npm:^2.2.0" - checksum: 10/dcd477cb694d9cc84109a03269c13d3da0851d50099fd3fa7c56b2867dd720d59c7f1431bd47c9cad2825ad52588bd71d3a68cf1e5ee0bc57551d8a3fab4e6f2 + tapable: "npm:^2.3.0" + checksum: 10/ba22699e4b46dc1be6441c359636ebcdd5028229219a7d6ba10f39996401f950967f8297ddf3284d0ee8e33c8133a8742696154e383cc08d8bd2bf80ba87df97 languageName: node linkType: hard @@ -5755,7 +5983,7 @@ __metadata: languageName: node linkType: hard -"html-webpack-plugin@npm:^5.6.3": +"html-webpack-plugin@npm:^5.6.6": version: 5.6.6 resolution: "html-webpack-plugin@npm:5.6.6" dependencies: @@ -6443,6 +6671,13 @@ __metadata: languageName: node linkType: hard +"jsep@npm:^1.4.0": + version: 1.4.0 + resolution: "jsep@npm:1.4.0" + checksum: 10/935824fe6ac28fcff3cd13878f508f99f6c13e7f0f53ec9fca0d3db465e6dd15f8af030bcdc75a38b07c78359c656647435923a26aceb91607027021f00c17f2 + languageName: node + linkType: hard + "json-buffer@npm:3.0.1": version: 3.0.1 resolution: "json-buffer@npm:3.0.1" @@ -6496,10 +6731,17 @@ __metadata: languageName: node linkType: hard -"jsonpath-plus@npm:^6.0.1": - version: 6.0.1 - resolution: "jsonpath-plus@npm:6.0.1" - checksum: 10/9e865d2f0c523637b2213263e62d65f782e83be4007ff3dc6646b618945bbf1532c5e3718aef30410f0d342deff3f11b4aa94fc87333a6f141d6ddf57a2586d2 +"jsonpath-plus@npm:^10.3.0": + version: 10.4.0 + resolution: "jsonpath-plus@npm:10.4.0" + dependencies: + "@jsep-plugin/assignment": "npm:^1.3.0" + "@jsep-plugin/regex": "npm:^1.0.4" + jsep: "npm:^1.4.0" + bin: + jsonpath: bin/jsonpath-cli.js + jsonpath-plus: bin/jsonpath-cli.js + checksum: 10/0ff33c7eb6500d7c8d789ce15a63ac2c46cb01b855f1c53729ca9e3833e0253af70277fc1799ebfe0b3130ddc03c127562669b999729dd11f2621b81472248d4 languageName: node linkType: hard @@ -6736,13 +6978,6 @@ __metadata: languageName: node linkType: hard -"make-synchronized@npm:^0.8.0": - version: 0.8.0 - resolution: "make-synchronized@npm:0.8.0" - checksum: 10/e744bafcd61ee1ecabe6fb2c295ecb4b06a7bfe4e844222b80b7a5ae80a4d27ba657abc4892d1c702fa2f6ae568d8505e801c1498fe1379dd824ded5483d978c - languageName: node - linkType: hard - "maplibre-gl@npm:^5.12.0": version: 5.16.0 resolution: "maplibre-gl@npm:5.16.0" @@ -6774,6 +7009,36 @@ __metadata: languageName: node linkType: hard +"maplibre-gl@npm:^5.19.0": + version: 5.19.0 + resolution: "maplibre-gl@npm:5.19.0" + dependencies: + "@mapbox/geojson-rewind": "npm:^0.5.2" + "@mapbox/jsonlint-lines-primitives": "npm:^2.0.2" + "@mapbox/point-geometry": "npm:^1.1.0" + "@mapbox/tiny-sdf": "npm:^2.0.7" + "@mapbox/unitbezier": "npm:^0.0.1" + "@mapbox/vector-tile": "npm:^2.0.4" + "@mapbox/whoots-js": "npm:^3.1.0" + "@maplibre/geojson-vt": "npm:^5.0.4" + "@maplibre/maplibre-gl-style-spec": "npm:^24.4.1" + "@maplibre/mlt": "npm:^1.1.6" + "@maplibre/vt-pbf": "npm:^4.2.1" + "@types/geojson": "npm:^7946.0.16" + "@types/supercluster": "npm:^7.1.3" + earcut: "npm:^3.0.2" + gl-matrix: "npm:^3.4.4" + kdbush: "npm:^4.0.2" + murmurhash-js: "npm:^1.0.0" + pbf: "npm:^4.0.1" + potpack: "npm:^2.1.0" + quickselect: "npm:^3.0.0" + supercluster: "npm:^8.0.1" + tinyqueue: "npm:^3.0.0" + checksum: 10/83b423e5c37d718ee2b171ea1c08a86bbcdc93abe951eb8aec76a988a72948536041a71573d0f0a7933fed31c3f2ee461341d2a1ebc2dc690aeae5a844fa92c2 + languageName: node + linkType: hard + "math-intrinsics@npm:^1.1.0": version: 1.1.0 resolution: "math-intrinsics@npm:1.1.0" @@ -7003,7 +7268,7 @@ __metadata: version: 0.0.0-use.local resolution: "model@workspace:ui/component/model" dependencies: - "@openremote/util": "npm:~1.18.0" + "@openremote/util": "npm:~1.20.0" languageName: unknown linkType: soft @@ -7366,6 +7631,75 @@ __metadata: languageName: node linkType: hard +"oxc-resolver@npm:^11.9.0": + version: 11.19.1 + resolution: "oxc-resolver@npm:11.19.1" + dependencies: + "@oxc-resolver/binding-android-arm-eabi": "npm:11.19.1" + "@oxc-resolver/binding-android-arm64": "npm:11.19.1" + "@oxc-resolver/binding-darwin-arm64": "npm:11.19.1" + "@oxc-resolver/binding-darwin-x64": "npm:11.19.1" + "@oxc-resolver/binding-freebsd-x64": "npm:11.19.1" + "@oxc-resolver/binding-linux-arm-gnueabihf": "npm:11.19.1" + "@oxc-resolver/binding-linux-arm-musleabihf": "npm:11.19.1" + "@oxc-resolver/binding-linux-arm64-gnu": "npm:11.19.1" + "@oxc-resolver/binding-linux-arm64-musl": "npm:11.19.1" + "@oxc-resolver/binding-linux-ppc64-gnu": "npm:11.19.1" + "@oxc-resolver/binding-linux-riscv64-gnu": "npm:11.19.1" + "@oxc-resolver/binding-linux-riscv64-musl": "npm:11.19.1" + "@oxc-resolver/binding-linux-s390x-gnu": "npm:11.19.1" + "@oxc-resolver/binding-linux-x64-gnu": "npm:11.19.1" + "@oxc-resolver/binding-linux-x64-musl": "npm:11.19.1" + "@oxc-resolver/binding-openharmony-arm64": "npm:11.19.1" + "@oxc-resolver/binding-wasm32-wasi": "npm:11.19.1" + "@oxc-resolver/binding-win32-arm64-msvc": "npm:11.19.1" + "@oxc-resolver/binding-win32-ia32-msvc": "npm:11.19.1" + "@oxc-resolver/binding-win32-x64-msvc": "npm:11.19.1" + dependenciesMeta: + "@oxc-resolver/binding-android-arm-eabi": + optional: true + "@oxc-resolver/binding-android-arm64": + optional: true + "@oxc-resolver/binding-darwin-arm64": + optional: true + "@oxc-resolver/binding-darwin-x64": + optional: true + "@oxc-resolver/binding-freebsd-x64": + optional: true + "@oxc-resolver/binding-linux-arm-gnueabihf": + optional: true + "@oxc-resolver/binding-linux-arm-musleabihf": + optional: true + "@oxc-resolver/binding-linux-arm64-gnu": + optional: true + "@oxc-resolver/binding-linux-arm64-musl": + optional: true + "@oxc-resolver/binding-linux-ppc64-gnu": + optional: true + "@oxc-resolver/binding-linux-riscv64-gnu": + optional: true + "@oxc-resolver/binding-linux-riscv64-musl": + optional: true + "@oxc-resolver/binding-linux-s390x-gnu": + optional: true + "@oxc-resolver/binding-linux-x64-gnu": + optional: true + "@oxc-resolver/binding-linux-x64-musl": + optional: true + "@oxc-resolver/binding-openharmony-arm64": + optional: true + "@oxc-resolver/binding-wasm32-wasi": + optional: true + "@oxc-resolver/binding-win32-arm64-msvc": + optional: true + "@oxc-resolver/binding-win32-ia32-msvc": + optional: true + "@oxc-resolver/binding-win32-x64-msvc": + optional: true + checksum: 10/a6c8fdb2ef4bf9bb84f28e58685457de427d31f74373c0fbd6d1106010cab33027fa3b4336b1b86d0df0a089cd73a6060b730b1b24974d56c59f6fa29c559f9d + languageName: node + linkType: hard + "p-finally@npm:^1.0.0": version: 1.0.0 resolution: "p-finally@npm:1.0.0" @@ -7775,15 +8109,6 @@ __metadata: languageName: node linkType: hard -"randombytes@npm:^2.1.0": - version: 2.1.0 - resolution: "randombytes@npm:2.1.0" - dependencies: - safe-buffer: "npm:^5.1.0" - checksum: 10/4efd1ad3d88db77c2d16588dc54c2b52fd2461e70fe5724611f38d283857094fe09040fa2c9776366803c3152cf133171b452ef717592b65631ce5dc3a2bdafc - languageName: node - linkType: hard - "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1": version: 1.2.1 resolution: "range-parser@npm:1.2.1" @@ -8028,8 +8353,8 @@ __metadata: version: 0.0.0-use.local resolution: "rest@workspace:ui/component/rest" dependencies: - "@openremote/rest": "npm:~1.18.0" - "@openremote/util": "npm:~1.18.0" + "@openremote/rest": "npm:~1.20.0" + "@openremote/util": "npm:~1.20.0" "@rspack/core": "npm:*" model: "workspace:*" typescript: "npm:^5.9.3" @@ -8162,7 +8487,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451 @@ -8323,15 +8648,6 @@ __metadata: languageName: node linkType: hard -"serialize-javascript@npm:^6.0.2": - version: 6.0.2 - resolution: "serialize-javascript@npm:6.0.2" - dependencies: - randombytes: "npm:^2.1.0" - checksum: 10/445a420a6fa2eaee4b70cbd884d538e259ab278200a2ededd73253ada17d5d48e91fb1f4cd224a236ab62ea7ba0a70c6af29fc93b4f3d3078bf7da1c031fde58 - languageName: node - linkType: hard - "serve-index@npm:^1.9.1": version: 1.9.1 resolution: "serve-index@npm:1.9.1" @@ -8935,14 +9251,13 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:^5.3.16": - version: 5.3.16 - resolution: "terser-webpack-plugin@npm:5.3.16" +"terser-webpack-plugin@npm:^5.3.17": + version: 5.3.17 + resolution: "terser-webpack-plugin@npm:5.3.17" dependencies: "@jridgewell/trace-mapping": "npm:^0.3.25" jest-worker: "npm:^27.4.5" schema-utils: "npm:^4.3.0" - serialize-javascript: "npm:^6.0.2" terser: "npm:^5.31.1" peerDependencies: webpack: ^5.1.0 @@ -8953,7 +9268,7 @@ __metadata: optional: true uglify-js: optional: true - checksum: 10/09dfbff602acfa114cdd174254b69a04adbc47856021ab351e37982202fd1ec85e0b62ffd5864c98beb8e96aef2f43da490b3448b4541db539c2cff6607394a6 + checksum: 10/e51b00fe5e54beff82e8c2bea72b5104a2608e375d612ee56887e521210f840f2297fda2e0778c26bbd726b3c77ba2ec3234b2bdaa20b2f9174733745a457b33 languageName: node linkType: hard @@ -9409,7 +9724,7 @@ __metadata: languageName: node linkType: hard -"watchpack@npm:^2.4.4": +"watchpack@npm:^2.5.1": version: 2.5.1 resolution: "watchpack@npm:2.5.1" dependencies: @@ -9521,16 +9836,16 @@ __metadata: languageName: node linkType: hard -"webpack-sources@npm:^3.3.3": - version: 3.3.3 - resolution: "webpack-sources@npm:3.3.3" - checksum: 10/ec5d72607e8068467370abccbfff855c596c098baedbe9d198a557ccf198e8546a322836a6f74241492576adba06100286592993a62b63196832cdb53c8bae91 +"webpack-sources@npm:^3.3.4": + version: 3.3.4 + resolution: "webpack-sources@npm:3.3.4" + checksum: 10/714427b235b04c2d7cf229f204b9e65145ea3643da3c7b139ebfa8a51056238d1e3a2a47c3cc3fc8eab71ed4300f66405cdc7cff29cd2f7f6b71086252f81cf1 languageName: node linkType: hard -"webpack@npm:^5.99.8": - version: 5.104.1 - resolution: "webpack@npm:5.104.1" +"webpack@npm:^5.105.4": + version: 5.105.4 + resolution: "webpack@npm:5.105.4" dependencies: "@types/eslint-scope": "npm:^3.7.7" "@types/estree": "npm:^1.0.8" @@ -9538,11 +9853,11 @@ __metadata: "@webassemblyjs/ast": "npm:^1.14.1" "@webassemblyjs/wasm-edit": "npm:^1.14.1" "@webassemblyjs/wasm-parser": "npm:^1.14.1" - acorn: "npm:^8.15.0" + acorn: "npm:^8.16.0" acorn-import-phases: "npm:^1.0.3" browserslist: "npm:^4.28.1" chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.17.4" + enhanced-resolve: "npm:^5.20.0" es-module-lexer: "npm:^2.0.0" eslint-scope: "npm:5.1.1" events: "npm:^3.2.0" @@ -9554,15 +9869,15 @@ __metadata: neo-async: "npm:^2.6.2" schema-utils: "npm:^4.3.3" tapable: "npm:^2.3.0" - terser-webpack-plugin: "npm:^5.3.16" - watchpack: "npm:^2.4.4" - webpack-sources: "npm:^3.3.3" + terser-webpack-plugin: "npm:^5.3.17" + watchpack: "npm:^2.5.1" + webpack-sources: "npm:^3.3.4" peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: 10/c22b58fdf41d993971516154cb621d13b7b61dd744b7e2c6be972e9afcc9942694a8aaa322c07fba46448c69d663023ff53d0aeeb00eb0b125d83ace5ca8fa3c + checksum: 10/ae8088dd1c995fa17b920009f864138297a9ea5089bc563601f661fa4a31bb24b000cc91ae122168ce9def79c49258b8aa1021c2754c3555205c29a0d6c9cc8d languageName: node linkType: hard From a5eb7915472c56f93793f27911de2cfa4ec618f5 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Fri, 20 Mar 2026 17:00:02 +0100 Subject: [PATCH 2/3] Use OpenRemote 1.20.1 --- gradle.properties | 2 +- ui/app/custom-react/package.json | 6 +- ui/app/custom/package.json | 6 +- ui/component/model/package.json | 2 +- ui/component/rest/package.json | 4 +- yarn.lock | 568 +++++++++++++++---------------- 6 files changed, 294 insertions(+), 294 deletions(-) diff --git a/gradle.properties b/gradle.properties index c25d642c6..0dba6e84a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.parallel=true projectName = custom-project version = 1.0-SNAPSHOT -openremoteVersion = 1.20.0 +openremoteVersion = 1.20.1 jacksonVersion = 2.20.1 testLoggerVersion = 4.0.0 diff --git a/ui/app/custom-react/package.json b/ui/app/custom-react/package.json index d5c503a22..fa53d87bc 100644 --- a/ui/app/custom-react/package.json +++ b/ui/app/custom-react/package.json @@ -11,9 +11,9 @@ "serve": "npx cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 rspack serve" }, "dependencies": { - "@openremote/core": "~1.20.0", - "@openremote/model": "~1.20.0", - "@openremote/or-mwc-components": "~1.20.0", + "@openremote/core": "~1.20.1", + "@openremote/model": "~1.20.1", + "@openremote/or-mwc-components": "~1.20.1", "react": "^19.2.0", "react-dom": "^19.2.0" }, diff --git a/ui/app/custom/package.json b/ui/app/custom/package.json index 15882d882..78dc48bbc 100644 --- a/ui/app/custom/package.json +++ b/ui/app/custom/package.json @@ -18,14 +18,14 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@openremote/manager": "~1.20.0", - "@openremote/or-app": "~1.20.0", + "@openremote/manager": "~1.20.1", + "@openremote/or-app": "~1.20.1", "lit": "^3.3.1", "model": "workspace:*", "rest": "workspace:*" }, "devDependencies": { - "@openremote/util": "~1.20.0", + "@openremote/util": "~1.20.1", "@rspack/cli": "*", "@rspack/core": "*", "cross-env": "*", diff --git a/ui/component/model/package.json b/ui/component/model/package.json index 0495d49bc..d8a9c4e16 100644 --- a/ui/component/model/package.json +++ b/ui/component/model/package.json @@ -22,7 +22,7 @@ "author": "OpenRemote", "license": "AGPL-3.0-or-later", "devDependencies": { - "@openremote/util": "~1.20.0" + "@openremote/util": "~1.20.1" }, "publishConfig": { "access": "restricted" diff --git a/ui/component/rest/package.json b/ui/component/rest/package.json index d8fc61922..132134920 100644 --- a/ui/component/rest/package.json +++ b/ui/component/rest/package.json @@ -22,11 +22,11 @@ "author": "OpenRemote", "license": "AGPL-3.0-or-later", "dependencies": { - "@openremote/rest": "~1.20.0", + "@openremote/rest": "~1.20.1", "model": "workspace:*" }, "devDependencies": { - "@openremote/util": "~1.20.0", + "@openremote/util": "~1.20.1", "@rspack/core": "*", "typescript": "^5.9.3" }, diff --git a/yarn.lock b/yarn.lock index 0f889d701..8baa3712b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1275,13 +1275,13 @@ __metadata: languageName: node linkType: hard -"@openremote/core@npm:1.20.0, @openremote/core@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/core@npm:1.20.0" +"@openremote/core@npm:1.20.1, @openremote/core@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/core@npm:1.20.1" dependencies: - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" axios: "npm:1.13.6" i18next: "npm:^21.5.3" i18next-http-backend: "npm:^1.3.1" @@ -1291,7 +1291,7 @@ __metadata: platform: "npm:^1.3.6" qs: "npm:^6.8.0" url-search-params-polyfill: "npm:^8.1.0" - checksum: 10/adbc2b01c322aadae2c55f1689c38ce68965df58050c2ba109b60e8b7cf71b76bbda5a351383066f4a53a688a3370abb28bbb52e7b403ba0806e47ad9ceb162b + checksum: 10/9daa3764dead90a35fd6a6e885b684179c5126d74c59ec8724b20bac434fe9f2129db6e1092cf4d0023bf133687f1d19e63faf6416ce1837170ae99cea5e158d languageName: node linkType: hard @@ -1299,9 +1299,9 @@ __metadata: version: 0.0.0-use.local resolution: "@openremote/custom-react@workspace:ui/app/custom-react" dependencies: - "@openremote/core": "npm:~1.20.0" - "@openremote/model": "npm:~1.20.0" - "@openremote/or-mwc-components": "npm:~1.20.0" + "@openremote/core": "npm:~1.20.1" + "@openremote/model": "npm:~1.20.1" + "@openremote/or-mwc-components": "npm:~1.20.1" "@rspack/cli": "npm:~1.7.1" "@rspack/core": "npm:~1.7.1" "@types/react": "npm:^19.2.2" @@ -1319,9 +1319,9 @@ __metadata: version: 0.0.0-use.local resolution: "@openremote/custom@workspace:ui/app/custom" dependencies: - "@openremote/manager": "npm:~1.20.0" - "@openremote/or-app": "npm:~1.20.0" - "@openremote/util": "npm:~1.20.0" + "@openremote/manager": "npm:~1.20.1" + "@openremote/or-app": "npm:~1.20.1" + "@openremote/util": "npm:~1.20.1" "@rspack/cli": "npm:*" "@rspack/core": "npm:*" cross-env: "npm:*" @@ -1335,342 +1335,342 @@ __metadata: languageName: unknown linkType: soft -"@openremote/manager@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/manager@npm:1.20.0" +"@openremote/manager@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/manager@npm:1.20.1" dependencies: "@lit/task": "npm:^1.0.3" "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-app": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-asset-viewer": "npm:1.20.0" - "@openremote/or-attribute-picker": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-dashboard-builder": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-json-forms": "npm:1.20.0" - "@openremote/or-log-viewer": "npm:1.20.0" - "@openremote/or-map": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-rules": "npm:1.20.0" - "@openremote/or-services": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-app": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-asset-viewer": "npm:1.20.1" + "@openremote/or-attribute-picker": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-dashboard-builder": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-json-forms": "npm:1.20.1" + "@openremote/or-log-viewer": "npm:1.20.1" + "@openremote/or-map": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-rules": "npm:1.20.1" + "@openremote/or-services": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" "@reduxjs/toolkit": "npm:^1.8.1" iso-639-1: "npm:^3.1.3" lit: "npm:^3.3.1" maplibre-gl: "npm:^5.12.0" moment: "npm:^2.29.4" reselect: "npm:^4.1.8" - checksum: 10/3d341a0b0efcb7848eb8486496a736c592d06e54c7e215e566a994c665fc90a6a891877735e1f4513437a5bb6b89a5ad03dfda0cca774cfb03629cc5f036288e + checksum: 10/f2bc3831cdcb56d1a7732a363f38a4d0cd6ea21ec5aa44c44166f2a3b72bca3a8f44a69a5ce9f1efc949fbbb1d3f54c8673372c78ce4cc04d0099c6828e30b69 languageName: node linkType: hard -"@openremote/model@npm:1.20.0, @openremote/model@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/model@npm:1.20.0" - checksum: 10/6b6c0fc23a8d7487bc5bebafd35c86e9ceb88ae2139e23eb24a6900a472a33035756bf61b4f9349aa8f11e9735a584fef5f899d41a7a39ea156250f88cdb2ef8 +"@openremote/model@npm:1.20.1, @openremote/model@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/model@npm:1.20.1" + checksum: 10/4aa174303a166cfa3496c67faf4a38b15ee3f31f5243634bc62e2283be93ccd40718c1a7422dd5c740fc92e5ae1a0833afefaf4e754c6793a2dad04e3b7d8f30 languageName: node linkType: hard -"@openremote/or-app@npm:1.20.0, @openremote/or-app@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/or-app@npm:1.20.0" +"@openremote/or-app@npm:1.20.1, @openremote/or-app@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/or-app@npm:1.20.1" dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" "@reduxjs/toolkit": "npm:^1.8.1" "@webcomponents/webcomponentsjs": "npm:^2.6.0" lit: "npm:^3.3.1" navigo: "npm:^8.11.1" pwa-helpers: "npm:^0.9.0" - checksum: 10/662b1aff884e3948f5813fe42393989ca7301d58f3c0f5e7c062ab8c1572cfd608d7eb4569608a66ac86c1a8fa90e14fa45ecc0a31a3209598698c6778d088b8 + checksum: 10/f681f6b31419b91bb1b1743fe0c671241bdfde6b81b5cb333173357071acdaa55c6d75d042e11f10c30cfb52a6bcb45b58a25c1d4636e68aa2d6e086facc00e0 languageName: node linkType: hard -"@openremote/or-asset-tree@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-asset-tree@npm:1.20.0" +"@openremote/or-asset-tree@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-asset-tree@npm:1.20.1" dependencies: "@mdi/js": "npm:^5.9.55" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" qs: "npm:^6.8.0" - checksum: 10/1bc512ed6adeb19e81f9249211ba74b26536f891cedac6ca70f403a26e3a9a40868f5ea07b58cdc336e9469984d9d88565d429854ba44098b4b446d77bd1045d + checksum: 10/8ff88043b8efa67280c3303c26050a7c4dbd49457de9a36431796cbc3bfcb3e367a460b2ef4f7712f52d6ab400d7394371439bc0bef9af640d89584f322b5a8e languageName: node linkType: hard -"@openremote/or-asset-viewer@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-asset-viewer@npm:1.20.0" +"@openremote/or-asset-viewer@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-asset-viewer@npm:1.20.1" dependencies: "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-attribute-history": "npm:1.20.0" - "@openremote/or-attribute-input": "npm:1.20.0" - "@openremote/or-chart": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-attribute-history": "npm:1.20.1" + "@openremote/or-attribute-input": "npm:1.20.1" + "@openremote/or-chart": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" i18next: "npm:^21.5.3" lit: "npm:^3.3.1" - checksum: 10/fddf2652c123e949ae6a637e048b3a082b6dff46dc0a4f592bc7e64ad168a81f6777f4d7f2b9c9c05c9ffd933e67983af7efae1fca423a18f074acf8c0fa1f65 + checksum: 10/26e91f749560fb74a64e533a9087f582d92f0a2056bc093c1b636b0a864b4b982ac4e1ed04e705c44d072a4541b1349392671c05cc8529c1200050a13880c9df languageName: node linkType: hard -"@openremote/or-attribute-barchart@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-attribute-barchart@npm:1.20.0" - dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" +"@openremote/or-attribute-barchart@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-attribute-barchart@npm:1.20.1" + dependencies: + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" echarts: "npm:~6.0.0" lit: "npm:^3.3.1" moment: "npm:^2.29.4" - checksum: 10/96e4aa0e461274d1b2481c4bb5a9116dd4bb06da48e1250a84a8d9fdc0b9d468e1cfa03133a6c064786689a59fc2af76061be62cd446106b122ddfeae8c5925f + checksum: 10/f6821edfb3959f70cb315ca11fd0c363627ec47decdd615277265607ed57ac9bfe2955cb1f378d854ec50c956fef645ea32586944c161f5923b230c08f8137f5 languageName: node linkType: hard -"@openremote/or-attribute-card@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-attribute-card@npm:1.20.0" - dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-attribute-picker": "npm:1.20.0" - "@openremote/or-chart": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" +"@openremote/or-attribute-card@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-attribute-card@npm:1.20.1" + dependencies: + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-attribute-picker": "npm:1.20.1" + "@openremote/or-chart": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" chart.js: "npm:^3.6.0" chartjs-adapter-moment: "npm:^1.0.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" moment: "npm:^2.29.4" - checksum: 10/c4b421ba54d0c9d557a5b8f3b0412eff533b81e5ea55cc8f4841f004dff39d16dee15e2a59276ea91cdc38228f5dde97f1abc15a4fba02afa0a8507a4dace75d + checksum: 10/57c80b8b5e4620af0077ccf3337883c8fce07ac5625e1350a826471e7523da2e3ec77eed3457a5fc0ed43aa887a366a4757b37051b55ca30c1cea91ad7c3be2a languageName: node linkType: hard -"@openremote/or-attribute-history@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-attribute-history@npm:1.20.0" +"@openremote/or-attribute-history@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-attribute-history@npm:1.20.1" dependencies: "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-chart": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-chart": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" echarts: "npm:~6.0.0" jsonpath-plus: "npm:^10.3.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" moment: "npm:^2.29.4" - checksum: 10/dd5b84607750c326a3216090872f818e06cedd63ed7f4f13e647e997e0f9a8813645c63bc950f4f1a4e40e746f77d17289eb1579b0dc8e1e755b51845246466e + checksum: 10/9ae104aa9acc9065892db7b2ffc6699db9924d568ca31928d9ca7d2510d20eac39d23e85f78f3b6edbe220e319e68cc90138309cd8a9841365415eee910e707e languageName: node linkType: hard -"@openremote/or-attribute-input@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-attribute-input@npm:1.20.0" - dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-json-forms": "npm:1.20.0" - "@openremote/or-map": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-scheduler": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" +"@openremote/or-attribute-input@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-attribute-input@npm:1.20.1" + dependencies: + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-json-forms": "npm:1.20.1" + "@openremote/or-map": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-scheduler": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" lit: "npm:^3.3.1" - checksum: 10/e48aed75e3e5ad5075ad87e5c1dbb7ad704e21178dab9f1c23b38258133e05b7879810d38779aac0841b66d1fc2f6ee191d4d6cc0d7d960a9a45c9cc370d2967 + checksum: 10/238c3e47e8d82d4e9c347b8f98c386ebc34cd9120ff5f83600836e5f99b54dc1dc90b1ca1cf24c2b534ba12aef1ee086835ef34cef79e8affd00ca9edcec177d languageName: node linkType: hard -"@openremote/or-attribute-picker@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-attribute-picker@npm:1.20.0" +"@openremote/or-attribute-picker@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-attribute-picker@npm:1.20.1" dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" lit: "npm:^3.3.1" - checksum: 10/c60ce71d221ad174f4255af7ccd8c13b43865aad38d49b86e8f745d4c103332649333a009fb6614f43538cc7d6ce1464c9fc6f01b198ce4a0dd2180bf3195990 + checksum: 10/e23e6abd91d1fd68174103d5cfe49c0534eedadfb51ffde41f95d0041b3b597807eb3b91456ddca156e6790c10f3d47d7683d6030c01f7d754bb6ce30c9ea5e1 languageName: node linkType: hard -"@openremote/or-chart@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-chart@npm:1.20.0" +"@openremote/or-chart@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-chart@npm:1.20.1" dependencies: "@material/data-table": "npm:^9.0.0" "@material/dialog": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-attribute-picker": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-attribute-picker": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" echarts: "npm:~6.0.0" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" moment: "npm:^2.29.4" - checksum: 10/848e73414e3bd79ca90ba04e2e163c818b5495f9e16dbae513f4db9cfbb84f51e08f4b33339f225dccfba9da8097be4035ac39683b52326532becb3f754789d3 + checksum: 10/5a6568f5d031cbc1d4127c830509b0d0d4082f36f8f91f91eee2aff8a1f83833aa03686997d00ffd566b795a5bc083d70ed26f6e20a481e7471d7abb944351be languageName: node linkType: hard -"@openremote/or-components@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-components@npm:1.20.0" +"@openremote/or-components@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-components@npm:1.20.1" dependencies: "@material/elevation": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" ace-builds: "npm:^1.41.0" lit: "npm:^3.3.1" simplebar: "npm:^5.3.6" - checksum: 10/b61392513af85d9ceb1dc426cdb459877a87220aefcfdd4d2a6584b275e57b9f70dab0cc05ca7321140ce5ebe5379d918a0d6a9113786938732adbacb519986e + checksum: 10/7bc23c477cfaaab9d9c9a76dc6b975abac060857ecd209dd3b79f9b09f73492f251a6e1131a1c658b4e44d475fee53f41084dcd9f4ef757d95e4e8b79171c079 languageName: node linkType: hard -"@openremote/or-dashboard-builder@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-dashboard-builder@npm:1.20.0" +"@openremote/or-dashboard-builder@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-dashboard-builder@npm:1.20.1" dependencies: "@lit/task": "npm:^1.0.3" "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-attribute-barchart": "npm:1.20.0" - "@openremote/or-attribute-card": "npm:1.20.0" - "@openremote/or-attribute-input": "npm:1.20.0" - "@openremote/or-attribute-picker": "npm:1.20.0" - "@openremote/or-chart": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-gauge": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-map": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-attribute-barchart": "npm:1.20.1" + "@openremote/or-attribute-card": "npm:1.20.1" + "@openremote/or-attribute-input": "npm:1.20.1" + "@openremote/or-attribute-picker": "npm:1.20.1" + "@openremote/or-chart": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-gauge": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-map": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" gridstack: "npm:^12.4.2" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" lodash.throttle: "npm:^4.1.1" moment: "npm:^2.29.4" - checksum: 10/8fb3db0ac7e4fe92548f950c6f759ca1ed8447b928b1bc40b580ecca77b12f54f8237e50183fb1f3eb0482bbcbf7ec24c870ea2a4be70f5c115fe972b60b1d36 + checksum: 10/24ad51c1d48250f21247ded766caf24f8e08f6e5e9d220db6983e2b1bb9af43608153bb3629762c8e6b606039173f73d96ad98a7915fe3df3e8f653951010cde languageName: node linkType: hard -"@openremote/or-gauge@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-gauge@npm:1.20.0" +"@openremote/or-gauge@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-gauge@npm:1.20.1" dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" gaugeJS: "npm:^1.3.7" lit: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" - checksum: 10/e2d0d0fb530c7bcc0d22e4e37d438c5747193b1e4ecf64b59daa4566a93bd84a9cfdadc5a8371e698a7b5219b79477b58f72f3152f6da5d70cae7e9c2629a0e1 + checksum: 10/1b305995a19dc1303934c21a041416f72d0ef1c428743765004a57e2ae3cc6b80bebe40e8fc9cf826d3824b31881085ce6fd67a8e24db13cee1008c2f3df6a33 languageName: node linkType: hard -"@openremote/or-icon@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-icon@npm:1.20.0" +"@openremote/or-icon@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-icon@npm:1.20.1" dependencies: "@mdi/font": "npm:latest" - "@openremote/model": "npm:1.20.0" + "@openremote/model": "npm:1.20.1" lit: "npm:^3.3.1" - checksum: 10/7e98bdd060704960bb25e4b8a065380ab6ead11ca2e5e840bbf26931de3c6808185a1ebda9fe7df20d0c8874ca990bf10ce57a82215733f202bf9698920d6971 + checksum: 10/cc4d89eec56b979df8eaa91d38db722aaf096ef23a91cc9be005a79bc352347eee6349d5728acce6b7eb8a62fbdc5ab3330de1e06ab33e43df7936b6472c8659 languageName: node linkType: hard -"@openremote/or-json-forms@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-json-forms@npm:1.20.0" +"@openremote/or-json-forms@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-json-forms@npm:1.20.1" dependencies: "@jsonforms/core": "npm:^3.5.1" - "@openremote/core": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" ajv: "npm:^8.8.2" lit: "npm:^3.3.1" - checksum: 10/fd0048079a09384228f0b47d6dbf5153e684322d58ccb8287295bfa03acce4eaa0d820d6665267c35c8aa783c83f3907e3fcb979fd8b133f365de1b53268428a + checksum: 10/b0140777e596e65d2b02406172dd14ea7fae886193742ecd0d22a497abae4d5f2870b989317ac784f0556e2b570b19cf5eca6c050f2d9d2e6a71d1ecbec8d8d8 languageName: node linkType: hard -"@openremote/or-log-viewer@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-log-viewer@npm:1.20.0" +"@openremote/or-log-viewer@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-log-viewer@npm:1.20.1" dependencies: "@material/data-table": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" axios: "npm:1.13.6" http-link-header: "npm:^1.1.3" lit: "npm:^3.3.1" moment: "npm:^2.29.4" - checksum: 10/23c7ae2ea93ab91330e5d5686496907357b2961c271107b732cdd332b115f004fe6461f147b97a8ff211ed5f03516250a065853473b65e14ba7d1527dadd9cf5 + checksum: 10/87c23449cbb908c1ae3c6e24b2b957218f4c1099541c0e2489cb11e08afb943b8ad72a60c509f84b3919a4a1b71b23ca63e88b6c7d80346bfead5f1a871e2305 languageName: node linkType: hard -"@openremote/or-map@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-map@npm:1.20.0" +"@openremote/or-map@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-map@npm:1.20.1" dependencies: "@maplibre/maplibre-gl-geocoder": "npm:^1.5.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" lit: "npm:^3.3.1" lit-html: "npm:^3.3.1" lodash.debounce: "npm:^4.0.8" maplibre-gl: "npm:^5.19.0" - checksum: 10/28d3b78eb150a0f3420fe8d200879601692c41ab18cdf18719219e1d9bd6cb9daf063d5ee97afd0140f8486425349499ace0f022c2f1e2703c8011152afb88f0 + checksum: 10/681459b4d8f62d2ac75afe414ead2edb7d3e0afd6187906b829e90eb83195c7ede4287d73c3aa9d19003e6ac1acad9024dad718fee50a39a3f7eb80775e601a5 languageName: node linkType: hard -"@openremote/or-mwc-components@npm:1.20.0, @openremote/or-mwc-components@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/or-mwc-components@npm:1.20.0" +"@openremote/or-mwc-components@npm:1.20.1, @openremote/or-mwc-components@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/or-mwc-components@npm:1.20.1" dependencies: "@material/base": "npm:^9.0.0" "@material/button": "npm:^9.0.0" @@ -1697,33 +1697,33 @@ __metadata: "@material/tab-indicator": "npm:^9.0.0" "@material/tab-scroller": "npm:^9.0.0" "@material/textfield": "npm:^9.0.0" - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" lit: "npm:^3.3.1" moment: "npm:^2.29.4" - checksum: 10/e2c217d3788a1f742699deee5d0f4a6459b0c3a56b1db6fdd3747ea79cd7e85cfa02e28123540bb652ca5e3850b4be88054fa0c7d2b50584ec751fa7eb003911 - languageName: node - linkType: hard - -"@openremote/or-rules@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-rules@npm:1.20.0" - dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-asset-tree": "npm:1.20.0" - "@openremote/or-attribute-input": "npm:1.20.0" - "@openremote/or-attribute-picker": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-map": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-scheduler": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/or-tree-menu": "npm:1.20.0" - "@openremote/rest": "npm:1.20.0" + checksum: 10/823d6696c5415021fcb6fab1ccc5629fbf7e5e10cfc08a4044a49b343f36d3fe3ebaa5c1c494b7a445bc4214757a218489c9bdd376b27f0c450b27bc329d4325 + languageName: node + linkType: hard + +"@openremote/or-rules@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-rules@npm:1.20.1" + dependencies: + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-asset-tree": "npm:1.20.1" + "@openremote/or-attribute-input": "npm:1.20.1" + "@openremote/or-attribute-picker": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-map": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-scheduler": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/or-tree-menu": "npm:1.20.1" + "@openremote/rest": "npm:1.20.1" ace-builds: "npm:^1.41.0" iso-639-1: "npm:^3.1.3" linqts: "npm:^1.12.6" @@ -1731,69 +1731,69 @@ __metadata: moment: "npm:^2.29.4" resize-observer: "npm:^1.0.3" shortid: "npm:^2.2.15" - checksum: 10/85ff1d69309e40ac15dae96498aa7621babb110f0bd4555bd5ea67a36b6b66393ab4cc851646ef4cac6762b1f8c92f816596ab3fa0a8d2a0be52fd04ab3c5eb0 + checksum: 10/1104cd0a79ef8bfaf55d7d241463d08b94c9d43e1b4b5bc1225870cceb3738ddf213304de619280ed527444fd4ad80dde030b4d5f38f388e5cdc2196615d1aec languageName: node linkType: hard -"@openremote/or-scheduler@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-scheduler@npm:1.20.0" +"@openremote/or-scheduler@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-scheduler@npm:1.20.1" dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/or-vaadin-components": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/or-vaadin-components": "npm:1.20.1" lit: "npm:^3.3.1" moment: "npm:^2.29.4" rrule: "npm:^2.6.4" - checksum: 10/17883c42f13de0e7227398403c3120a4aa61a5c28beb135b9bb9a29e1b262e75541d37fa0034ed469d5965a6971b6192e147302af2dd4ba9a6b15decec11896b + checksum: 10/911a7ffa08c2eee20b5538c7daf0654ca952e41ebdaaf7b5a7ace9bf3644d9ad9095a7f37c97ab8806a1d72f5595e4613f2fcb591bca9ee9de6b59a749f618b4 languageName: node linkType: hard -"@openremote/or-services@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-services@npm:1.20.0" - dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" - "@openremote/or-components": "npm:1.20.0" - "@openremote/or-icon": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" - "@openremote/or-tree-menu": "npm:1.20.0" +"@openremote/or-services@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-services@npm:1.20.1" + dependencies: + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" + "@openremote/or-components": "npm:1.20.1" + "@openremote/or-icon": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" + "@openremote/or-tree-menu": "npm:1.20.1" lit: "npm:^3.3.1" - checksum: 10/4b7858d0f4ce5427ca4d422483ca6a4d0ccbba525bfc742f554d597b922cf05fc4d2bb40b293c5cffd6a75c36d69b6407c01d71bd83d5e7aa19d0bebe9350d5b + checksum: 10/5b122b44afe62c7b0ff404cbf9da4b9a63b97696ff8eefb015a4c9cd356d3584df11c4b51152dd290f685e7d267320c33d9f70d69d58543acbe5a7f44acc2cae languageName: node linkType: hard -"@openremote/or-translate@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-translate@npm:1.20.0" +"@openremote/or-translate@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-translate@npm:1.20.1" dependencies: i18next: "npm:^21.5.3" lit: "npm:^3.3.1" - checksum: 10/22897705299a54b89b4d441f6459976230649c2e3a4ad7ae184e911f6c19f423b9e9f03275fbfe832e81f930abfea991aa8360e1842993bc3032f43dacf3a628 + checksum: 10/3e11f9c33b47709de3cf445cc59c06058f2a67123e17d78291d67009a26b9360c47925de3612c43f57c09bc1b194c34a2b4ffa7e6cc079d130eaeb84e65072ca languageName: node linkType: hard -"@openremote/or-tree-menu@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-tree-menu@npm:1.20.0" +"@openremote/or-tree-menu@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-tree-menu@npm:1.20.1" dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/or-mwc-components": "npm:1.20.0" - "@openremote/or-translate": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/or-mwc-components": "npm:1.20.1" + "@openremote/or-translate": "npm:1.20.1" lit: "npm:^3.3.1" - checksum: 10/de09303821b49d53be6b07b744ae0322b9a68e0dea5d5db095d3308a919295665c8ae7840c17029e6a771ec292f3c95b58a91140ab120607fa06de0e2a986ea9 + checksum: 10/9269b50f8d1fb339308f1022207c2493f2a61c29acf2aa0a09b009421cf830f49c9926e6a69655761c6e7d29f6ae7e4f9b37ca8997ed9f1c648a3162cd864dbf languageName: node linkType: hard -"@openremote/or-vaadin-components@npm:1.20.0": - version: 1.20.0 - resolution: "@openremote/or-vaadin-components@npm:1.20.0" +"@openremote/or-vaadin-components@npm:1.20.1": + version: 1.20.1 + resolution: "@openremote/or-vaadin-components@npm:1.20.1" dependencies: - "@openremote/core": "npm:1.20.0" - "@openremote/model": "npm:1.20.0" + "@openremote/core": "npm:1.20.1" + "@openremote/model": "npm:1.20.1" "@vaadin/button": "npm:~25.0.3" "@vaadin/checkbox": "npm:~25.0.3" "@vaadin/checkbox-group": "npm:~25.0.3" @@ -1811,23 +1811,23 @@ __metadata: "@vaadin/text-field": "npm:~25.0.3" "@vaadin/time-picker": "npm:~25.0.3" lit: "npm:^3.3.1" - checksum: 10/266aca59a00773fc7bddcede151a819b31725d7f324b1047b9e870de7219c5ad2a5936463d1009f098323e747cffd0f0152f67b4781ac6e43f65f15e2286b887 + checksum: 10/98b776262aa5304ef0c061f640f96e92ae7ba584f3c71d244dc5767161b069d82712ba1dd455bc758b00453c179dbc5db994c0dec4ef2b6f618fac49d5020b12 languageName: node linkType: hard -"@openremote/rest@npm:1.20.0, @openremote/rest@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/rest@npm:1.20.0" +"@openremote/rest@npm:1.20.1, @openremote/rest@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/rest@npm:1.20.1" dependencies: axios: "npm:1.13.6" qs: "npm:^6.8.0" - checksum: 10/a2056d5af73d502b9afe22d62ab547c6edce1dcab800f92b8c18cd708755ffbcfe97256b8275e322fd908d6c54faad0467a53f0969162e7702cf6eb0ad7cb815 + checksum: 10/1e8819c27a8ad14f258ad21fbb461bf5d5eda05d013b141a6e94a4af7b3f53bc8ebee9572c8808c358fbd1cc9d72cce618ca7dc8967040edee70ee3692f008a6 languageName: node linkType: hard -"@openremote/util@npm:~1.20.0": - version: 1.20.0 - resolution: "@openremote/util@npm:1.20.0" +"@openremote/util@npm:~1.20.1": + version: 1.20.1 + resolution: "@openremote/util@npm:1.20.1" dependencies: "@custom-elements-manifest/analyzer": "npm:^0.11.0" "@rspack/cli": "npm:~1.7.5" @@ -1858,7 +1858,7 @@ __metadata: webpack: "npm:^5.105.4" bin: orutil: ./cli.js - checksum: 10/da73686c10100ea056dc06415ed5e3a039954a966c507619f98bcc4f1caad5eb5b22f767804ebd3cbaf61c4ef6f08dcf03066838c614c52de09728676606e9d4 + checksum: 10/2b1d3e885b8960cd13f3d2744d7e4344e762799a75bd87d6bfd014739b89d5f37e19baa632d01f48b92fede326ef1b5762382a8bd10034e31771c10ef04ff8de languageName: node linkType: hard @@ -7268,7 +7268,7 @@ __metadata: version: 0.0.0-use.local resolution: "model@workspace:ui/component/model" dependencies: - "@openremote/util": "npm:~1.20.0" + "@openremote/util": "npm:~1.20.1" languageName: unknown linkType: soft @@ -8353,8 +8353,8 @@ __metadata: version: 0.0.0-use.local resolution: "rest@workspace:ui/component/rest" dependencies: - "@openremote/rest": "npm:~1.20.0" - "@openremote/util": "npm:~1.20.0" + "@openremote/rest": "npm:~1.20.1" + "@openremote/util": "npm:~1.20.1" "@rspack/core": "npm:*" model: "workspace:*" typescript: "npm:^5.9.3" From b3fe3c19d384b0710d0259505368c2e370b68a6f Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Fri, 20 Mar 2026 17:07:49 +0100 Subject: [PATCH 3/3] Update dependencies --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 45457 -> 45633 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0dba6e84a..b8a2987d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ version = 1.0-SNAPSHOT openremoteVersion = 1.20.1 -jacksonVersion = 2.20.1 +jacksonVersion = 2.21.1 testLoggerVersion = 4.0.0 typescriptGeneratorVersion = 3.2.1263 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c75ab801e22807dde59e12a8735a34077..f8e1ee3125fe0768e9a76ee977ac089eb657005e 100644 GIT binary patch delta 36466 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 delta 36287 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 TbTtHgKIb=}#OPPBcmMwnM9LS( diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23449a2b5..c61a118f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME