100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI update to try and get CI/CD build working again
Rich Turnerc2c2d6af96e2
diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.jsonindex e00b5aad4..6c7f14cbf 100644--- a/ui/component/or-chart/package.json+++ b/ui/component/or-chart/package.json@@ -16,9 +16,9 @@"@material/dialog": "^9.0.0","@openremote/core": "^1.0.3","@openremote/or-asset-tree": "^1.0.4",+ "@openremote/or-components": "^1.0.3","@openremote/or-icon": "^1.0.3","@openremote/or-mwc-components": "^1.0.3",- "@openremote/or-components": "^1.0.3","@openremote/or-translate": "^1.0.3","chart.js": "^3.1.0","chartjs-adapter-moment": "^1.0.0",@@ -29,6 +29,7 @@},"devDependencies": {"@types/chart.js": "^2.9.32",+ "@types/offscreencanvas": "^2019.6.3","tslint": ">=5.11.0","typescript": ">=4.1.3","webpack": "^5.16.0",diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.tsindex 7b05c662e..a8fb952ed 100644--- a/ui/component/or-chart/src/index.ts+++ b/ui/component/or-chart/src/index.ts@@ -89,6 +89,9 @@ export interface OrChartConfig {}};}+// Declare require method which we'll use for importing webpack resources (using ES6 imports will confuse typescript parser)+declare function require(name: string): any;+// TODO: Add webpack/rollup to build so consumers aren't forced to use the same toolingconst dialogStyle = require("@material/dialog/dist/mdc.dialog.css");const tableStyle = require("@material/data-table/dist/mdc.data-table.css");diff --git a/ui/component/or-chart/tsconfig.json b/ui/component/or-chart/tsconfig.jsonindex 8500b4fa2..e12128333 100644--- a/ui/component/or-chart/tsconfig.json+++ b/ui/component/or-chart/tsconfig.json@@ -3,7 +3,8 @@"compilerOptions": {"outDir": "./dist","tsBuildInfoFile": "./dist/.tsbuildinfo",- "rootDir": "src"+ "rootDir": "src",+ "types": ["offscreencanvas"]},"include": ["./src"diff --git a/yarn.lock b/yarn.lockindex 7ce58b27d..0e9fe43ea 100644--- a/yarn.lock+++ b/yarn.lock@@ -2459,6 +2459,13 @@resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==+"@types/offscreencanvas@^2019.6.3":+ version "2019.6.3"+ resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.6.3.tgz#0508eec9641f3228bf8a27009670166887dc966c"+ integrity sha512-957DsU187Y90EmlXneuqrqnwmwCkC9oPyQ/IEGwmDRpMfuhcGtjIz72Me7HvdK04ZC16A0VWmv0TSNLwC9ZvXw==+ dependencies:+ "@types/webgl2" "*"+"@types/qs@^6.5.3":version "6.9.6"resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"@@ -2474,6 +2481,11 @@resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-1.0.6.tgz#569b8a08121d3203398290d602d84d73c8dcf5da"integrity sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==+"@types/webgl2@*":+ version "0.0.6"+ resolved "https://registry.yarnpkg.com/@types/webgl2/-/webgl2-0.0.6.tgz#1ea2db791362bd8521548d664dbd3c5311cdf4b6"+ integrity sha512-50GQhDVTq/herLMiqSQkdtRu+d5q/cWHn4VvKJtrj4DJAjo1MNkWYa2MA41BaBO1q1HgsUjuQvEOk0QHvlnAaQ==+"@webassemblyjs/[email protected]":version "1.11.0"resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f"