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
Cleanup of UI build process
Rich Turnercbddab9039ec
diff --git a/.gitignore b/.gitignoreindex 0dcee9d76..51143ec1d 100644--- a/.gitignore+++ b/.gitignore@@ -23,6 +23,7 @@ out/bower_components/node_modules/yarn-error.log+ui/**/yarn.lockconsole/iOS/DerivedDataconsole/iOS/Podsdiff --git a/.yarnrc b/.yarnrcnew file mode 100644index 000000000..efdac8b82--- /dev/null+++ b/.yarnrc@@ -0,0 +1 @@+--install.frozen-lockfile true\ No newline at end of filediff --git a/build.gradle b/build.gradleindex cb7966347..cbcc25105 100644--- a/build.gradle+++ b/build.gradle@@ -1,10 +1,3 @@-apply plugin: 'idea'-idea {- module {- excludeDirs += file("node_modules")- }-}-allprojects {apply from: "${findProject(":openremote") != null ? project(":openremote").projectDir : rootDir}/project.gradle"}diff --git a/project.gradle b/project.gradleindex 8e4c6c951..bd7a51ca0 100644--- a/project.gradle+++ b/project.gradle@@ -38,6 +38,8 @@ idea {testOutputDir file('build/classes/test')excludeDirs += file(".node")excludeDirs += file("node_modules")+ excludeDirs += file("dist")+ excludeDirs += file("build")}}if (project.convention.findPlugin(JavaPluginConvention)) {@@ -57,6 +59,11 @@ ext.npmCommand = {isFamily(FAMILY_WINDOWS) ? "${cmd}.cmd" : cmd}+// Add yarn tasks+task yarnInstall(type: Exec){+ commandLine npmCommand("yarn"), "install"+}+// Add npm taskstask npmInstall(type: Exec){// Use yarn@@ -66,6 +73,7 @@ task npmClean(type: Exec){commandLine npmCommand("npm"), "run-script", "clean"}task npmBuild(type: Exec){+ dependsOn tasks.getByPath(":yarnInstall")commandLine npmCommand("npm"), "run-script", "build"}task npmTest(type: Exec){@@ -78,11 +86,6 @@ task npmServeProduction(type: Exec){commandLine npmCommand("npm"), "run-script", "serveProduction"}-// Add yarn tasks-task yarnInstall(type: Exec){- commandLine npmCommand("yarn"), "install"-}-// Add typescript taskstask tscWatch(type: Exec) {commandLine npmCommand("npx"), "tsc", "-b", "--watch"diff --git a/ui/app/smart-building-v1/build.gradle b/ui/app/smart-building-v1/build.gradleindex fc0dbecff..478fd4cc4 100644--- a/ui/app/smart-building-v1/build.gradle+++ b/ui/app/smart-building-v1/build.gradle@@ -1,5 +1,5 @@task build {- dependsOn rootProject.tasks.getByName("yarnInstall")+ dependsOn tasks.getByPath(":yarnInstall")}task installDist(type: Copy) {diff --git a/ui/build.gradle b/ui/build.gradleindex 6a467f3c4..70d114ae4 100644--- a/ui/build.gradle+++ b/ui/build.gradle@@ -1,10 +1,17 @@+task deleteNodeModules {+ doFirst {+ delete "${project(':openremote').projectDir}/node_modules"+ }+}+task build {- // Add dependency to openremote ui build+ dependsOn tasks.getByPath(":yarnInstall")++ // Add dependency to openremote ui build for custom projects+ // and also remove node_modules dir from openremote repoif (isCustomProject() && parent == rootProject) {- dependsOn resolveTask(":ui:build")+ dependsOn resolveTask(":ui:build"), deleteNodeModules}- // Build components before anything else- dependsOn getTasksByName("build", true).findAll {it.path.contains(":ui:component")}}task installDist {diff --git a/ui/component/build.gradle b/ui/component/build.gradlenew file mode 100644index 000000000..5430207ba--- /dev/null+++ b/ui/component/build.gradle@@ -0,0 +1,16 @@+task build() {+ // Build components before anything else and ensure model, rest and core is built before everything else+ dependsOn getTasksByName("build", true).findAll {++ def isComponentBuild = it.path.contains(":ui:component") && it.project != project+ if (isComponentBuild && !it.path.contains(":ui:component:core") && !it.path.contains(":ui:component:model") && !it.path.contains(":ui:component:rest")) {+ it.dependsOn resolveTask(":ui:component:core:build")+ }++ return isComponentBuild+ }+}++task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradleindex 39a0ebe92..e3a537889 100644--- a/ui/component/core/build.gradle+++ b/ui/component/core/build.gradle@@ -1,11 +1,17 @@+buildDir = "dist"+task clean() {doLast {delete "dist"}}+npmBuild.dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build")+task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}-npmBuild.dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build")\ No newline at end of file+task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/core/package.json b/ui/component/core/package.jsonindex 2b504fd70..fa374fcfa 100644--- a/ui/component/core/package.json+++ b/ui/component/core/package.json@@ -5,16 +5,16 @@"main": "dist/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {+ "@openremote/or-icon": "^1.0.0",+ "@openremote/rest": "^1.0.0","platform": "^1.3.5",- "url-search-params-polyfill": "^5.0.0",- "@openremote/model": "1.0.0",- "@openremote/rest": "1.0.0"+ "url-search-params-polyfill": "^5.0.0"},"devDependencies": {"tslint": "^5.11.0",diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex c36a6f06d..0819f6a99 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -1,6 +1,7 @@import 'url-search-params-polyfill';import {Console} from "./console";import rest from "@openremote/rest";+import {IconSets} from "@openremote/or-icon";import {AxiosRequestConfig} from 'axios';import {EventProvider, EventProviderStatus, WebSocketEventProvider} from "./event";@@ -20,8 +21,6 @@ export enum Auth {}export enum OREvent {- INIT = "INIT",- AUTHENTICATED = "AUTHENTICATED",ERROR = "ERROR",READY = "READY",CONSOLE_INIT = "CONSOLE_INIT",@@ -57,6 +56,7 @@ export interface ManagerConfig {consoleAutoEnable?: boolean;eventProviderType?: EventProviderType;pollingIntervalMillis?: number;+ loadIcons?: boolean;}export type EventCallback = (event: OREvent) => any;@@ -154,6 +154,10 @@ export class Manager {normalisedConfig.pollingIntervalMillis = 10000;}+ if (normalisedConfig.loadIcons === undefined) {+ normalisedConfig.loadIcons = true;+ }+return normalisedConfig;}@@ -203,18 +207,19 @@ export class Manager {}this._config = Manager.normaliseConfig(config);- let success = await this.doInit();++ let success = await this.doAuthInit();if (success) {- success = this.doRestApiInit();+ success = await this.doInit();}if (success) {- success = await this.doConsoleInit();+ success = this.doRestApiInit();}if (success) {- success = await this.doAuthInit();+ success = await this.doConsoleInit();}// TODO: Reinstate this once websocket supports anonymous connections@@ -245,6 +250,13 @@ export class Manager {oReq.send();});this._managerVersion = json && json.version ? json.version : "";++ // Async load material design icons if requested+ if (this._config.loadIcons) {+ let mdiIconSet = await import(/* webpackChunkName: "mdi-icons" */ "@openremote/or-icon/dist/mdi-icons");+ IconSets.addIconSet("mdi", mdiIconSet.default);+ }+return true;} catch (e) {// TODO: Implement auto retry?@@ -573,7 +585,8 @@ export class Manager {protected _emitEvent(event: OREvent) {window.setTimeout(() => {- for (const listener of this._listeners) {+ let listeners = this._listeners.slice();+ for (const listener of listeners) {listener(event);}}, 0);@@ -588,7 +601,6 @@ export class Manager {protected _setAuthenticated(authenticated: boolean) {this._authenticated = authenticated;if (authenticated) {- this._emitEvent(OREvent.AUTHENTICATED);if (!this._events) {this.doEventsSubscriptionInit();}diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradleindex 794daf6aa..c1a689e6e 100644--- a/ui/component/model/build.gradle+++ b/ui/component/model/build.gradle@@ -53,4 +53,8 @@ clean {}}-build.dependsOn generateTypeScript, npmBuild\ No newline at end of file+build.dependsOn generateTypeScript++task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/model/package.json b/ui/component/model/package.jsonindex 3155a82cb..8e6d97a4c 100644--- a/ui/component/model/package.json+++ b/ui/component/model/package.json@@ -11,9 +11,7 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {},- "devDependencies": {- "typescript": "^3.2.2"- },+ "devDependencies": {},"files": ["dist"]diff --git a/ui/component/or-header/build.gradle b/ui/component/or-header/build.gradleindex 489605e7b..7540a6212 100644--- a/ui/component/or-header/build.gradle+++ b/ui/component/or-header/build.gradle@@ -5,5 +5,9 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild+}++task installDist() {+ dependsOn build}diff --git a/ui/component/or-header/package.json b/ui/component/or-header/package.jsonindex 2fefdd7b5..e3893bdef 100644--- a/ui/component/or-header/package.json+++ b/ui/component/or-header/package.json@@ -5,7 +5,7 @@"main": "dist/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote",@@ -14,8 +14,6 @@"lit-element": "^2.0.1"},"devDependencies": {- "@polymer/decorators": "^3.0.0",- "@polymer/iron-demo-helpers": "^3.0.0-pre.19","@webcomponents/webcomponentsjs": "^2.0.0","css-loader": "^2.0.0","style-loader": "^0.23.1",diff --git a/ui/component/or-map/build.gradle b/ui/component/or-map/build.gradleindex 2a303e1e5..abc5ddcd1 100644--- a/ui/component/or-map/build.gradle+++ b/ui/component/or-map/build.gradle@@ -5,7 +5,9 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}-npmBuild.dependsOn resolveTask(":ui:component:rest:build")\ No newline at end of file+task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.jsonindex aba62f863..4e50f5376 100644--- a/ui/component/or-map/package.json+++ b/ui/component/or-map/package.json@@ -5,21 +5,19 @@"main": "dist/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@openremote/rest": "^1.0.0",- "@polymer/polymer": "^3.0.0",+ "@openremote/core": "^1.0.0",+ "lit-element": "^2.0.1","@types/mapbox-gl": "^0.51.1","mapbox-gl": "^0.52.0-beta.1","mapbox.js": "^3.1.1"},"devDependencies": {- "@polymer/decorators": "^3.0.0",- "@polymer/iron-demo-helpers": "^3.0.0-pre.19","@webcomponents/webcomponentsjs": "^2.0.0","css-loader": "^2.0.0","style-loader": "^0.23.1",diff --git a/ui/component/or-smart-notify/build.gradle b/ui/component/or-smart-notify/build.gradleindex 489605e7b..18f1ce16e 100644--- a/ui/component/or-smart-notify/build.gradle+++ b/ui/component/or-smart-notify/build.gradle@@ -5,5 +5,5 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild-}+ dependsOn npmBuild+}\ No newline at end of filediff --git a/ui/component/or-smart-notify/package.json b/ui/component/or-smart-notify/package.jsonindex fb72b4c7b..cddbaa97f 100644--- a/ui/component/or-smart-notify/package.json+++ b/ui/component/or-smart-notify/package.json@@ -5,7 +5,7 @@"main": "src/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote",diff --git a/ui/component/or-thermostat/build.gradle b/ui/component/or-thermostat/build.gradleindex 8a2c0b8b0..7540a6212 100644--- a/ui/component/or-thermostat/build.gradle+++ b/ui/component/or-thermostat/build.gradle@@ -4,6 +4,10 @@ task clean() {}}-//task build() {-// dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild-//}+task build() {+ dependsOn npmBuild+}++task installDist() {+ dependsOn build+}diff --git a/ui/component/or-thermostat/package.json b/ui/component/or-thermostat/package.jsonindex 56f9e2b03..431bd535b 100644--- a/ui/component/or-thermostat/package.json+++ b/ui/component/or-thermostat/package.json@@ -5,7 +5,7 @@"main": "dist/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote",diff --git a/ui/component/or-timeline/build.gradle b/ui/component/or-timeline/build.gradleindex 489605e7b..abc5ddcd1 100644--- a/ui/component/or-timeline/build.gradle+++ b/ui/component/or-timeline/build.gradle@@ -5,5 +5,9 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}++task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/or-timeline/package.json b/ui/component/or-timeline/package.jsonindex cb163b4ac..675b39da7 100644--- a/ui/component/or-timeline/package.json+++ b/ui/component/or-timeline/package.json@@ -5,7 +5,7 @@"main": "src/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote",diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex 58b4ca825..750de2dc3 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -54,6 +54,8 @@ clean {}}-build.dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+build.dependsOn generateTypeScript, resolveTask(":ui:component:model:build"), npmBuild-npmBuild.dependsOn resolveTask(":ui:component:model:build"), generateTypeScript\ No newline at end of file+task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/rest/package.json b/ui/component/rest/package.jsonindex 4b732f956..63f182624 100644--- a/ui/component/rest/package.json+++ b/ui/component/rest/package.json@@ -5,7 +5,7 @@"main": "dist/index.js","types": "src/index.ts","scripts": {- "build": "npx tsc",+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0"},"author": "OpenRemote",diff --git a/ui/demo/demo-core/babel.config.js b/ui/demo/demo-core/babel.config.jsnew file mode 100644index 000000000..a12d41ed6--- /dev/null+++ b/ui/demo/demo-core/babel.config.js@@ -0,0 +1,38 @@+module.exports = api => {++ api.cache(false);+ return {+ presets: [+ [+ "@babel/preset-env",+ {+ modules: false,+ exclude: ['transform-async-to-generator'],+ targets: [+ "last 2 versions",+ "IE 11"+ ]+ }+ ]+ ],+ plugins: [+ [+ "@babel/transform-runtime",+ {+ "corejs": false,+ "helpers": true,+ "regenerator": true,+ "useESModules": false+ }+ ],+ "@babel/syntax-dynamic-import",+ "@babel/syntax-object-rest-spread",+ [+ 'module:fast-async',+ {+ spec: true+ }+ ]+ ]+ };+};diff --git a/ui/demo/demo-core/build.gradle b/ui/demo/demo-core/build.gradleindex 0f9236645..b51126ceb 100644--- a/ui/demo/demo-core/build.gradle+++ b/ui/demo/demo-core/build.gradle@@ -1,11 +1,13 @@+buildDir = "dist"+task clean() {- doLast {- delete "dist"- }+ dependsOn npmClean}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}-npmBuild.dependsOn resolveTask(":ui:component:core:build")\ No newline at end of file+task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.jsonindex a11075412..fb2011203 100644--- a/ui/demo/demo-core/package.json+++ b/ui/demo/demo-core/package.json@@ -5,8 +5,9 @@"private": true,"scripts": {"clean": "npx shx rm -rf dist",- "build": "npx tsc -b && npx webpack",- "serve": "npx webpack-dev-server",+ "build": "node ../../model-build.js && npx tsc -b && npx cross-env NODE_ENV=production webpack",+ "serve": "node ../../model-build.js && npx tsc -b && npx webpack-dev-server",+ "watch": "node ../../model-build.js && npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",diff --git a/ui/demo/demo-core/src/index.ts b/ui/demo/demo-core/src/index.tsindex 55427a550..1a84aa24b 100644--- a/ui/demo/demo-core/src/index.ts+++ b/ui/demo/demo-core/src/index.ts@@ -1,14 +1,16 @@import {html, render} from "lit-html";-import {when} from "lit-html/directives/when";+ import {when} from "lit-html/directives/when";import rest from "@openremote/rest";import openremote, {Auth, Manager, OREvent} from "@openremote/core";+import "@openremote/or-icon";+import {IconSets} from "@openremote/or-icon";+import {IconSetSvg} from "@openremote/or-icon/dist/icon-set-svg";+import {AssetQuery,AttributeEvent,BaseAssetQueryInclude,- BaseAssetQueryMatch,- EventSubscription,- Asset+ BaseAssetQueryMatch} from "@openremote/model";let alarmEnabled = false;@@ -36,6 +38,9 @@ let mainTemplate = (openremote: Manager) => html`<p><b>Error:</b> ${openremote.error}</p><p><b>Config: </b> ${openremote.config ? JSON.stringify(openremote.config, null, 2) : ""}</p><p><b>Console Registration: </b>${openremote.console ? JSON.stringify(openremote.console.registration, null, 2) : ""}</p>+<p><b>Icon Example (Material Design icon set): </b><or-icon icon="access-point" /></p>+<p><b>Icon Example (OR icon set): </b><or-icon icon="or:logo"></or-icon><or-icon icon="or:logo-plain"></or-icon></p>+<p><b>Icon Example (dynamic Set click to add): </b><button @click="${() => {createIconSet()}}">Load</button>: <or-icon icon="test:x"></or-icon></p>`;let assetTemplate = (alarmEnabled: boolean) => html `@@ -47,6 +52,11 @@ async function refreshUI() {render(assetTemplate(alarmEnabled), document.getElementById("asset")!);}+function createIconSet() {+ let testIconSet = new IconSetSvg(100, {x: "<path d=\"M0,0 L100,100 M100,0 L0,100\" stroke=\"#000\"/>"});+ IconSets.addIconSet("test", testIconSet);+}+async function subscribeApartmentAttributeEvents(assetId: string) {let callback: (event: AttributeEvent) => void = (event) => {@@ -95,8 +105,10 @@ openremote.addListener((event: OREvent) => {console.log("OR Event:" + event);switch(event) {- case OREvent.AUTHENTICATED:- initApartment1Asset().then(refreshUI);+ case OREvent.READY:+ if (openremote.authenticated) {+ initApartment1Asset().then(refreshUI);+ }break;default:refreshUI();diff --git a/ui/demo/demo-core/webpack.config.js b/ui/demo/demo-core/webpack.config.jsindex 19fa56115..aaaa8d2e2 100644--- a/ui/demo/demo-core/webpack.config.js+++ b/ui/demo/demo-core/webpack.config.js@@ -37,7 +37,7 @@ module.exports = {{test: /\.js$/,include: function(modulePath) {- return /(@webcomponents[\/|\\]shadycss|lit-css|styled-lit-element|lit-html|@polymer|@lit|pwa-helpers)/.test(modulePath) || !/node_modules/.test(modulePath);+ return /(@webcomponents[\/|\\]shadycss|lit-css|styled-lit-element|lit-html|lit-element|@polymer|@lit|pwa-helpers)/.test(modulePath) || !/node_modules/.test(modulePath);},use: [{diff --git a/ui/demo/demo-or-header/build.gradle b/ui/demo/demo-or-header/build.gradleindex 694777f3a..b51126ceb 100644--- a/ui/demo/demo-or-header/build.gradle+++ b/ui/demo/demo-or-header/build.gradle@@ -1,9 +1,13 @@buildDir = "dist"-task build {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild-}-task clean() {dependsOn npmClean+}++task build() {+ dependsOn npmBuild+}++task installDist() {+ dependsOn build}\ No newline at end of filediff --git a/ui/demo/demo-or-header/package.json b/ui/demo/demo-or-header/package.jsonindex 433a2b7cf..998e0928b 100644--- a/ui/demo/demo-or-header/package.json+++ b/ui/demo/demo-or-header/package.json@@ -4,8 +4,9 @@"description": "Component Demo","scripts": {"clean": "npx shx rm -rf dist",- "build": "npx tsc -b && npx cross-env NODE_ENV=production webpack",- "serve": "npx webpack-dev-server",+ "build": "node ../../model-build.js && npx tsc -b && npx cross-env NODE_ENV=production webpack",+ "serve": "node ../../model-build.js && npx tsc -b && npx webpack-dev-server",+ "watch": "node ../../model-build.js && npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",diff --git a/ui/demo/demo-or-map/build.gradle b/ui/demo/demo-or-map/build.gradleindex 694777f3a..b51126ceb 100644--- a/ui/demo/demo-or-map/build.gradle+++ b/ui/demo/demo-or-map/build.gradle@@ -1,9 +1,13 @@buildDir = "dist"-task build {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild-}-task clean() {dependsOn npmClean+}++task build() {+ dependsOn npmBuild+}++task installDist() {+ dependsOn build}\ No newline at end of filediff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.jsonindex 023d94475..e6a302b9b 100644--- a/ui/demo/demo-or-map/package.json+++ b/ui/demo/demo-or-map/package.json@@ -4,8 +4,9 @@"description": "Component Demo","scripts": {"clean": "npx shx rm -rf dist",- "build": "npx tsc -b && npx cross-env NODE_ENV=production webpack",- "serve": "npx webpack-dev-server",+ "build": "node ../../model-build.js && npx tsc -b && npx cross-env NODE_ENV=production webpack",+ "serve": "node ../../model-build.js && npx tsc -b && npx webpack-dev-server",+ "watch": "node ../../model-build.js && npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",diff --git a/ui/demo/demo-or-map/webpack.config.js b/ui/demo/demo-or-map/webpack.config.jsindex 4191fec68..b577a324a 100644--- a/ui/demo/demo-or-map/webpack.config.js+++ b/ui/demo/demo-or-map/webpack.config.js@@ -45,7 +45,7 @@ module.exports = {{test: /\.js$/,include: function(modulePath) {- return /(@webcomponents[\/|\\]shadycss|lit-css|styled-lit-element|lit-html|@polymer|@lit|pwa-helpers)/.test(modulePath) || !/node_modules/.test(modulePath);+ return /(@webcomponents[\/|\\]shadycss|lit-css|styled-lit-element|lit-html|lit-element|@polymer|@lit|pwa-helpers)/.test(modulePath) || !/node_modules/.test(modulePath);},use: [{diff --git a/ui/demo/demo-or-thermostat/build.gradle b/ui/demo/demo-or-thermostat/build.gradleindex 694777f3a..b51126ceb 100644--- a/ui/demo/demo-or-thermostat/build.gradle+++ b/ui/demo/demo-or-thermostat/build.gradle@@ -1,9 +1,13 @@buildDir = "dist"-task build {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild-}-task clean() {dependsOn npmClean+}++task build() {+ dependsOn npmBuild+}++task installDist() {+ dependsOn build}\ No newline at end of filediff --git a/ui/demo/demo-or-thermostat/package.json b/ui/demo/demo-or-thermostat/package.jsonindex b0acd4e1e..29826bc14 100644--- a/ui/demo/demo-or-thermostat/package.json+++ b/ui/demo/demo-or-thermostat/package.json@@ -4,8 +4,9 @@"description": "Component Demo","scripts": {"clean": "npx shx rm -rf dist",- "build": "npx tsc -b && npx cross-env NODE_ENV=production webpack",- "serve": "npx webpack-dev-server",+ "build": "node ../../model-build.js && npx tsc -b && npx cross-env NODE_ENV=production webpack",+ "serve": "node ../../model-build.js && npx tsc -b && npx webpack-dev-server",+ "watch": "node ../../model-build.js && npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",diff --git a/ui/demo/demo-rest/babel.config.js b/ui/demo/demo-rest/babel.config.jsnew file mode 100644index 000000000..a12d41ed6--- /dev/null+++ b/ui/demo/demo-rest/babel.config.js@@ -0,0 +1,38 @@+module.exports = api => {++ api.cache(false);+ return {+ presets: [+ [+ "@babel/preset-env",+ {+ modules: false,+ exclude: ['transform-async-to-generator'],+ targets: [+ "last 2 versions",+ "IE 11"+ ]+ }+ ]+ ],+ plugins: [+ [+ "@babel/transform-runtime",+ {+ "corejs": false,+ "helpers": true,+ "regenerator": true,+ "useESModules": false+ }+ ],+ "@babel/syntax-dynamic-import",+ "@babel/syntax-object-rest-spread",+ [+ 'module:fast-async',+ {+ spec: true+ }+ ]+ ]+ };+};diff --git a/ui/demo/demo-rest/build.gradle b/ui/demo/demo-rest/build.gradleindex 0f9236645..b51126ceb 100644--- a/ui/demo/demo-rest/build.gradle+++ b/ui/demo/demo-rest/build.gradle@@ -1,11 +1,13 @@+buildDir = "dist"+task clean() {- doLast {- delete "dist"- }+ dependsOn npmClean}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}-npmBuild.dependsOn resolveTask(":ui:component:core:build")\ No newline at end of file+task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.jsonindex eb8da1e9e..4499c8452 100644--- a/ui/demo/demo-rest/package.json+++ b/ui/demo/demo-rest/package.json@@ -5,8 +5,9 @@"private": true,"scripts": {"clean": "npx shx rm -rf dist",- "build": "npx tsc -b && npx webpack",- "serve": "npx webpack-dev-server",+ "build": "node ../../model-build.js && npx tsc -b && npx cross-env NODE_ENV=production webpack",+ "serve": "node ../../model-build.js && npx tsc -b && npx webpack-dev-server",+ "watch": "node ../../model-build.js && npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",diff --git a/ui/model-build.js b/ui/model-build.jsnew file mode 100644index 000000000..743cb0694--- /dev/null+++ b/ui/model-build.js@@ -0,0 +1,14 @@+var path = require("path");+const { spawnSync } = require('child_process');++let dirs = __dirname.split(path.sep);+dirs.pop();+let cwd = dirs.join(path.sep);+let isORRepo = dirs.pop() === "openremote";++if (!isORRepo) {+ cwd = path.join(cwd, "openremote");+}++const gradleModelWatch = spawnSync('gradlew', ["modelWatch"], {cwd: cwd, shell: true});+process.exit(gradleModelWatch.status);\ No newline at end of filediff --git a/yarn.lock b/yarn.lockindex 3702a8ff6..eca2207cb 100644--- a/yarn.lock+++ b/yarn.lock@@ -691,174 +691,21 @@resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==-"@material/animation@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/animation/-/animation-1.0.0.tgz#dfd8575c8b031203917dc838ac0e3c0fe0f6709b"- integrity sha512-Ed5/vggn6ZhSJ87yn3ZS1d826VJNFz73jHF2bSsgRtHDoB8KCuOwQMfdgAgDa4lKDF6CDIPCKBZPKrs2ubehdw==- dependencies:- tslib "^1.9.3"--"@material/base@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/base/-/base-1.0.0.tgz#e4ef0b22c54aa887af94f5988fb1c0cb3245beba"- integrity sha512-5dxFp46x5FA+Epg6YHLzN+5zRt9S2wR84UdvVAEJ1egea94m9UHUg7y9tAnNSN16aexRSywmzyLwPr+i8PGEYA==- dependencies:- tslib "^1.9.3"--"@material/dom@^1.0.1":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@material/dom/-/dom-1.0.1.tgz#a0bff19e5c3d14a147dca91f55eb8410eee31739"- integrity sha512-7gb9Tk8YBn2fLEa5fJfvDexG0QxvRGDb8c6uZEhvK4bTd2ZHCfHg9KrO+smC6Trbn5jC+FsBvdRZBbMjtS/E4g==- dependencies:- tslib "^1.9.3"--"@material/elevation@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/elevation/-/elevation-1.0.0.tgz#c993d1d59b11357198d1b38947b141e4b4ab9a2d"- integrity sha512-TqmvEXmZDYLm2X5lEnjKCsZMDkCXpxFFxL22AfCAQB5L4d0gAS7vqDEE797y4Rp+BBKEcOP71mum1l56RI3NBQ==- dependencies:- "@material/animation" "^1.0.0"- "@material/feature-targeting" "^0.44.1"- "@material/theme" "^1.0.0"--"@material/feature-targeting@^0.44.1":- version "0.44.1"- resolved "https://registry.yarnpkg.com/@material/feature-targeting/-/feature-targeting-0.44.1.tgz#afafc80294e5efab94bee31a187273d43d34979a"- integrity sha512-90cc7njn4aHbH9UxY8qgZth1W5JgOgcEdWdubH1t7sFkwqFxS5g3zgxSBt46TygFBVIXNZNq35Xmg80wgqO7Pg==--"@material/floating-label@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/floating-label/-/floating-label-1.0.0.tgz#9e30644abe2fe160af14f83f06dc8d15f395dc0e"- integrity sha512-yESFi8HEUO0PmPWvaU3VW4X8+xaoFHhj2xGxLPu2hGye4ZBjTpmjOX6y1vwYqZLD5KWXj91k695UAT6J2wtWFQ==- dependencies:- "@material/animation" "^1.0.0"- "@material/base" "^1.0.0"- "@material/rtl" "^0.42.0"- "@material/theme" "^1.0.0"- "@material/typography" "^1.0.0"- tslib "^1.9.3"--"@material/line-ripple@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/line-ripple/-/line-ripple-1.0.0.tgz#d337880d08a35a3e60c1411be32355d7723ecc65"- integrity sha512-sFFpoFXVnqkknkac5bCrMhKGacay26AWVFfc3acaEGjQgkvF8VBV/bS41+CioACyubpc4JL69PU9Um/t7xAQVw==- dependencies:- "@material/animation" "^1.0.0"- "@material/base" "^1.0.0"- "@material/theme" "^1.0.0"- tslib "^1.9.3"--"@material/list@^1.0.1":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@material/list/-/list-1.0.1.tgz#772d29f8061f4e81c950c42a925a7175ca8e394e"- integrity sha512-u9Bx+mghPy2qCHcSH2b0+0jbjTtkXNdiWjb8JDQcYmOUTfFoeQ16GqvjTybRPwoKA0UC9Hc/4U8gYvnK+bReRw==- dependencies:- "@material/base" "^1.0.0"- "@material/dom" "^1.0.1"- "@material/feature-targeting" "^0.44.1"- "@material/ripple" "^1.0.1"- "@material/rtl" "^0.42.0"- "@material/shape" "^1.0.0"- "@material/theme" "^1.0.0"- "@material/typography" "^1.0.0"- tslib "^1.9.3"--"@material/menu-surface@^1.0.1":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@material/menu-surface/-/menu-surface-1.0.1.tgz#b6675771464ecf9ffa397bc2375c4fe29ff07396"- integrity sha512-JFUa3kQ+NtpuK/mgWIcyhC1AClKmt9EQdW4SG2KQhPAGg0juWiZwyMySDIjf+V0buSUZXZ7N26bi32+Y1LvZ3w==- dependencies:- "@material/animation" "^1.0.0"- "@material/base" "^1.0.0"- "@material/elevation" "^1.0.0"- "@material/feature-targeting" "^0.44.1"- "@material/rtl" "^0.42.0"- "@material/shape" "^1.0.0"- "@material/theme" "^1.0.0"- tslib "^1.9.3"--"@material/menu@^1.0.1":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@material/menu/-/menu-1.0.1.tgz#379a593a82281feed9b80c40c4c5b856370a0c35"- integrity sha512-fmBBHADc4hlp/yJSRHY+rjO0mzMYajSrTdXVycAv/pyml7VsjMa2MUf6NTSUpzpJf/snGcbfXo5RDJOGP1VbXg==- dependencies:- "@material/base" "^1.0.0"- "@material/feature-targeting" "^0.44.1"- "@material/list" "^1.0.1"- "@material/menu-surface" "^1.0.1"- "@material/ripple" "^1.0.1"- "@material/rtl" "^0.42.0"- tslib "^1.9.3"--"@material/notched-outline@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/notched-outline/-/notched-outline-1.0.0.tgz#50fb6fc7f6bff130da366239a40649bbccd7a4e4"- integrity sha512-P33NGEJMoWaXfjCleEoZnW9ZUA5c4V+jatMcsx/LidYUyXpl5f70V28ZOjwten4z+yBTezdIOx1cyjYrIn8CJw==- dependencies:- "@material/animation" "^1.0.0"- "@material/base" "^1.0.0"- "@material/floating-label" "^1.0.0"- "@material/rtl" "^0.42.0"- "@material/shape" "^1.0.0"- "@material/theme" "^1.0.0"- tslib "^1.9.3"--"@material/ripple@^1.0.1":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@material/ripple/-/ripple-1.0.1.tgz#2287f893ea4462a7f3a96d207397c6d2258e541e"- integrity sha512-aBigRoVMjIU2lLDq7TMocI2H2YFbO1hICs5FTdSRp4Yis/QFTrgaW32q8yuHdZI56j+b2BWIWapqA2xpSmCMXQ==- dependencies:- "@material/animation" "^1.0.0"- "@material/base" "^1.0.0"- "@material/dom" "^1.0.1"- "@material/feature-targeting" "^0.44.1"- "@material/theme" "^1.0.0"- tslib "^1.9.3"--"@material/rtl@^0.42.0":- version "0.42.0"- resolved "https://registry.yarnpkg.com/@material/rtl/-/rtl-0.42.0.tgz#1836e78186c2d8b996f6fbf97adab203535335bc"- integrity sha512-VrnrKJzhmspsN8WXHuxxBZ69yM5IwhCUqWr1t1eNfw3ZEvEj7i1g3P31HGowKThIN1dc1Wh4LE14rCISWCtv5w==--"@material/select@^1.0.1":- version "1.0.1"- resolved "https://registry.yarnpkg.com/@material/select/-/select-1.0.1.tgz#896112c292a37f606733fcba8dfd14545c663193"- integrity sha512-DG2Ud5SVO0h+rugyX3hbfVRW1UPYnMCYeUBAYtx3Vyu1eoEh2b2478IRKpGOMzGZOn6jF4cPP6l9fSLHQs5ayQ==- dependencies:- "@material/animation" "^1.0.0"- "@material/base" "^1.0.0"- "@material/floating-label" "^1.0.0"- "@material/line-ripple" "^1.0.0"- "@material/menu" "^1.0.1"- "@material/menu-surface" "^1.0.1"- "@material/notched-outline" "^1.0.0"- "@material/ripple" "^1.0.1"- "@material/rtl" "^0.42.0"- "@material/shape" "^1.0.0"- "@material/theme" "^1.0.0"- "@material/typography" "^1.0.0"- tslib "^1.9.3"--"@material/shape@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/shape/-/shape-1.0.0.tgz#bef17de1f282e5c71138338a34078d8402308f65"- integrity sha512-zfXEacPQZmH+ujVtaFyfAsYiF46j1QCcFzJeZVouG4pznrbA7XD6614Ywg0wbyWX5iB6hD52ld/IN+R/6oxKqA==- dependencies:- "@material/feature-targeting" "^0.44.1"--"@material/theme@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/theme/-/theme-1.0.0.tgz#6fd9ee1bb7fd2a5bdc6b7465cb15fe345e435670"- integrity sha512-Bg/BQLU5MmCwtQ3DHcSs9DodZB8PTvuItv1wXrP54S/wBVwryIB5uMDmERhnItbNnAFbkKhlAuhn1asMmMzfkQ==- dependencies:- "@material/feature-targeting" "^0.44.1"+"@mdi/svg@^3.5.95":+ version "3.5.95"+ resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-3.5.95.tgz#9e5c3dda43957bb436b75d5e0f3f7e57d8d2efb7"+ integrity sha512-OOHqPi6s6nEeOOvo9uZgdfLyTHGDiIXiAXtvIrCBbnU4mZFSHpskQUw7Yqmp/tluYzI6neLN5Dwy/vTusDcsdA==-"@material/typography@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@material/typography/-/typography-1.0.0.tgz#327ecfcac5ee3af8a3a102f3f125a761202f4189"- integrity sha512-Oeqbjci1cC7jTE8/n3dwnkqKe9ZeWiaE+rgMtRYtRFw1HvAw14SpGA5EEAS/Li2Hu2KZ50FYCe3HYqShfxtChA==+"@polymer/app-layout@^3.0.0":+ version "3.0.2"+ resolved "https://registry.yarnpkg.com/@polymer/app-layout/-/app-layout-3.0.2.tgz#8a6f3c87b405635fd3547db82db8dbb6c51b6bf9"+ integrity sha512-qKcQHj72uGxGoetjnNQ7pg4F6Da4U5jKBzZy0VRmDuZMUPDmtIqHaIgC5K6B4y+xUag0gkV9ce72Q3hNaK9y+g==dependencies:- "@material/feature-targeting" "^0.44.1"+ "@polymer/iron-flex-layout" "^3.0.0-pre.26"+ "@polymer/iron-media-query" "^3.0.0-pre.26"+ "@polymer/iron-resizable-behavior" "^3.0.0-pre.26"+ "@polymer/iron-scroll-target-behavior" "^3.0.0-pre.26"+ "@polymer/polymer" "^3.0.0""@polymer/decorators@^3.0.0":version "3.0.0"@@ -884,7 +731,7 @@"@polymer/polymer" "^3.0.0""@polymer/prism-element" "^3.0.0-pre.25"-"@polymer/iron-flex-layout@^3.0.0-pre.25":+"@polymer/iron-flex-layout@^3.0.0-pre.25", "@polymer/iron-flex-layout@^3.0.0-pre.26":version "3.0.1"resolved "https://registry.yarnpkg.com/@polymer/iron-flex-layout/-/iron-flex-layout-3.0.1.tgz#36f9e1a8eb792d279b2bc75d362628721ad37f0c"integrity sha512-7gB869czArF+HZcPTVSgvA7tXYFze9EKckvM95NB7SqYF+NnsQyhoXgKnpFwGyo95lUjUW9TFDLUwDXnCYFtkw==@@ -898,6 +745,27 @@dependencies:"@polymer/polymer" "^3.0.0"+"@polymer/iron-media-query@^3.0.0-pre.26":+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/@polymer/iron-media-query/-/iron-media-query-3.0.1.tgz#5cd8a1c1e8c9b8bafd3dd5da14e0f8d2cfa76d83"+ integrity sha512-czUX1pm1zfmfcZtq5J57XFkcobBv08Y50exp0/3v8Bos5VL/jv2tU0RwiTfDBxUMhjicGbgwEBFQPY2V5DMzyw==+ dependencies:+ "@polymer/polymer" "^3.0.0"++"@polymer/iron-resizable-behavior@^3.0.0-pre.26":+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/@polymer/iron-resizable-behavior/-/iron-resizable-behavior-3.0.1.tgz#e284348ed7c1c7e263f7039297532fa954025ea2"+ integrity sha512-FyHxRxFspVoRaeZSWpT3y0C9awomb4tXXolIJcZ7RvXhMP632V5lez+ch5G5SwK0LpnAPkg35eB0LPMFv+YMMQ==+ dependencies:+ "@polymer/polymer" "^3.0.0"++"@polymer/iron-scroll-target-behavior@^3.0.0-pre.26":+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/@polymer/iron-scroll-target-behavior/-/iron-scroll-target-behavior-3.0.1.tgz#29fa644b320fb29ab6c68eb6d08a6520157764ac"+ integrity sha512-xg1WanG25BIkQE8rhuReqY9zx1K5M7F+YAIYpswEp5eyDIaZ1Y3vUmVeQ3KG+hiSugzI1M752azXN7kvyhOBcQ==+ dependencies:+ "@polymer/polymer" "^3.0.0"+"@polymer/marked-element@^3.0.0-pre.25":version "3.0.1"resolved "https://registry.yarnpkg.com/@polymer/marked-element/-/marked-element-3.0.1.tgz#56add62080404dea142c055977807ae9ca773a89"@@ -1096,12 +964,17 @@"@webassemblyjs/wast-parser" "1.8.5""@xtuc/long" "4.2.2"+"@webcomponents/html-imports@^1.2.0":+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/@webcomponents/html-imports/-/html-imports-1.2.0.tgz#4213aae60faf47b6c47cc145dff4dc530ae6c2c4"+ integrity sha512-EIy8RqSfsoJ5Tk2wsfaSX4IKhXg8oYCq/xVEz8LEELXhv5tup/iZ/SInoz8SLtZGFP+vjUh2oRsgkUMhbrr0GQ==+"@webcomponents/shadycss@^1.5.2":version "1.9.0"resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.9.0.tgz#8450465037370d4f5c32e801bb2554a7cf2f5037"integrity sha512-g8Xa+6RSEME4g/wLJW4YII0eq15rvXp76RxPAuv7hx+Bdoi7GzZJ/EoZOUfyIbqAsQbII1TcWD4/+Xhs5NcM1w==-"@webcomponents/webcomponentsjs@^2.0.0", "@webcomponents/webcomponentsjs@^2.2.7":+"@webcomponents/webcomponentsjs@^2.0.0":version "2.2.7"resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.7.tgz#1f1a7a7aa083db5ae6aadaeda68caa8fd8657462"integrity sha512-kPPjzV+5kpoWpTniyvBSPcXS33f3j/C6HvNOJ3YecF3pvz3XwVeU4ammbxtVy/osF3z7hr1DYNptIf4oPEvXZA==@@ -1144,7 +1017,7 @@ acorn-es7-plugin@^1.1.7:resolved "https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz#f2ee1f3228a90eead1245f9ab1922eb2e71d336b"integrity sha1-8u4fMiipDurRJF+asZIusucdM2s=-"acorn@>= 2.5.2 <= 5.7.3":+"acorn@>= 2.5.2 <= 5.7.3", acorn@^5.0.0:version "5.7.3"resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==@@ -1442,6 +1315,11 @@ boolbase@~1.0.0:resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=+ version "4.1.3"+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"+ integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==+brace-expansion@^1.1.7:version "1.1.11"resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"@@ -1466,6 +1344,16 @@ braces@^2.3.1, braces@^2.3.2:split-string "^3.0.2"to-regex "^3.0.1"+brfs@^1.4.4:+ version "1.6.1"+ resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"+ integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==+ dependencies:+ quote-stream "^1.0.1"+ resolve "^1.1.5"+ static-module "^2.2.0"+ through2 "^2.0.0"+brorand@^1.0.1:version "1.1.0"resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"@@ -1544,6 +1432,11 @@ browserslist@^4.3.4:electron-to-chromium "^1.3.113"node-releases "^1.1.8"+ version "0.0.1"+ resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"+ integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=+buffer-from@^1.0.0:version "1.1.1"resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"@@ -1890,7 +1783,7 @@ content-type@~1.0.4:resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==-convert-source-map@^1.1.0:+convert-source-map@^1.1.0, convert-source-map@^1.5.1:version "1.6.0"resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==@@ -2129,6 +2022,11 @@ deep-extend@^0.6.0:resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==+deep-is@~0.1.3:+ version "0.1.3"+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"+ integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=+default-gateway@^4.0.1:version "4.2.0"resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"@@ -2315,6 +2213,13 @@ domutils@^1.5.1:dom-serializer "0"domelementtype "1"+duplexer2@~0.1.4:+ version "0.1.4"+ resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"+ integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=+ dependencies:+ readable-stream "^2.0.2"+duplexify@^3.4.2, duplexify@^3.6.0:version "3.7.1"resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"@@ -2432,6 +2337,30 @@ [email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=+escodegen@^1.8.1:+ version "1.11.1"+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"+ integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==+ dependencies:+ esprima "^3.1.3"+ estraverse "^4.2.0"+ esutils "^2.0.2"+ optionator "^0.8.1"+ optionalDependencies:+ source-map "~0.6.1"++escodegen@~1.9.0:+ version "1.9.1"+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"+ integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==+ dependencies:+ esprima "^3.1.3"+ estraverse "^4.2.0"+ esutils "^2.0.2"+ optionator "^0.8.1"+ optionalDependencies:+ source-map "~0.6.1"+eslint-scope@^4.0.0:version "4.0.2"resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.2.tgz#5f10cd6cabb1965bf479fa65745673439e21cb0e"@@ -2445,6 +2374,11 @@ esm@^3.0.84:resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.15.tgz#a6cf1b209c6718871cb35fd2a3733e7c3befc144"integrity sha512-GcKZRSlQ/QevC/t94FXYKbUobSTArdLfRBAV6t6HIguoUBfuFGomxSZbsRHySaTppixC9jtmzAX+0GF4tbJaJA==+esprima@^3.1.3:+ version "3.1.3"+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"+ integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=+esprima@^4.0.0:version "4.0.1"resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"@@ -2462,7 +2396,7 @@ esrecurse@^4.1.0:dependencies:estraverse "^4.1.0"-estraverse@^4.1.0, estraverse@^4.1.1:+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:version "4.2.0"resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=@@ -2605,6 +2539,16 @@ extglob@^2.0.4:snapdragon "^0.8.1"to-regex "^3.0.1"+falafel@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"+ integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=+ dependencies:+ acorn "^5.0.0"+ foreach "^2.0.5"+ isarray "0.0.1"+ object-keys "^1.0.6"+fast-async@^6.3.8:version "6.3.8"resolved "https://registry.yarnpkg.com/fast-async/-/fast-async-6.3.8.tgz#031b9e1d5a84608b117b3e7c999ad477ed2b08a2"@@ -2623,6 +2567,11 @@ fast-json-stable-stringify@^2.0.0:resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=+fast-levenshtein@~2.0.4:+ version "2.0.6"+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=+faye-websocket@^0.10.0:version "0.10.0"resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"@@ -2735,6 +2684,11 @@ for-in@^1.0.2:resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=+foreach@^2.0.5:+ version "2.0.5"+ resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"+ integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=+version "1.1.1"resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"@@ -2826,7 +2780,7 @@ geojson-rewind@^0.3.0:minimist "1.2.0"sharkdown "^0.1.0"-geojson-vt@^3.2.1:+geojson-vt@^3.2.0, geojson-vt@^3.2.1:version "3.2.1"resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==@@ -3169,6 +3123,16 @@ https-browserify@^1.0.0:resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=+i18next-xhr-backend@^1.5.1:+ version "1.5.1"+ resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5"+ integrity sha512-9OLdC/9YxDvTFcgsH5t2BHCODHEotHCa6h7Ly0EUlUC7Y2GS09UeoHOGj3gWKQ3HCqXz8NlH4gOrK3NNc9vPuw==++i18next@^14.1.1:+ version "14.1.1"+ resolved "https://registry.yarnpkg.com/i18next/-/i18next-14.1.1.tgz#d569aff68c088151f09fcb0cb6f44b36d62731d3"+ integrity sha512-HItn9RHLyrDqe6pw6qXMYHGPHNc3y1FZndJfBlD6k4sRS0FAlYLvqCDVIWFc1XultBgsv348TtvL/lleG6JgBg==+version "0.4.23"resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"@@ -3575,6 +3539,11 @@ json5@^2.1.0:dependencies:minimist "^1.2.0"+kdbush@^2.0.1:+ version "2.0.1"+ resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-2.0.1.tgz#90c6128e3001ac68c550d7c9e2f222c0269666f1"+ integrity sha512-9KqSdmWCkBIisFIGclT0FRagKhI7IVbMyUjsxCFG0Ly1Dg6whlxJ7b9lrq8ifk3X/fGeJzok1R75LQfZTfA5zQ==+kdbush@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0"@@ -3621,6 +3590,14 @@ [email protected]:resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.4.0.tgz#d5f56eeb2aa32787c24011e8be4c77e362ae171b"integrity sha512-x9j9tGY1+PDLN9pcWTx9/y6C5nezoTMB8BLK5jTakx+H7bPlnbCHfi9Hjg+Qt36sgDz/cb9lrSpNQXmk45Tvhw==+levn@~0.3.0:+ version "0.3.0"+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"+ integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=+ dependencies:+ prelude-ls "~1.1.2"+ type-check "~0.3.2"+lit-element@^2.0.1:version "2.0.1"resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.0.1.tgz#9ec5871d3b64487f432c7c071df80ef031d7091b"@@ -3754,7 +3731,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"integrity sha1-fD2mL/yzDw9agKJWbKJORdigHzE=-loose-envify@^1.0.0:+loose-envify@^1.0.0, loose-envify@^1.4.0:version "1.4.0"resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==@@ -3781,6 +3758,13 @@ lru-cache@^5.1.1:dependencies:yallist "^3.0.2"+magic-string@^0.22.4:+ version "0.22.5"+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"+ integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==+ dependencies:+ vlq "^0.2.2"+make-dir@^1.0.0:version "1.3.0"resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"@@ -3820,6 +3804,36 @@ map-visit@^1.0.0:dependencies:object-visit "^1.0.0"+mapbox-gl@^0.50.0:+ version "0.50.0"+ resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.50.0.tgz#49f44149f02fdd25ab64a2ec4efc7a11a5c96f55"+ integrity sha512-rr/fP1mlsQBtAE3JaYenSFM5tYRzYaSU1j7KsrPtICSHMzAUMrsl1TlnC5JpMbcZu6nu8R2GFTJ8hYsoBsX9Bg==+ dependencies:+ "@mapbox/geojson-types" "^1.0.2"+ "@mapbox/jsonlint-lines-primitives" "^2.0.2"+ "@mapbox/mapbox-gl-supported" "^1.4.0"+ "@mapbox/point-geometry" "^0.1.0"+ "@mapbox/tiny-sdf" "^1.1.0"+ "@mapbox/unitbezier" "^0.0.0"+ "@mapbox/vector-tile" "^1.3.1"+ "@mapbox/whoots-js" "^3.1.0"+ brfs "^1.4.4"+ csscolorparser "~1.0.2"+ earcut "^2.1.3"+ geojson-rewind "^0.3.0"+ geojson-vt "^3.2.0"+ gl-matrix "^2.6.1"+ grid-index "^1.0.0"+ minimist "0.0.8"+ murmurhash-js "^1.0.0"+ pbf "^3.0.5"+ potpack "^1.0.1"+ quickselect "^1.0.0"+ rw "^1.3.3"+ supercluster "^4.1.1"+ tinyqueue "^1.1.0"+ vt-pbf "^3.0.1"+mapbox-gl@^0.52.0-beta.1:version "0.52.0"resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.52.0.tgz#a43b61caa339ae28e43c87ecfbe9ce4032795859"@@ -3901,6 +3915,13 @@ [email protected]:resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"+ integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=+ dependencies:+ source-map "^0.5.6"+methods@~1.1.2:version "1.1.2"resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"@@ -3987,7 +4008,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=[email protected], minimist@^1.2.0:[email protected], minimist@^1.1.3, minimist@^1.2.0:version "1.2.0"resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=@@ -4072,7 +4093,14 @@ mocha@^3.4.2:mkdirp "0.5.1"supports-color "3.1.2"-moment@^2.24.0:+moment-es6@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/moment-es6/-/moment-es6-1.0.0.tgz#552fcf405d62565b0a1fe84e6c1e697ac79332df"+ integrity sha1-VS/PQF1iVlsKH+hObB5peseTMt8=+ dependencies:+ moment "*"++moment@*, moment@^2.22.2, moment@^2.24.0:version "2.24.0"resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==@@ -4328,7 +4356,12 @@ object-copy@^0.1.0:define-property "^0.2.5"kind-of "^3.0.3"-object-keys@^1.0.12:+object-inspect@~1.4.0:+ version "1.4.1"+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"+ integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==++object-keys@^1.0.12, object-keys@^1.0.6:version "1.1.0"resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==@@ -4386,6 +4419,18 @@ opn@^5.1.0:dependencies:is-wsl "^1.1.0"+optionator@^0.8.1:+ version "0.8.2"+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"+ integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=+ dependencies:+ deep-is "~0.1.3"+ fast-levenshtein "~2.0.4"+ levn "~0.3.0"+ prelude-ls "~1.1.2"+ type-check "~0.3.2"+ wordwrap "~1.0.0"+original@^1.0.0:version "1.0.2"resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"@@ -4717,6 +4762,11 @@ potpack@^1.0.1:resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==+prelude-ls@~1.1.2:+ version "1.1.2"+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"+ integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=+pretty-error@^2.0.2:version "2.1.1"resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"@@ -4827,6 +4877,11 @@ punycode@^2.1.0:resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==+pwa-helpers@^0.9.0:+ version "0.9.1"+ resolved "https://registry.yarnpkg.com/pwa-helpers/-/pwa-helpers-0.9.1.tgz#9ea22fa1996ab97df73b276cae962621c3fd2532"+ integrity sha512-4sP/C9sSxQ3w80AATmvCEI3R+MHzCwr2RSZEbLyMkeJgV3cRk7ySZRUrQnBDSA7A0/z6dkYtjuXlkhN1ZFw3iA==+version "6.5.2"resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"@@ -4852,6 +4907,15 @@ quickselect@^1.0.0:resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"integrity sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==+quote-stream@^1.0.1, quote-stream@~1.0.2:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"+ integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=+ dependencies:+ buffer-equal "0.0.1"+ minimist "^1.1.3"+ through2 "^2.0.0"+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:version "2.1.0"resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"@@ -4897,7 +4961,7 @@ rc@^1.2.7:minimist "^1.2.0"strip-json-comments "~2.0.1"-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:version "2.3.6"resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==@@ -4952,6 +5016,19 @@ redeyed@~0.4.0:dependencies:esprima "~1.0.4"+redux-thunk@^2.3.0:+ version "2.3.0"+ resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"+ integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==++redux@^4.0.0:+ version "4.0.1"+ resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"+ integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==+ dependencies:+ loose-envify "^1.4.0"+ symbol-observable "^1.2.0"+regenerate-unicode-properties@^8.0.2:version "8.0.2"resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"@@ -5059,6 +5136,11 @@ requires-port@^1.0.0:resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=+reselect@^3.0.1:+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"+ integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=+resolve-cwd@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"@@ -5091,7 +5173,7 @@ resolve-url@^0.2.1:resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=-resolve@^1.1.6, resolve@^1.3.2, resolve@^1.8.1:+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.3.2, resolve@^1.8.1:version "1.10.0"resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==@@ -5288,6 +5370,11 @@ sha.js@^2.4.0, sha.js@^2.4.8:inherits "^2.0.1"safe-buffer "^5.0.1"+shallow-copy@~0.0.1:+ version "0.0.1"+ resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"+ integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=+sharkdown@^0.1.0:version "0.1.0"resolved "https://registry.yarnpkg.com/sharkdown/-/sharkdown-0.1.0.tgz#61d4fe529e75d02442127cc9234362265099214f"@@ -5516,6 +5603,13 @@ stacky@^1.3.1:chalk "^1.1.1"lodash "^3.0.0"+static-eval@^2.0.0:+ version "2.0.2"+ resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"+ integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==+ dependencies:+ escodegen "^1.8.1"+static-extend@^0.1.1:version "0.1.2"resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"@@ -5524,6 +5618,26 @@ static-extend@^0.1.1:define-property "^0.2.5"object-copy "^0.1.0"+static-module@^2.2.0:+ version "2.2.5"+ resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"+ integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==+ dependencies:+ concat-stream "~1.6.0"+ convert-source-map "^1.5.1"+ duplexer2 "~0.1.4"+ escodegen "~1.9.0"+ falafel "^2.1.0"+ has "^1.0.1"+ magic-string "^0.22.4"+ merge-source-map "1.0.4"+ object-inspect "~1.4.0"+ quote-stream "~1.0.2"+ readable-stream "~2.3.3"+ shallow-copy "~0.0.1"+ static-eval "^2.0.0"+ through2 "~2.0.3"+"statuses@>= 1.4.0 < 2":version "1.5.0"resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"@@ -5641,6 +5755,13 @@ style-loader@^0.23.1:loader-utils "^1.1.0"schema-utils "^1.0.0"+supercluster@^4.1.1:+ version "4.1.1"+ resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-4.1.1.tgz#cf13c3b28a3fb3db5290bfad7f524e244bd4ce78"+ integrity sha512-sF0FfUOPFp96DKzwWFLeQOEqqKu2PpcesxAFeFsknA/q7g7igVVn/p3NI2XHEghNSyDAqunKNKqAbqNO8+7NDQ==+ dependencies:+ kdbush "^2.0.1"+supercluster@^5.0.0:version "5.0.0"resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-5.0.0.tgz#2a5a9b1ffbd0d6180dea10039d78b5d95fdb8f27"@@ -5674,6 +5795,11 @@ supports-color@^6.1.0:dependencies:has-flag "^3.0.0"+symbol-observable@^1.2.0:+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"+ integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==+tapable@^1.0.0, tapable@^1.1.0:version "1.1.1"resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"@@ -5715,7 +5841,7 @@ terser@^3.16.1:source-map "~0.6.1"source-map-support "~0.5.10"-through2@^2.0.0:+through2@^2.0.0, through2@~2.0.3:version "2.0.5"resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==@@ -5795,7 +5921,7 @@ trim-right@^1.0.1:resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:version "1.9.3"resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==@@ -5831,6 +5957,13 @@ [email protected]:resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=+type-check@~0.3.2:+ version "0.3.2"+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"+ integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=+ dependencies:+ prelude-ls "~1.1.2"+version "0.1.1"resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"@@ -6041,6 +6174,11 @@ vary@~1.1.2:resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=+vlq@^0.2.2:+ version "0.2.3"+ resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"+ integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==+version "0.0.4"resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"@@ -6237,6 +6375,11 @@ wide-align@^1.1.0:dependencies:string-width "^1.0.2 || 2"+wordwrap@~1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"+ integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=+worker-farm@^1.5.2:version "1.6.0"resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"@@ -6257,6 +6400,11 @@ wrappy@1:resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=+xpath@^0.0.27:+ version "0.0.27"+ resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"+ integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==+version "4.0.0"resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"