Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI fixes for production builds after RSPack migration (#2026)

Martin Peetersd77598ba909a
diff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradle
index ca7ec13c1..80f8715a4 100644
--- a/ui/component/core/build.gradle
+++ b/ui/component/core/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradle
index 5b5c20f4c..c147bbae2 100644
--- a/ui/component/model/build.gradle
+++ b/ui/component/model/build.gradle
@@ -31,6 +31,8 @@ clean {
doLast {
def dir = new File("${projectDir}/dist")
dir.deleteDir()
+ def libs = new File("${projectDir}/lib")
+ libs.deleteDir()
}
}
diff --git a/ui/component/or-app/build.gradle b/ui/component/or-app/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-app/build.gradle
+++ b/ui/component/or-app/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.ts
index 8d0b03625..94679538a 100644
--- a/ui/component/or-app/src/index.ts
+++ b/ui/component/or-app/src/index.ts
@@ -270,7 +270,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
this._activeMenu = activeMenu;
};
router.hooks({
- before(done, match) {
+ before: (done, match) => {
headerUpdater(match ? match.url.split('/')[0] : undefined);
done();
}
diff --git a/ui/component/or-asset-tree/build.gradle b/ui/component/or-asset-tree/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-asset-tree/build.gradle
+++ b/ui/component/or-asset-tree/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-asset-viewer/build.gradle b/ui/component/or-asset-viewer/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-asset-viewer/build.gradle
+++ b/ui/component/or-asset-viewer/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-attribute-card/build.gradle b/ui/component/or-attribute-card/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-attribute-card/build.gradle
+++ b/ui/component/or-attribute-card/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-attribute-history/build.gradle b/ui/component/or-attribute-history/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-attribute-history/build.gradle
+++ b/ui/component/or-attribute-history/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-attribute-input/build.gradle b/ui/component/or-attribute-input/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-attribute-input/build.gradle
+++ b/ui/component/or-attribute-input/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-attribute-picker/build.gradle b/ui/component/or-attribute-picker/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-attribute-picker/build.gradle
+++ b/ui/component/or-attribute-picker/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-chart/build.gradle b/ui/component/or-chart/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-chart/build.gradle
+++ b/ui/component/or-chart/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-components/build.gradle b/ui/component/or-components/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-components/build.gradle
+++ b/ui/component/or-components/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-dashboard-builder/build.gradle b/ui/component/or-dashboard-builder/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-dashboard-builder/build.gradle
+++ b/ui/component/or-dashboard-builder/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-data-viewer/build.gradle b/ui/component/or-data-viewer/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-data-viewer/build.gradle
+++ b/ui/component/or-data-viewer/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-gauge/build.gradle b/ui/component/or-gauge/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-gauge/build.gradle
+++ b/ui/component/or-gauge/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-icon/build.gradle b/ui/component/or-icon/build.gradle
index 2013f8202..9a96c19ec 100644
--- a/ui/component/or-icon/build.gradle
+++ b/ui/component/or-icon/build.gradle
@@ -9,6 +9,7 @@ task copyMdiFont(type: Exec) {
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-json-forms/build.gradle b/ui/component/or-json-forms/build.gradle
index f717c0bde..f708b00e6 100644
--- a/ui/component/or-json-forms/build.gradle
+++ b/ui/component/or-json-forms/build.gradle
@@ -1,6 +1,7 @@
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-log-viewer/build.gradle b/ui/component/or-log-viewer/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-log-viewer/build.gradle
+++ b/ui/component/or-log-viewer/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-map/build.gradle b/ui/component/or-map/build.gradle
index 7a61f90d0..5e9999d4e 100644
--- a/ui/component/or-map/build.gradle
+++ b/ui/component/or-map/build.gradle
@@ -1,6 +1,7 @@
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-mwc-components/build.gradle b/ui/component/or-mwc-components/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-mwc-components/build.gradle
+++ b/ui/component/or-mwc-components/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-rules/build.gradle b/ui/component/or-rules/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-rules/build.gradle
+++ b/ui/component/or-rules/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-smart-notify/build.gradle b/ui/component/or-smart-notify/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-smart-notify/build.gradle
+++ b/ui/component/or-smart-notify/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-survey-results/build.gradle b/ui/component/or-survey-results/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-survey-results/build.gradle
+++ b/ui/component/or-survey-results/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-survey/build.gradle b/ui/component/or-survey/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-survey/build.gradle
+++ b/ui/component/or-survey/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-thermostat/build.gradle b/ui/component/or-thermostat/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-thermostat/build.gradle
+++ b/ui/component/or-thermostat/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-timeline/build.gradle b/ui/component/or-timeline/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-timeline/build.gradle
+++ b/ui/component/or-timeline/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-translate/build.gradle b/ui/component/or-translate/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-translate/build.gradle
+++ b/ui/component/or-translate/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/or-tree-menu/build.gradle b/ui/component/or-tree-menu/build.gradle
index f6811c4fd..05e00b4bf 100644
--- a/ui/component/or-tree-menu/build.gradle
+++ b/ui/component/or-tree-menu/build.gradle
@@ -3,6 +3,7 @@ buildDir = "dist"
task clean() {
doLast {
delete "dist"
+ delete "lib"
}
}
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
index 233c32d8a..a640a7671 100644
--- a/ui/component/rest/build.gradle
+++ b/ui/component/rest/build.gradle
@@ -36,6 +36,8 @@ clean {
doLast {
def dir = new File("${projectDir}/dist")
dir.deleteDir()
+ def libs = new File("${projectDir}/lib")
+ libs.deleteDir()
}
}