Skip to content

armgit / core

Public Imported from GitHub
0

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

UI build config updates

Rich Turnerb8562154e56b
diff --git a/client/src/main/webapp/build.gradle b/client/src/main/webapp/build.gradle
index 2514daf2b..a63dda53e 100644
--- a/client/src/main/webapp/build.gradle
+++ b/client/src/main/webapp/build.gradle
@@ -1,3 +1,3 @@
task installDist {
- dependsOn 'yarnInstall'
+ dependsOn tasks.getByPath(":yarnInstall")
}
\ No newline at end of file
diff --git a/client/src/main/webapp/yarn.lock b/client/src/main/webapp/yarn.lock
deleted file mode 100644
index 71849ce8d..000000000
--- a/client/src/main/webapp/yarn.lock
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@polymer/app-localize-behavior@^0.10.1-pre.3":
- version "0.10.1-pre.3"
- resolved "https://registry.yarnpkg.com/@polymer/app-localize-behavior/-/app-localize-behavior-0.10.1-pre.3.tgz#9856ccbf9cee66631c6f4a869d146089b14f55f8"
- integrity sha1-mFbMv5zuZmMcb0qGnRRgibFPVfg=
- dependencies:
- "@polymer/iron-ajax" preview
- "@polymer/polymer" preview
- intl-messageformat "^1.0.0"
-
-"@polymer/app-route@^0.9.3-pre.3":
- version "0.9.3-pre.3"
- resolved "https://registry.yarnpkg.com/@polymer/app-route/-/app-route-0.9.3-pre.3.tgz#42ec32497d30e15592ecbbb3604d40e244caef15"
- integrity sha1-QuwySX0w4VWS7LuzYE1A4kTK7xU=
- dependencies:
- "@polymer/iron-location" preview
- "@polymer/polymer" preview
-
-"@polymer/iron-ajax@preview":
- version "1.4.3-pre.3"
- resolved "https://registry.yarnpkg.com/@polymer/iron-ajax/-/iron-ajax-1.4.3-pre.3.tgz#a3b31b5622ca85be6d73bb60b8902bdc1c85b08c"
- integrity sha1-o7MbViLKhb5tc7tguJAr3ByFsIw=
- dependencies:
- "@polymer/polymer" preview
- "@polymer/promise-polyfill" gloo
-
-"@polymer/iron-flex-layout@^1.3.1-pre.3":
- version "1.3.1-pre.3"
- resolved "https://registry.yarnpkg.com/@polymer/iron-flex-layout/-/iron-flex-layout-1.3.1-pre.3.tgz#4545f11ff2f3817098ec128c7d62779864b3c1bc"
- integrity sha1-RUXxH/LzgXCY7BKMfWJ3mGSzwbw=
- dependencies:
- "@polymer/polymer" preview
-
-"@polymer/iron-location@preview":
- version "0.8.11-pre.3"
- resolved "https://registry.yarnpkg.com/@polymer/iron-location/-/iron-location-0.8.11-pre.3.tgz#9ab735812eb4505f9efa19b8374e71446a153a1d"
- integrity sha1-mrc1gS60UF+e+hm4N05xRGoVOh0=
- dependencies:
- "@polymer/polymer" preview
-
-"@polymer/polymer@^2.6.1", "@polymer/polymer@preview":
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-2.6.1.tgz#d233d0676cd634057a673fd8c2e62100d3b5a4e6"
- integrity sha512-XBzaKlSZ094i8zfkOgczn08Gk4TWPLtGh3leANGIKLuzboid4totBt2RkBgHjRl8DgY6Up3+Jm+3lHz6W8QA+g==
-
-"@polymer/promise-polyfill@^1.0.1-pre.3", "@polymer/promise-polyfill@gloo":
- version "1.0.1-pre.3"
- resolved "https://registry.yarnpkg.com/@polymer/promise-polyfill/-/promise-polyfill-1.0.1-pre.3.tgz#3f534df183648c78c48f93d678a7db37be7e81fb"
- integrity sha1-P1NN8YNkjHjEj5PWeKfbN75+gfs=
- dependencies:
- "@polymer/polymer" preview
-
-"@webcomponents/shadycss@^1.1.1":
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.6.0.tgz#2aeb0703983137a733bdb5c06fff125aa1f8c5c1"
- integrity sha512-iURGZZU6BaiRJtGgjMn208QxPkY11QwT/VmuHNa4Yb+kJxU/WODe4C8b0LDOtnk4KJzJg50hCfwvPRAjePEzbA==
-
-"@webcomponents/webcomponentsjs@^1.1.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.3.0.tgz#57983165d8651e742bdd14c2718f8cc6c228496e"
- integrity sha512-x7x4rfXfX+xlg0Cdy752IVC8SjjOuMfjSNi1Vy7GKfWCm/MKSc42wGubngPl6/nO7w+nHM/MvfhTD/aEngA7/w==
-
-chart.js@^2.7.0:
- version "2.7.3"
- resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.3.tgz#cdb61618830bf216dc887e2f7b1b3c228b73c57e"
- integrity sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==
- dependencies:
- chartjs-color "^2.1.0"
- moment "^2.10.2"
-
-chartjs-color-string@^0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
- integrity sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==
- dependencies:
- color-name "^1.0.0"
-
-chartjs-color@^2.1.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
- integrity sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=
- dependencies:
- chartjs-color-string "^0.5.0"
- color-convert "^0.5.3"
-
-color-convert@^0.5.3:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
- integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
-
-color-name@^1.0.0:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
- integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-font-awesome@^4.7.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
- integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
- integrity sha1-WQa3+VOrdHDg3IVJCXtki5kYkv8=
-
-intl-messageformat@^1.0.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae"
- integrity sha1-99kmre16OrGbLcYB79VOmaS9Tq4=
- dependencies:
- intl-messageformat-parser "1.2.0"
-
-intl@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
- integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
-
-moment@^2.10.2, moment@^2.20.1:
- version "2.22.2"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
- integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
diff --git a/package.json b/package.json
index e3bc2bbeb..af0b1d1ef 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
"workspaces": [
"ui/app/*",
"ui/component/*",
- "ui/demo/*"
+ "ui/demo/*",
+ "client/src/main/webapp"
],
"resolutions": {
"growl": "^1.10.5"
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.json
index c01fdcaba..981ac8cd8 100644
--- a/ui/component/or-map/package.json
+++ b/ui/component/or-map/package.json
@@ -11,6 +11,8 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
+ "@polymer/polymer": "^3.2.0",
+ "@polymer/decorators": "^3.0.0",
"@openremote/core": "^1.0.0",
"lit-element": "^2.0.1",
"@types/mapbox-gl": "^0.51.1",
diff --git a/yarn.lock b/yarn.lock
index 160f64eba..ea56ab380 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6369,3 +6369,124 @@ yargs@^12.0.5:
which-module "^2.0.0"
y18n "^3.2.1 || ^4.0.0"
yargs-parser "^11.1.1"
+
+"@polymer/app-localize-behavior@^0.10.1-pre.3":
+ version "0.10.1-pre.3"
+ resolved "https://registry.yarnpkg.com/@polymer/app-localize-behavior/-/app-localize-behavior-0.10.1-pre.3.tgz#9856ccbf9cee66631c6f4a869d146089b14f55f8"
+ integrity sha1-mFbMv5zuZmMcb0qGnRRgibFPVfg=
+ dependencies:
+ "@polymer/iron-ajax" preview
+ "@polymer/polymer" preview
+ intl-messageformat "^1.0.0"
+
+"@polymer/app-route@^0.9.3-pre.3":
+ version "0.9.3-pre.3"
+ resolved "https://registry.yarnpkg.com/@polymer/app-route/-/app-route-0.9.3-pre.3.tgz#42ec32497d30e15592ecbbb3604d40e244caef15"
+ integrity sha1-QuwySX0w4VWS7LuzYE1A4kTK7xU=
+ dependencies:
+ "@polymer/iron-location" preview
+ "@polymer/polymer" preview
+
+"@polymer/iron-ajax@preview":
+ version "1.4.3-pre.3"
+ resolved "https://registry.yarnpkg.com/@polymer/iron-ajax/-/iron-ajax-1.4.3-pre.3.tgz#a3b31b5622ca85be6d73bb60b8902bdc1c85b08c"
+ integrity sha1-o7MbViLKhb5tc7tguJAr3ByFsIw=
+ dependencies:
+ "@polymer/polymer" preview
+ "@polymer/promise-polyfill" gloo
+
+"@polymer/iron-flex-layout@^1.3.1-pre.3":
+ version "1.3.1-pre.3"
+ resolved "https://registry.yarnpkg.com/@polymer/iron-flex-layout/-/iron-flex-layout-1.3.1-pre.3.tgz#4545f11ff2f3817098ec128c7d62779864b3c1bc"
+ integrity sha1-RUXxH/LzgXCY7BKMfWJ3mGSzwbw=
+ dependencies:
+ "@polymer/polymer" preview
+
+"@polymer/iron-location@preview":
+ version "0.8.11-pre.3"
+ resolved "https://registry.yarnpkg.com/@polymer/iron-location/-/iron-location-0.8.11-pre.3.tgz#9ab735812eb4505f9efa19b8374e71446a153a1d"
+ integrity sha1-mrc1gS60UF+e+hm4N05xRGoVOh0=
+ dependencies:
+ "@polymer/polymer" preview
+
+"@polymer/polymer@^2.6.1", "@polymer/polymer@preview":
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-2.6.1.tgz#d233d0676cd634057a673fd8c2e62100d3b5a4e6"
+ integrity sha512-XBzaKlSZ094i8zfkOgczn08Gk4TWPLtGh3leANGIKLuzboid4totBt2RkBgHjRl8DgY6Up3+Jm+3lHz6W8QA+g==
+
+"@polymer/promise-polyfill@^1.0.1-pre.3", "@polymer/promise-polyfill@gloo":
+ version "1.0.1-pre.3"
+ resolved "https://registry.yarnpkg.com/@polymer/promise-polyfill/-/promise-polyfill-1.0.1-pre.3.tgz#3f534df183648c78c48f93d678a7db37be7e81fb"
+ integrity sha1-P1NN8YNkjHjEj5PWeKfbN75+gfs=
+ dependencies:
+ "@polymer/polymer" preview
+
+"@webcomponents/shadycss@^1.1.1":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.6.0.tgz#2aeb0703983137a733bdb5c06fff125aa1f8c5c1"
+ integrity sha512-iURGZZU6BaiRJtGgjMn208QxPkY11QwT/VmuHNa4Yb+kJxU/WODe4C8b0LDOtnk4KJzJg50hCfwvPRAjePEzbA==
+
+"@webcomponents/webcomponentsjs@^1.1.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.3.0.tgz#57983165d8651e742bdd14c2718f8cc6c228496e"
+ integrity sha512-x7x4rfXfX+xlg0Cdy752IVC8SjjOuMfjSNi1Vy7GKfWCm/MKSc42wGubngPl6/nO7w+nHM/MvfhTD/aEngA7/w==
+
+chart.js@^2.7.0:
+ version "2.7.3"
+ resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.3.tgz#cdb61618830bf216dc887e2f7b1b3c228b73c57e"
+ integrity sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==
+ dependencies:
+ chartjs-color "^2.1.0"
+ moment "^2.10.2"
+
+chartjs-color-string@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
+ integrity sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==
+ dependencies:
+ color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
+ integrity sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=
+ dependencies:
+ chartjs-color-string "^0.5.0"
+ color-convert "^0.5.3"
+
+color-convert@^0.5.3:
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+ integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
+
+color-name@^1.0.0:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+font-awesome@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+ integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
+
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
+ integrity sha1-WQa3+VOrdHDg3IVJCXtki5kYkv8=
+
+intl-messageformat@^1.0.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae"
+ integrity sha1-99kmre16OrGbLcYB79VOmaS9Tq4=
+ dependencies:
+ intl-messageformat-parser "1.2.0"
+
+intl@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
+ integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
+
+moment@^2.10.2, moment@^2.20.1:
+ version "2.22.2"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+ integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=