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 updates: Added or-log-viewer and multi select support for or-mwc-menu
Rich Turnerf1bb62e7fdb4
diff --git a/ui/component/core/src/event.ts b/ui/component/core/src/event.tsindex 1bf73aa60..c66137c31 100644--- a/ui/component/core/src/event.ts+++ b/ui/component/core/src/event.ts@@ -529,7 +529,7 @@ export class WebSocketEventProvider extends EventProviderImpl {let str = msg.substring(EVENT_MESSAGE_PREFIX.length);let triggered = JSON.parse(str) as TriggeredEventSubscription;if (triggered.events) {- triggered.events.forEach(event => {+ triggered.events.forEach((event) => {this._onMessageReceived(triggered.subscriptionId!, event);});}diff --git a/ui/component/model/package.json b/ui/component/model/package.jsonindex 4132591d7..00da92231 100644--- a/ui/component/model/package.json+++ b/ui/component/model/package.json@@ -6,7 +6,7 @@"module": "dist/index.js","types": "dist/index.d.ts","scripts": {- "build": "npx tsc -b",+ "build": "npx tsc -b --force","test": "echo \"No tests\" && exit 0","prepublishOnly": "npx tsc -b"},diff --git a/ui/component/model/tsconfig.json b/ui/component/model/tsconfig.jsonindex 2a3b78ac3..632d4d8a1 100644--- a/ui/component/model/tsconfig.json+++ b/ui/component/model/tsconfig.json@@ -3,7 +3,8 @@"compilerOptions": {"outDir": "./dist","tsBuildInfoFile": "./dist/.tsbuildinfo",- "rootDir": "src"+ "rootDir": "src",+ "preserveConstEnums": true},"include": ["./src"diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.tsindex c8619f304..536243b6d 100644--- a/ui/component/or-asset-tree/src/index.ts+++ b/ui/component/or-asset-tree/src/index.ts@@ -1,7 +1,7 @@import {customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";import "@openremote/or-input";import "@openremote/or-icon";-import {Asset, AssetQuery, AssetTreeNode, AssetType, Tenant} from "@openremote/model";+import {Asset, AssetQuery, AssetTreeNode, Constants, Tenant, ClientRole} from "@openremote/model";import "@openremote/or-translate";import {style} from "./style";import manager, {AssetModelUtil, OREvent, EventCallback} from "@openremote/core";@@ -20,16 +20,16 @@ export interface UiAssetTreeNode extends AssetTreeNode {}interface RequestEventDetail<T> {- allow: boolean,- detail: T+ allow: boolean;+ detail: T;}interface NodeClickEventDetail {- node: UiAssetTreeNode,- clickEvent: MouseEvent+ node: UiAssetTreeNode;+ clickEvent: MouseEvent;}-export {style}+export {style};export class OrAssetTreeRequestSelectEvent extends CustomEvent<RequestEventDetail<NodeClickEventDetail>> {@@ -118,8 +118,8 @@ declare global {}}-//TODO: Add websocket support-//TODO: Make modal a standalone component+// TODO: Add websocket support+// TODO: Make modal a standalone component@customElement("or-asset-tree")export class OrAssetTree extends LitElement {@@ -225,9 +225,9 @@ export class OrAssetTree extends LitElement {${getContentWithMenuTemplate(html`<or-input type="${InputType.BUTTON}" icon="sort-variant"></or-input>`,- ["name", "type", "createdOn", "status"].map((sort) => {return {value: sort, content: html`<span class="no-wrap">${i18next.t(sort)}</span>`} as MenuItem;}),+ ["name", "type", "createdOn", "status"].map((sort) => { return {value: sort, text: i18next.t(sort)} as MenuItem; }),this.sortBy,- (v) => this._onSortClicked(v))}+ (v) => this._onSortClicked(v as string))}</div></div>@@ -250,7 +250,7 @@ export class OrAssetTree extends LitElement {}protected _isReadonly() {- return this.readonly || !manager.hasRole("write:rules");+ return this.readonly || !manager.hasRole(ClientRole.WRITE_RULES);}protected _treeNodeTemplate(treeNode: UiAssetTreeNode, level: number): TemplateResult | string {diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex dc239f84a..5e1edc01a 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -388,7 +388,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}or-attribute-history {- --or-attribute-history-controls-margin: 0 0 0 204px;+ --or-attribute-history-controls-margin: 0 0 20px 204px;}@media screen and (max-width: 2028px) {@@ -410,7 +410,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem}or-attribute-history {- --or-attribute-history-controls-margin: 10px 0 0 0;+ --or-attribute-history-controls-margin: 10px 0 20px 0;--or-attribute-history-controls-margin-children: 0 auto 20px auto;}}diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.jsonindex 957074d06..ce403ce5e 100644--- a/ui/component/or-attribute-history/package.json+++ b/ui/component/or-attribute-history/package.json@@ -16,7 +16,7 @@"@openremote/or-input": "^1.1.0","@openremote/or-panel": "^1.1.0","@openremote/or-translate": "^1.1.0",- "@material/data-table": "^3.2.0",+ "@material/data-table": "^4.0.0","chart.js": "^2.8.0","jsonpath-plus": "^1.1.0","moment": "^2.24.0",diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.tsindex 5fd2e49c6..643155574 100644--- a/ui/component/or-attribute-history/src/index.ts+++ b/ui/component/or-attribute-history/src/index.ts@@ -110,7 +110,7 @@ const style = css`:host {--internal-or-attribute-history-background-color: var(--or-attribute-history-background-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));--internal-or-attribute-history-text-color: var(--or-attribute-history-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));- --internal-or-attribute-history-controls-margin: var(--or-attribute-history-controls-margin, 0);+ --internal-or-attribute-history-controls-margin: var(--or-attribute-history-controls-margin, 0 0 20px 0);--internal-or-attribute-history-controls-margin-children: var(--or-attribute-history-controls-margin-children, 0 auto 20px auto);--internal-or-attribute-history-graph-fill-color: var(--or-attribute-history-graph-fill-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));--internal-or-attribute-history-graph-fill-opacity: var(--or-attribute-history-graph-fill-opacity, 1);@@ -128,7 +128,7 @@ const style = css`display: block;}- :host[hidden] {+ :host([hidden]) {display: none;}@@ -310,6 +310,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {<or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-left" @click="${() => this._updateTimestamp(this.timestamp!, false)}"></or-input><or-input id="ending-date" .type="${InputType.DATETIME}" ?disabled="${disabled}" label="${i18next.t("ending")}" .value="${this.timestamp}" @or-input-changed="${(evt: OrInputChangedEvent) => this._updateTimestamp(moment(evt.detail.value as string).toDate())}"></or-input><or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-right" @click="${() => this._updateTimestamp(this.timestamp!, true)}"></or-input>+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled}" icon="chevron-double-right" @click="${() => this._updateTimestamp(new Date())}"></or-input></div></div>@@ -510,7 +511,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {path: "$." + prop,stringify: typeof(value) === "object",numeric: !isNaN(Number(value))- } as TableColumnConfig+ } as TableColumnConfig;});} else {config.columns.push({@@ -525,7 +526,7 @@ export class OrAttributeHistory extends translate(i18next)(LitElement) {config.columns.push({header: "timestamp",type: "timestamp"- })+ });}}diff --git a/ui/component/or-input/package.json b/ui/component/or-input/package.jsonindex 6ce97af5f..30d98a066 100644--- a/ui/component/or-input/package.json+++ b/ui/component/or-input/package.json@@ -14,17 +14,17 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@material/button": "^3.2.0",- "@material/checkbox": "^3.2.0",+ "@material/button": "^4.0.0",+ "@material/checkbox": "^4.0.0","@material/fab": "^4.0.0",- "@material/floating-label": "^3.2.0",- "@material/form-field": "^3.2.0",- "@material/icon-button": "^3.2.0",- "@material/line-ripple": "^3.1.0",- "@material/ripple": "^3.2.0",- "@material/select": "^3.2.0",- "@material/switch": "^3.2.0",- "@material/textfield": "^3.2.0",+ "@material/floating-label": "^4.0.0",+ "@material/form-field": "^4.0.0",+ "@material/icon-button": "^4.0.0",+ "@material/line-ripple": "^4.0.0",+ "@material/ripple": "^4.0.0",+ "@material/select": "^4.0.0",+ "@material/switch": "^4.0.0",+ "@material/textfield": "^4.0.0","lit-element": "^2.2.1"},"devDependencies": {diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.tsindex f2c4ba420..3518b942f 100644--- a/ui/component/or-input/src/index.ts+++ b/ui/component/or-input/src/index.ts@@ -92,6 +92,11 @@ const style = css`--mdc-theme-on-primary: var(--internal-or-input-text-color);--mdc-theme-secondary: var(--internal-or-input-color);}++ :host([hidden]) {+ display: none;+ }+:host([type=select]) {height: 56px;@@ -107,8 +112,13 @@ const style = css`}#component {+ width: inherit;max-width: 100%;}++ #menu-anchor {+ width: inherit;+ }.or-input--rounded {border-radius: 50% !important;@@ -143,6 +153,10 @@ const style = css`white-space: nowrap;}+ .mdc-select {+ white-space: nowrap;+ }+.mdc-select__dropdown-icon {background: none;}@@ -248,14 +262,14 @@ export class OrInput extends LitElement {@property({type: String})public iconOn?: string;+ @property({type: String})+ public iconTrailing?: string;+@property({type: Boolean})public dense: boolean = false;/* BUTTON STYLES START */- @property({type: Boolean})- public iconTrailing: boolean = false;-@property({type: Boolean})public raised: boolean = false;@@ -348,6 +362,7 @@ export class OrInput extends LitElement {const classes = {"mdc-select--outlined": outlined,"mdc-select--disabled": this.disabled,+ "mdc-select--required": this.required,"mdc-select--dense": this.dense,"mdc-select--no-label": !this.label,"mdc-select--with-leading-icon": !!this.icon@@ -369,15 +384,15 @@ export class OrInput extends LitElement {this._selectedIndex = -1;return html`- <div id="menu-anchor" class="mdc-menu-surface--anchor"></div>- <div id="component" class="mdc-select ${classMap(classes)}"- ?required="${this.required}"- ?readonly="${this.readonly}"- ?disabled="${this.disabled}"- @MDCSelect:change="${(e: MDCSelectEvent) => this.onValueChange(undefined, e.detail.index === -1 ? undefined : e.detail.value)}">- <or-icon class="mdc-select__dropdown-icon" icon="menu-down"></or-icon>- <div id="elem" class="mdc-select__selected-text" role="button" aria-haspopup="listbox" aria-controls="component-helper-text" aria-describedby="component-helper-text" aria-labelledby="component-label component"></div>- <div id="menu" class="mdc-select__menu mdc-menu mdc-menu-surface" role="listbox">+ <div id="component" class="mdc-select ${classMap(classes)}" @MDCSelect:change="${(e: MDCSelectEvent) => this.onValueChange(undefined, e.detail.index === -1 ? undefined : Array.isArray(this.options![e.detail.index]) ? this.options![e.detail.index][0] : this.options![e.detail.index])}">+ <div id="menu-anchor" class="mdc-select__anchor select-class">+ <or-icon class="mdc-select__dropdown-icon" icon="menu-down"></or-icon>+ <div id="elem" class="mdc-select__selected-text" role="button" aria-haspopup="listbox" aria-controls="component-helper-text" aria-describedby="component-helper-text" aria-labelledby="component-label component"></div>+ ${outlined ? this.renderOutlined(labelTemplate) : labelTemplate}+ ${!outlined ? html`<div class="mdc-line-ripple"></div>` : ``}+ </div>++ <div class="mdc-select__menu mdc-menu mdc-menu-surface select-class" role="listbox"><ul class="mdc-list">${opts ? opts.map(([optValue, optDisplay], index) => {if (this.value === optValue) {@@ -386,14 +401,13 @@ export class OrInput extends LitElement {return html`<li class="mdc-list-item" role="option" data-value="${optValue}">${optDisplay}</li>`;}) : ``}</ul>- </div>- ${outlined ? this.renderOutlined(labelTemplate) : labelTemplate}- ${!outlined ? html`<div class="mdc-line-ripple"></div>` : ``}+ </div>++ ${hasHelper ? html`+ <p id="component-helper-text" class="mdc-select-helper-text ${classMap(helperClasses)}" aria-hidden="true">+ ${showValidationMessage ? this.validationMessage : this.helperText}+ </p>` : ``}</div>- ${hasHelper ? html`- <p id="component-helper-text" class="mdc-select-helper-text ${classMap(helperClasses)}" aria-hidden="true">- ${showValidationMessage ? this.validationMessage : this.helperText}- </p>` : ``}`;case InputType.BUTTON_TOGGLE:return html`@@ -441,7 +455,7 @@ export class OrInput extends LitElement {?checked="${this.value}"?required="${this.required}"?disabled="${this.disabled || this.readonly}"- @change="${(e: Event) => this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).value)}"+ @change="${(e: Event) => this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).checked)}"class="mdc-checkbox__native-control" id="elem"/><div class="mdc-checkbox__background"><svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">@@ -498,7 +512,7 @@ export class OrInput extends LitElement {"mdc-text-field--dense": this.type !== InputType.TEXTAREA && this.type !== InputType.JSON && this.dense,"mdc-text-field--no-label": !this.label,"mdc-text-field--with-leading-icon": !!this.icon,- "mdc-text-field--with-trailing-icon": this.iconTrailing+ "mdc-text-field--with-trailing-icon": !!this.iconTrailing};const helperClasses = {"mdc-text-field-helper-text--persistent": this.helperPersistent,@@ -518,7 +532,7 @@ export class OrInput extends LitElement {maxlength="${ifDefined(this.maxLength)}"rows="${this.rows ? this.rows : 5}"cols="${ifDefined(this.cols)}"- aria-label="${ifDefined(this.label)}">${val}</textarea>+ aria-label="${ifDefined(this.label)}">${val ? val : ""}</textarea>${this.renderOutlined(labelTemplate)}` :html`<input type="${this.type}" id="elem" class="mdc-text-field__input"@@ -526,7 +540,7 @@ export class OrInput extends LitElement {?readonly="${this.readonly}"?disabled="${this.disabled}"@change="${(e: Event) => this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).value)}"- .value="${val}"+ .value="${val ? val : ""}"min="${ifDefined(this.min)}"max="${ifDefined(this.max)}"step="${ifDefined(this.step)}"@@ -568,14 +582,9 @@ export class OrInput extends LitElement {}if (component && this.type) {- switch(this.type) {+ switch (this.type) {case InputType.SELECT:- // Need to reverse the hoisting of the menu to the body- const menuAnchor = this.shadowRoot!.getElementById("menu-anchor");- const menu = this.shadowRoot!.getElementById("menu");const mdcSelect = new MDCSelect(component);- menuAnchor!.appendChild(menu!);- (mdcSelect as any).menu_.setIsHoisted(false);this._mdcComponent = mdcSelect;mdcSelect.selectedIndex = this._selectedIndex;break;diff --git a/ui/component/or-log-viewer/.npmignore b/ui/component/or-log-viewer/.npmignorenew file mode 100644index 000000000..17e64b1ad--- /dev/null+++ b/ui/component/or-log-viewer/.npmignore@@ -0,0 +1,8 @@+build/+build.gradle+test/+src/+webpack.config.js+tsconfig.json+dist/*.map+.tsbuildinfo\ No newline at end of filediff --git a/ui/component/or-log-viewer/README.md b/ui/component/or-log-viewer/README.mdnew file mode 100644index 000000000..6df242ca9--- /dev/null+++ b/ui/component/or-log-viewer/README.md@@ -0,0 +1,31 @@+# @openremote/or-log-viewer \<or-log-viewer\>+[![NPM Version][npm-image]][npm-url]+[![Linux Build][travis-image]][travis-url]+[![Test Coverage][coveralls-image]][coveralls-url]++Web Component for displaying system logs.++## Install+```bash+npm i @openremote/or-attribute-history+yarn add @openremote/or-attribute-history+```++## Usage+For a full list of properties, methods and options refer to the TypeDoc generated [documentation]().+++## Supported Browsers+The last 2 versions of all modern browsers are supported, including Chrome, Safari, Opera, Firefox, Edge. In addition,+Internet Explorer 11 is also supported.+++## License+[GNU AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)++[npm-image]: https://img.shields.io/npm/v/live-xxx.svg+[npm-url]: https://npmjs.org/package/@openremote/or-input+[travis-image]: https://img.shields.io/travis/live-js/live-xxx/master.svg+[travis-url]: https://travis-ci.org/live-js/live-xxx+[coveralls-image]: https://img.shields.io/coveralls/live-js/live-xxx/master.svg+[coveralls-url]: https://coveralls.io/r/live-js/live-xxx?branch=masterdiff --git a/ui/component/or-log-viewer/build.gradle b/ui/component/or-log-viewer/build.gradlenew file mode 100644index 000000000..98cdcb8e2--- /dev/null+++ b/ui/component/or-log-viewer/build.gradle@@ -0,0 +1,15 @@+buildDir = "dist"++task clean() {+ doLast {+ delete "dist"+ }+}++task prepareUi() {+ dependsOn clean, npmPrepare+}++task publishUi() {+ dependsOn clean, npmPublish+}\ No newline at end of filediff --git a/ui/component/or-log-viewer/package.json b/ui/component/or-log-viewer/package.jsonnew file mode 100644index 000000000..52fa5da2d--- /dev/null+++ b/ui/component/or-log-viewer/package.json@@ -0,0 +1,28 @@+{+ "name": "@openremote/or-log-viewer",+ "version": "1.1.0",+ "description": "OpenRemote syslog viewer",+ "main": "dist/umd/index.bundle.js",+ "module": "dist/index.js",+ "types": "dist/index.d.ts",+ "scripts": {+ "test": "echo \"No tests\" && exit 0",+ "prepublishOnly": "npx tsc -b && npx webpack"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "parse-link-header": "^1.0.1",+ "@material/data-table": "^4.0.0",+ "@openremote/core": "^1.1.0",+ "lit-element": "^2.2.1",+ "moment": "^2.24.0"+ },+ "devDependencies": {++ "tslint": ">=5.11.0",+ "typescript": ">=3.4.5",+ "webpack": "^4.41.2",+ "webpack-cli": "^3.3.9"+ }+}diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.tsnew file mode 100644index 000000000..3523991bd--- /dev/null+++ b/ui/component/or-log-viewer/src/index.ts@@ -0,0 +1,595 @@+import {+ css,+ customElement,+ html,+ LitElement,+ property,+ PropertyValues,+ query,+ TemplateResult,+ unsafeCSS+} from "lit-element";+import i18next from "i18next";+import {translate} from "@openremote/or-translate";+import * as Model from "@openremote/model";+import manager, {DefaultColor2, DefaultColor3} from "@openremote/core";+import "@openremote/or-input";+import "@openremote/or-panel";+import "@openremote/or-translate";+import {InputType, OrInputChangedEvent} from "@openremote/or-input";+import {MDCDataTable} from "@material/data-table";+import moment from "moment";+import "@openremote/or-mwc-components/dist/or-mwc-menu";+import {getContentWithMenuTemplate, MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";+import { GenericAxiosResponse } from "axios";++// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling+const linkParser = require("parse-link-header");+const tableStyle = require("!!raw-loader!@material/data-table/dist/mdc.data-table.css");++export interface ViewerConfig {+ allowedCategories?: Model.SyslogCategory[];+ initialCategories?: Model.SyslogCategory[];+ initialFilter?: string;+ initialLevel?: Model.SyslogLevel;+ hideCategories?: boolean;+ hideFilter?: boolean;+ hideLevel?: boolean;+}++// language=CSS+const style = css`+ :host {+ --internal-or-log-viewer-background-color: var(--or-log-viewer-background-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));+ --internal-or-log-viewer-text-color: var(--or-log-viewer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));+ --internal-or-log-viewer-controls-margin: var(--or-log-viewer-controls-margin, 0);++ display: block;+ }++ :host([hidden]) {+ display: none;+ }++ #container {+ display: flex;+ min-width: 0;+ width: 100%;+ height: 100%;+ flex-direction: column;+ }++ #msg {+ height: 100%;+ width: 100%;+ justify-content: center;+ align-items: center;+ text-align: center;+ }++ #msg:not([hidden]) {+ display: flex;+ }++ #controls {+ flex: 0;+ display: flex;+ flex-wrap: wrap;+ justify-content: space-between;+ margin: var(--internal-or-log-viewer-controls-margin);+ padding: 0 20px 20px 20px;+ }++ #controls > * {+ margin-top: 20px;+ }++ #time-controls {+ display: flex;+ align-items: center;+ }++ #live-button {+ margin-right: 40px;+ }++ #period-select {+ width: 90px;+ }++ #level-select {+ width: 120px;+ }++ #limit-select {+ width: 80px;+ }++ #log-controls, #ending-controls, #page-controls {+ display: flex;+ max-width: 100%;+ align-items: center;+ }++ #ending-controls {+ float: right;+ margin: 0 10px;+ }++ #log-controls > *, #ending-controls > *, #page-controls > * {+ padding: 0 5px;+ }++ #page-controls[hidden] {+ visibility: hidden;+ }++ #ending-date {+ min-width: 0;+ }++ #table-container {+ height: 100%;+ overflow: auto;+ }++ #table {+ width: 100%;+ margin-bottom: 10px;+ }++ #table > table {+ width: 100%;+ table-layout: fixed;+ }++ #table th, #table td {+ word-wrap: break-word;+ white-space: pre-wrap;+ }+`;++@customElement("or-log-viewer")+export class OrLogViewer extends translate(i18next)(LitElement) {++ public static DEFAULT_TIMESTAMP_FORMAT = "L HH:mm:ss";+ public static DEFAULT_LIMIT = 50;+ public static DEFAULT_LEVEL = Model.SyslogLevel.INFO;+ public static DEFAULT_INTERVAL = Model.DatapointInterval.HOUR;++ static get styles() {+ return [+ css`${unsafeCSS(tableStyle)}`,+ style+ ];+ }++ @property({type: String})+ public interval?: Model.DatapointInterval;++ @property({type: Number})+ public timestamp?: Date;++ @property({type: Number})+ public limit?: number;++ @property({type: Array})+ public categories?: Model.SyslogCategory[];++ @property({type: String})+ public filter?: string;++ @property({type: String})+ public level?: Model.SyslogLevel;++ @property({type: Boolean})+ public live: boolean = false;++ @property({type: Object})+ public config?: ViewerConfig;++ @property()+ protected _loading: boolean = false;++ @property()+ protected _data?: Model.SyslogEvent[];++ @query("#table")+ protected _tableElem!: HTMLDivElement;+ protected _table?: MDCDataTable;+ protected _eventSubscriptionId?: string;+ protected _refresh?: number;+ protected _pageCount?: number;+ protected _currentPage: number = 1;++ connectedCallback() {+ super.connectedCallback();+ }++ disconnectedCallback(): void {+ super.disconnectedCallback();+ this._cleanup();+ this._unsubscribeEvents();+ }++ shouldUpdate(_changedProperties: PropertyValues): boolean {++ if (_changedProperties.has("level")+ || _changedProperties.has("interval")+ || _changedProperties.has("timestamp")+ || _changedProperties.has("limit")+ || _changedProperties.has("categories")+ || _changedProperties.has("filter")+ || _changedProperties.has("live")) {+ if (!this.live) {+ this._pageCount = undefined;+ this._currentPage = 1;+ this._data = undefined;+ }+ }++ if (!this.interval) {+ this.interval = OrLogViewer.DEFAULT_INTERVAL;+ }++ if (!this.level) {+ this.level = OrLogViewer.DEFAULT_LEVEL;+ }++ if (!this.limit) {+ this.limit = OrLogViewer.DEFAULT_LIMIT;+ }++ if (!this.categories) {+ if (this.config && this.config.initialCategories) {+ this.categories = [...this.config.initialCategories];+ } else {+ this.categories = Object.keys((Model as any)["SyslogCategory"]) as Model.SyslogCategory[];+ }+ }++ if (!this.live && !this.timestamp) {+ this.timestamp = new Date();+ }++ if (!this._data && !this.live) {+ this._loadData();+ }++ if (this.live) {+ this._subscribeEvents();+ } else {+ this._unsubscribeEvents();+ }++ return super.shouldUpdate(_changedProperties);+ }++ render() {++ const disabled = this._loading;+ const isLive = this.live;++ const hideCategories = this.config && this.config.hideCategories;+ const hideFilter = this.config && this.config.hideFilter;+ const hideLevel = this.config && this.config.hideLevel;++ return html`+ <div id="container">+ <div id="controls">+ <div id="log-controls">+ ${hideCategories ? `` : getContentWithMenuTemplate(+ html`<or-input .type=${InputType.BUTTON} raised ?disabled="${disabled}" .label="${i18next.t("categories")}" icontrailing="chevron-down"></or-input>`,+ this._getCategoryMenuItems(),+ this.categories,+ (v) => this._onCategoriesChanged(v as Model.SyslogCategory[]),+ true+ )}+ <or-input ?hidden="${hideFilter}" .type="${InputType.TEXT}" outlined ?disabled="${disabled}" icontrailing="magnify" .label="${i18next.t("subCategoryFilters")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onFilterChanged(evt.detail.value)}"></or-input>+ <or-input ?hidden="${hideLevel}" .type="${InputType.SELECT}" id="level-select" outlined ?disabled="${disabled}" .label="${i18next.t("level")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onLevelChanged(evt.detail.value)}" .value="${this.level}" .options="${this._getLevelOptions()}"></or-input>+ <or-input .type="${ InputType.SELECT}" id="limit-select" outlined ?disabled="${disabled}" .label="${i18next.t("limit")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onLimitChanged(evt.detail.value)}" .value="${this.limit}" .options="${this._getLimitOptions()}"></or-input>+ </div>+ <div id="page-controls" ?hidden="${isLive || !this._pageCount || !this._data || this._data.length === 0}">+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled || isLive || this._currentPage === 1}" icon="chevron-left" @click="${() => this._updatePage(false)}"></or-input>+ <span>${this._currentPage}</span><or-translate value="of"></or-translate><span>${this._pageCount}</span>+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled || isLive || this._currentPage === this._pageCount || (this._data && this._data.length < (this.limit || 50))}" icon="chevron-right" @click="${() => this._updatePage(true)}"></or-input>+ </div>+ <div id="time-controls">+ <or-input id="live-button" .type="${InputType.CHECKBOX}" ?disabled="${disabled}" .label="${i18next.t("live")}" @or-input-changed="${(evt: OrInputChangedEvent) => this._onLiveChanged(evt.detail.value)}" .value="${this.live}"></or-input>+ <or-input .type="${InputType.SELECT}" id="period-select" outlined ?disabled="${disabled || isLive}" .label="${i18next.t("period")}" @or-input-changed="${(evt: OrInputChangedEvent) => this.interval = evt.detail.value}" .value="${this.interval}" .options="${this._getIntervalOptions()}"></or-input>+ <div id="ending-controls">+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled || isLive}" icon="chevron-left" @click="${() => this.timestamp = this._calculateTimestamp(this.timestamp!, false)}"></or-input>+ <or-input id="ending-date" outlined .type="${InputType.DATETIME}" ?disabled="${disabled || isLive}" label="${i18next.t("ending")}" .value="${this.timestamp}" @or-input-changed="${(evt: OrInputChangedEvent) => this.timestamp = this._calculateTimestamp(moment(evt.detail.value as string).toDate())}"></or-input>+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled || isLive}" icon="chevron-right" @click="${() => this.timestamp = this._calculateTimestamp(this.timestamp!, true)}"></or-input>+ <or-input class="button" .type="${InputType.BUTTON}" ?disabled="${disabled || isLive}" icon="chevron-double-right" @click="${() => this.timestamp = this._calculateTimestamp(new Date())}"></or-input>+ </div>+ </div>+ </div>++ ${disabled ? html`<div id="msg">${i18next.t("loading")}</div>` :+ html`<div id="table-container">+ ${this._data ? this._getTable() : ``}+ </div>`}+ </div>+ `;+ }++ protected _getLimitOptions() {+ return [25, 50, 100, 200];+ }++ protected _getLevelOptions() {+ return Object.keys((Model as any)["SyslogLevel"]).map((key) => [key, i18next.t(key.toLocaleLowerCase())]);+ }++ protected _getCategoryMenuItems(): MenuItem[] {+ const categories = this.config && this.config.allowedCategories ? this.config.allowedCategories : Object.keys((Model as any)["SyslogCategory"]) as Model.SyslogCategory[];+ return categories.map((cat) => {+ return {+ text: cat,+ value: cat+ } as MenuItem;+ });+ }++ protected _onCategoriesChanged(values: Model.SyslogCategory[]) {+ this.categories = [...values];++ if (this.categories && this.live) {+ this._data = this._data!.filter((e) => this.categories!.find((c) => c === e.category));+ }+ }++ protected _onLiveChanged(live: boolean) {+ this.live = live;+ if (live) {+ this._data = [];+ this._pageCount = undefined;+ this._currentPage = 1;+ }+ }++ protected _onLimitChanged(limit: number) {+ this.limit = limit;++ if (this.live && this._data!.length > limit) {+ this._data!.splice(limit - 1);+ }+ }++ protected _onFilterChanged(filter: string) {+ this.filter = filter;++ if (!this.filter) {+ return;+ }++ if (this.live) {+ const filters = this.filter.split(";");+ this._data = this._data!.filter((e) => filters.find((f) => f === e.subCategory));+ }+ }++ protected _onLevelChanged(level: Model.SyslogLevel) {+ this.level = level;++ if (!this.level) {+ return;+ }++ if (this.live) {+ this._data = this._data!.filter((e) => this._eventMatchesLevel(e));+ }+ }++ protected _getTable(): TemplateResult {++ return html`+ <div id="table" class="mdc-data-table">+ <table class="mdc-data-table__table" aria-label="logs list">+ <thead>+ <tr class="mdc-data-table__header-row">+ <th style="width: 180px" class="mdc-data-table__header-cell" role="columnheader" scope="col">${i18next.t("timestamp")}</th>+ <th style="width: 80px" class="mdc-data-table__header-cell" role="columnheader" scope="col">${i18next.t("level")}</th>+ <th style="width: 130px" class="mdc-data-table__header-cell" role="columnheader" scope="col">${i18next.t("category")}</th>+ <th style="width: 180px" class="mdc-data-table__header-cell" role="columnheader" scope="col">${i18next.t("subCategory")}</th>+ <th style="width: 100%; min-width: 300px;" class="mdc-data-table__header-cell" role="columnheader" scope="col">${i18next.t("message")}</th>+ </tr>+ </thead>+ <tbody class="mdc-data-table__content">+ ${this._data!.map((ev) => {+ return html`+ <tr class="mdc-data-table__row">+ <td class="mdc-data-table__cell">${moment(ev.timestamp).format(OrLogViewer.DEFAULT_TIMESTAMP_FORMAT)}</td>+ <td class="mdc-data-table__cell">${i18next.t(ev.level!)}</td>+ <td class="mdc-data-table__cell">${i18next.t(ev.category!)}</td>+ <td class="mdc-data-table__cell">${i18next.t(ev.subCategory!)}</td>+ <td class="mdc-data-table__cell">${ev.message}</td>+ </tr>+ `;+ })}+ </tbody>+ </table>+ </div>+ `;+ }++ protected _getIntervalOptions(): [string, string][] {+ return [+ Model.DatapointInterval.HOUR,+ Model.DatapointInterval.DAY,+ Model.DatapointInterval.WEEK,+ Model.DatapointInterval.MONTH,+ Model.DatapointInterval.YEAR+ ].map((interval) => {+ return [interval, i18next.t(interval.toLowerCase())];+ });+ }++ protected async _loadData() {+ if (this._loading) {+ return;+ }++ this._loading = true;++ const response = await manager.rest.api.SyslogResource.getEvents({+ level: this.level,+ per_page: this.limit,+ page: this._currentPage,+ from: this._getFrom(),+ to: this.timestamp ? this.timestamp.getTime() : undefined,+ category: this.categories as Model.SyslogCategory[],+ subCategory: this.filter ? this.filter.split(";") : undefined+ });++ this._loading = false;++ if (response.status === 200) {+ // Get page count+ this._pageCount = this._getPageCount(response);+ this._data = response.data;+ }+ }++ protected _getPageCount(response: GenericAxiosResponse<any>): number | undefined {+ const linkHeaders = response.headers["link"] as string;+ if (linkHeaders) {+ const links = linkParser(linkHeaders);+ const lastLink = links["last"];+ if (lastLink) {+ return lastLink["page"] as number;+ }+ }+ }++ protected _updatePage(forward: boolean) {+ if (!this._pageCount) {+ return;+ }++ if (forward) {+ if (this._currentPage < this._pageCount) {+ this._data = undefined;+ this._currentPage++;+ }+ } else {+ if (this._currentPage > 1) {+ this._data = undefined;+ this._currentPage--;+ }+ }+ }++ protected async _subscribeEvents() {+ if (manager.events) {+ this._eventSubscriptionId = await manager.events.subscribe<Model.SyslogEvent>({+ eventType: "syslog"+ }, (ev) => this._onEvent(ev));+ }+ }++ protected _unsubscribeEvents() {+ if (this._eventSubscriptionId) {+ manager.events!.unsubscribe(this._eventSubscriptionId);+ this._eventSubscriptionId = undefined;+ }+ }++ protected _getFrom(): number | undefined {+ if (!this.timestamp || !this.interval) {+ return;+ }++ return this._calculateTimestamp(this.timestamp, false)!.getTime();+ }++ protected _calculateTimestamp(timestamp: Date, forward?: boolean): Date | undefined {+ if (!this.interval) {+ return;+ }++ const newMoment = moment(timestamp);++ if (forward !== undefined) {+ switch (this.interval) {+ case Model.DatapointInterval.HOUR:+ newMoment.add(forward ? 1 : -1, "hour");+ break;+ case Model.DatapointInterval.DAY:+ newMoment.add(forward ? 1 : -1, "day");+ break;+ case Model.DatapointInterval.WEEK:+ newMoment.add(forward ? 1 : -1, "week");+ break;+ case Model.DatapointInterval.MONTH:+ newMoment.add(forward ? 1 : -1, "month");+ break;+ case Model.DatapointInterval.YEAR:+ newMoment.add(forward ? 1 : -1, "year");+ break;+ }+ }++ return newMoment.toDate();+ }++ protected _onEvent(event: Model.SyslogEvent) {++ // TODO: Move filtering to server side+ if (this.categories && !this.categories.find((c) => c === event.category)) {+ return;+ }++ if (this.filter) {+ const filters = this.filter.split(";");+ if (!filters.find((f) => f === event.subCategory)) {+ return;+ }+ }++ if (!this._eventMatchesLevel(event)) {+ return;+ }++ const limit = this.limit || OrLogViewer.DEFAULT_LIMIT;+ if (this._data!.length === limit - 1) {+ this._data!.pop();+ }+ this._data!.splice(0, 0, event);++ if (this._refresh) {+ window.clearTimeout(this._refresh);+ }++ // Buffer updates to prevent excessive re-renders+ this._refresh = window.setTimeout(() => this.requestUpdate("_data"), 2000);+ }++ protected _eventMatchesLevel(event: Model.SyslogEvent): boolean {+ if (!this.level || this.level === Model.SyslogLevel.INFO) {+ return true;+ }++ if (this.level === Model.SyslogLevel.WARN && (event.level === Model.SyslogLevel.WARN || event.level === Model.SyslogLevel.ERROR)) {+ return true;+ }++ if (this.level === Model.SyslogLevel.ERROR && event.level === Model.SyslogLevel.ERROR) {+ return true;+ }++ return false;+ }++ protected _cleanup() {+ if (this._table) {+ this._table.destroy();+ this._table = undefined;+ }++ if (this._refresh) {+ window.clearTimeout(this._refresh);+ }+ }+}diff --git a/ui/component/or-log-viewer/tsconfig.json b/ui/component/or-log-viewer/tsconfig.jsonnew file mode 100644index 000000000..988366ca1--- /dev/null+++ b/ui/component/or-log-viewer/tsconfig.json@@ -0,0 +1,16 @@+{+ "extends": "../../tsconfig",+ "compilerOptions": {+ "outDir": "./dist",+ "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "rootDir": "src"+ },+ "include": [+ "./src"+ ],+ "references": [+ { "path": "../core" },+ { "path": "../or-input" },+ { "path": "../or-translate" }+ ]+}\ No newline at end of filediff --git a/ui/component/or-log-viewer/webpack.config.js b/ui/component/or-log-viewer/webpack.config.jsnew file mode 100644index 000000000..aa67f2961--- /dev/null+++ b/ui/component/or-log-viewer/webpack.config.js@@ -0,0 +1,18 @@+const util = require("../webpack.util");++bundles = {+ "index": {+ vendor: {+ "chart.js": "Chart",+ "jsonpath-plus": "JSONPath",+ "moment": "moment"+ },+ excludeOr: true+ },+ "index.bundle": {+ excludeOr: true,+ },+ "index.orbundle": undefined+};++module.exports = util.generateExports(__dirname);\ No newline at end of filediff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.jsonindex e8fba6a50..29e51e194 100644--- a/ui/component/or-mwc-components/package.json+++ b/ui/component/or-mwc-components/package.json@@ -10,7 +10,7 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@material/menu": "^3.2.0",+ "@material/menu": "^4.0.0","lit-element": "^2.2.1"},"devDependencies": {diff --git a/ui/component/or-mwc-components/src/or-mwc-menu.ts b/ui/component/or-mwc-components/src/or-mwc-menu.tsindex b6ce11acb..8d1d44896 100644--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts@@ -9,30 +9,31 @@ import {TemplateResult,unsafeCSS} from "lit-element";-+import {styleMap} from "lit-html/directives/style-map";import {MDCMenu} from "@material/menu";+import { DefaultColor8, DefaultColor4 } from "@openremote/core";const listStyle = require("!!raw-loader!@material/list/dist/mdc.list.css");const menuSurfaceStyle = require("!!raw-loader!@material/menu-surface/dist/mdc.menu-surface.css");const menuStyle = require("!!raw-loader!@material/menu/dist/mdc.menu.css");--export interface MenuGroup {- icon?: string;- items: (MenuItem | null)[];-}+const checkboxStyle = require("!!raw-loader!@material/checkbox/dist/mdc.checkbox.css");export interface MenuItem {- content: TemplateResult,- value: any;+ icon?: string;+ trailingIcon?: string;+ text?: string;+ secondaryText?: string;+ value: string;+ styleMap?: {[style: string]: string};}-export class OrMwcMenuChangedEvent extends CustomEvent<string> {+export class OrMwcMenuChangedEvent extends CustomEvent<string | string[]> {public static readonly NAME = "or-mwc-menu-changed";- constructor(value: string) {+ constructor(values: string | string[]) {super(OrMwcMenuChangedEvent.NAME, {- detail: value,+ detail: values,bubbles: true,composed: true});@@ -45,7 +46,7 @@ declare global {}}-export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (MenuItem | MenuGroup | null)[], selectedValue: string | undefined, valueChangedCallback: (v: string) => void): TemplateResult {+export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (MenuItem | MenuItem[] | null)[], selectedValues: string[] | string | undefined, valueChangedCallback: (values: string[] | string) => void, multiSelect = false): TemplateResult {const openMenu = (evt: Event) => {if (!menuItems) {@@ -58,7 +59,7 @@ export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (return html`<span><span @click="${openMenu}">${content}</span>- ${menuItems ? html`<or-mwc-menu @or-mwc-menu-changed="${(evt: OrMwcMenuChangedEvent) => valueChangedCallback(evt.detail)}" .value="${selectedValue}" .menuItems="${menuItems}" id="menu"></or-mwc-menu>` : ``}+ ${menuItems ? html`<or-mwc-menu ?multiselect="${multiSelect}" @or-mwc-menu-changed="${(evt: OrMwcMenuChangedEvent) => valueChangedCallback(evt.detail)}" .values="${selectedValues}" .menuItems="${menuItems}" id="menu"></or-mwc-menu>` : ``}</span>`;}@@ -67,7 +68,17 @@ export function getContentWithMenuTemplate(content: TemplateResult, menuItems: (const style = css`:host {white-space: nowrap;+ --internal-or-input-color: var(--or-input-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));+ --internal-or-input-text-color: var(--or-input-text-color, var(--or-app-color1, ${unsafeCSS(DefaultColor8)}));++ --mdc-theme-primary: var(--internal-or-input-color);+ --mdc-theme-on-primary: var(--internal-or-input-text-color);+ --mdc-theme-secondary: var(--internal-or-input-color);}++ .mdc-list-item__graphic {+ margin-right: 16px;+ }`;@customElement("or-mwc-menu")@@ -78,19 +89,26 @@ export class OrMwcMenu extends LitElement {css`${unsafeCSS(listStyle)}`,css`${unsafeCSS(menuStyle)}`,css`${unsafeCSS(menuSurfaceStyle)}`,+ css`${unsafeCSS(checkboxStyle)}`,style];}@property({type: Array})- public menuItems?: (MenuItem | MenuGroup | null)[];+ public menuItems?: (MenuItem | MenuItem[] | null)[];- @property({type: String})- public value?: string;+ @property({type: Array})+ public values?: string[] | string;++ @property({type: Boolean, attribute: true})+ public multiSelect?: boolean;@property({type: Boolean, attribute: true})public visible?: boolean;+ @property({type: Boolean, attribute: true})+ public twoLine?: boolean;+public anchorElem?: HTMLElement;@query("#wrapper")@@ -122,7 +140,7 @@ export class OrMwcMenu extends LitElement {return html`<div id="wrapper" class="mdc-menu-surface--anchor"><div class="mdc-menu mdc-menu-surface" id="menu">- <ul class="mdc-list" role="menu" aria-hidden="true" aria-orientation="vertical" tabindex="-1">+ <ul class="mdc-list ${this.twoLine ? "mdc-list--two-line" : ""}" role="menu" aria-hidden="true" aria-orientation="vertical" tabindex="-1">${this.getItemsTemplate(this.menuItems)}</ul></div>@@ -130,33 +148,74 @@ export class OrMwcMenu extends LitElement {`;}- protected getItemsTemplate(items: (MenuItem | MenuGroup | null)[], icon?: string): TemplateResult {+ protected getItemsTemplate(items: (MenuItem | MenuItem[] | null)[]): TemplateResult {++ const hasIcon = this.multiSelect || items.find((mi) => mi && !Array.isArray(mi) && mi.icon);+return html`${items.map((item) => {if (item === null) {return html`<li class="mdc-list-divider" role="separator"></li>`;}- if ((item as MenuGroup).items) {+ if (Array.isArray(item)) {return html`<li><ul class="mdc-menu__selection-group">- ${this.getItemsTemplate((item as MenuGroup).items, (item as MenuGroup).icon)}+ ${this.getItemsTemplate(item)}</ul></li>`;}- if ((item as MenuItem).content) {- return html`- <li @click="${() => this._onSelect((item as MenuItem).value)}" class="mdc-list-item ${(item as MenuItem).value === this.value}" role="menuitem">- ${icon ? html`<or-icon icon="logout" class="mdc-list-item__graphic mdc-menu__selection-group-icon"></or-icon>` : ``}- ${(item as MenuItem).content}- </li>- `;++ const isSelected = this.isValueSelected((item as MenuItem).value);+ let icon = item.icon;+ const text = item.text !== undefined ? item.text : item.value;+ let leftTemplate: TemplateResult | string = ``;+ let rightTemplate: TemplateResult | string = ``;++ if (this.multiSelect) {+ icon = isSelected ? "check" : undefined;}++ if (hasIcon) {+ leftTemplate = html`<span class="mdc-list-item__graphic mdc-menu__selection-group-icon" aria-hidden="true">+ <or-icon icon="${icon}"></or-icon>+ </span>`;+ }++ if (item.trailingIcon) {+ rightTemplate = html`<span class="mdc-list-item__meta" aria-hidden="true">+ <or-icon icon="${item.trailingIcon}"></or-icon>+ </span>`;+ }++ return html`+ <li @click="${(e: MouseEvent) => {this._itemClicked(e, item)}}" style="${item.styleMap ? styleMap(item.styleMap) : ""}" class="mdc-list-item ${isSelected ? "mdc-menu-item--selected" : ""}" role="menuitem" aria-checked="${isSelected}">+ ${leftTemplate}+ ${!text ? html`` : html`+ <span class="mdc-list-item__text">+ <span class="${this.twoLine ? "mdc-list-item__primary-text" : ""}">${item.text}</span>+ ${this.twoLine ? html`<span class="mdc-list-item__secondary-text">${item.secondaryText || ""}</span>` : ``}+ </span>+ `}+ ${rightTemplate}+ </li>+ `;})}`;}+ protected isValueSelected(value: string): boolean {++ if (Array.isArray(this.values) && this.values.length > 0) {+ if (this.multiSelect) {+ return !!this.values.find((v) => v === value);+ }+ return this.values[0] === value;+ }+ return this.values === value;+ }+protected firstUpdated(_changedProperties: PropertyValues): void {super.firstUpdated(_changedProperties);if (this._mdcElem) {@@ -174,8 +233,24 @@ export class OrMwcMenu extends LitElement {}}- private _onSelect(value: string) {- this.value = value;- this.dispatchEvent(new OrMwcMenuChangedEvent(value));+ private _itemClicked(e: MouseEvent, item: MenuItem) {+ const value = item.value;++ if (!this.multiSelect) {+ this.values = value;+ } else {+ e.stopPropagation();+ if (!Array.isArray(this.values)) {+ this.values = this.values ? [this.values] : [];+ }+ const index = this.values.findIndex((v) => v === value);+ if (index >= 0) {+ this.values.splice(index, 1);+ } else {+ this.values.push(value);+ }+ this.requestUpdate();+ }+ this.dispatchEvent(new OrMwcMenuChangedEvent(this.values));}}diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.tsindex baba15cb4..af8c4818f 100644--- a/ui/component/or-rules/src/index.ts+++ b/ui/component/or-rules/src/index.ts@@ -27,7 +27,8 @@ import {RulesetLang,RulesetUnion,TenantRuleset,- ValueType+ ValueType,+ ClientRole} from "@openremote/model";import "@openremote/or-translate";import {translate} from "@openremote/or-translate";@@ -495,7 +496,7 @@ export const style = css`--internal-or-rules-list-button-size: var(--or-rules-list-button-size, 24px);--internal-or-rules-header-background-color: var(--or-rules-header-background-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));- --internal-or-rules-header-height: var(--or-rules-header-height, 80px);+ --internal-or-rules-header-height: var(--or-rules-header-height, unset);--or-panel-background-color: var(--internal-or-rules-panel-color);}@@ -586,7 +587,7 @@ export class OrRules extends translate(i18next)(LitElement) {}protected isReadonly(): boolean {- return this.readonly || !manager.hasRole("write:rules");+ return this.readonly || !manager.hasRole(ClientRole.WRITE_RULES);}protected _onRequestAdd(e: OrRulesRequestAddEvent) {diff --git a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts b/ui/component/or-rules/src/json-viewer/or-rule-condition.tsindex 119414c32..c5495d03e 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts@@ -1,6 +1,7 @@import {customElement, html, css, LitElement, property, TemplateResult, query} from "lit-element";-import {AssetDescriptor, AssetQueryMatch, RuleCondition} from "@openremote/model";+import {AssetDescriptor, AssetQueryMatch, RuleCondition, AssetType} from "@openremote/model";import {+ ActionType,ConditionType,getAssetTypeFromQuery,RulesConfig@@ -37,28 +38,36 @@ export function getWhenTypesMenu(config?: RulesConfig, assetDescriptors?: AssetDif (addAssetTypes && assetDescriptors) {menu.push(...assetDescriptors.map((ad) => {- const content = html`- ${getAssetDescriptorIconTemplate(ad)}- <span style="text-transform: capitalize">${i18next.t(ad.name!, {defaultValue: ad.name!.replace(/_/g, " ").toLowerCase()})}</span>- `;- return {content: content, value: ad.type} as MenuItem++ const color = AssetModelUtil.getAssetDescriptorColor(ad);+ const icon = AssetModelUtil.getAssetDescriptorIcon(ad);+ const styleMap = color ? {"--or-icon-fill": "#" + color} : undefined;++ return {+ text: i18next.t(ad.name!, {defaultValue: ad.name!.replace(/_/g, " ").toLowerCase()}),+ value: ad.type,+ icon: icon ? icon : AssetType.THING.icon,+ styleMap: styleMap+ } as MenuItem;}));}if (addDatetime) {- const content = html`- <or-icon style="--or-icon-fill: #${DATE_TIME_COLOR}" icon="clock"></or-icon>- <span style="text-transform: capitalize"> <or-translate value="datetime"></or-translate></span>- `;- menu.push({content: content, value: ConditionType.DATE_TIME} as MenuItem);+ menu.push({+ text: i18next.t("datetime"),+ icon: "clock",+ value: ConditionType.DATE_TIME,+ styleMap: {"--or-icon-fill": "#" + DATE_TIME_COLOR}+ } as MenuItem);}if (addTimer) {- const content = html`- <or-icon style="--or-icon-fill: #${TIMER_COLOR}" icon="timer"></or-icon>- <span style="text-transform: capitalize"> <or-translate value="timer"></or-translate></span>- `;- menu.push({content: content, value: ConditionType.TIMER} as MenuItem);+ menu.push({+ text: i18next.t("timer"),+ icon: "timer",+ value: ConditionType.TIMER,+ styleMap: {"--or-icon-fill": "#" + TIMER_COLOR}+ } as MenuItem);}return menu;@@ -117,6 +126,8 @@ const style = css`}#type {+ white-space: nowrap;+ text-transform: capitalize;margin-right: 6px;}`;@@ -154,7 +165,7 @@ class OrRuleCondition extends translate(i18next)(LitElement) {if (showTypeSelect) {- let buttonIcon = undefined;+ let buttonIcon;let buttonColor = "inherit";if (type) {@@ -181,7 +192,7 @@ class OrRuleCondition extends translate(i18next)(LitElement) {html`<or-input type="${InputType.BUTTON}" .icon="${buttonIcon || ""}"></or-input>`,getWhenTypesMenu(this.config, this.assetDescriptors),type,- (value: string) => this.type = value)}+ (values: string[] | string) => this.type = values as string)}</div>`;}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.tsindex 4c1e52933..fd5146d06 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts@@ -9,7 +9,7 @@ import {import {OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";-import {AssetDescriptor, JsonRule, RuleActionUnion, RuleConditionReset} from "@openremote/model";+import {AssetDescriptor, JsonRule, RuleActionUnion, RuleConditionReset, RuleActionNotification, AssetType} from "@openremote/model";import i18next from "i18next";import {InputType} from "@openremote/or-input";import {MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";@@ -39,28 +39,36 @@ function getActionTypesMenu(config?: RulesConfig, assetDescriptors?: AssetDescriif (addAssetTypes && assetDescriptors) {menu.push(...assetDescriptors.map((ad) => {- const content = html`- ${getAssetDescriptorIconTemplate(ad)}- <span style="white-space: nowrap; text-transform: capitalize">${i18next.t(ad.name!, {defaultValue: ad.name!.replace(/_/g, " ").toLowerCase()})}</span>- `;- return {content: content, value: ad.type} as MenuItem++ const color = AssetModelUtil.getAssetDescriptorColor(ad);+ const icon = AssetModelUtil.getAssetDescriptorIcon(ad);+ const styleMap = color ? {"--or-icon-fill": "#" + color} : undefined;++ return {+ text: i18next.t(ad.name!, {defaultValue: ad.name!.replace(/_/g, " ").toLowerCase()}),+ value: ad.type,+ icon: icon ? icon : AssetType.THING.icon,+ styleMap: styleMap+ } as MenuItem;}));}if (addNotification) {- const content = html`- <or-icon style="--or-icon-fill: #${NOTIFICATION_COLOR}" icon="email"></or-icon>- <span style="text-transform: capitalize"> <or-translate value="notification"></or-translate></span>- `;- menu.push({content: content, value: ActionType.NOTIFICATION} as MenuItem);+ menu.push({+ text: i18next.t("notification"),+ icon: "email",+ value: ActionType.NOTIFICATION,+ styleMap: {"--or-icon-fill": "#" + NOTIFICATION_COLOR}+ } as MenuItem);}if (addWait) {- const content = html`- <or-icon style="--or-icon-fill: #${WAIT_COLOR}" icon="timer"></or-icon>- <span style="text-transform: capitalize"> <or-translate value="wait"></or-translate></span>- `;- menu.push({content: content, value: ActionType.WAIT} as MenuItem);+ menu.push({+ text: i18next.t("wait"),+ icon: "timer",+ value: ActionType.WAIT,+ styleMap: {"--or-icon-fill": "#" + WAIT_COLOR}+ } as MenuItem);}return menu;@@ -145,6 +153,12 @@ const style = css`margin-right: 6px;}+ #type {+ white-space: nowrap;+ text-transform: capitalize;+ margin-right: 6px;+ }+.rule-reset {position: absolute;top: 5px;@@ -220,7 +234,7 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {if (showTypeSelect) {- let buttonIcon = undefined;+ let buttonIcon;let buttonColor = "inherit";if (action.action) {@@ -235,19 +249,19 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {break;default:const ad = AssetModelUtil.getAssetDescriptor(type);- buttonIcon = AssetModelUtil.getAssetDescriptorIcon(ad) || buttonIcon;+ buttonIcon = AssetModelUtil.getAssetDescriptorIcon(ad);buttonColor = AssetModelUtil.getAssetDescriptorColor(ad) || buttonColor;break;}}typeTemplate = html`- <div style="color: #${buttonColor}; margin-right: 6px;">+ <div id="type" style="color: #${buttonColor}">${getContentWithMenuTemplate(html`<or-input type="${InputType.BUTTON}" .icon="${buttonIcon || ""}"></or-input>`,getActionTypesMenu(this.config, this.assetDescriptors),action.action,- (value: string) => this.setActionType(actions, action, value))}+ (values: string[] | string) => this.setActionType(actions, action, values as string))}</div>`;}@@ -288,12 +302,12 @@ class OrRuleThenOtherwise extends translate(i18next)(LitElement) {${!this.rule.then ? `` : this.rule.then.map((action: RuleActionUnion) => this.ruleActionTemplate(this.rule.then!, action))}${this.thenAllowAdd ? html`- <span class="add-button-wrapper">+ <span class="add-button-wrapper" style="white-space: nowrap; text-transform: capitalize">${getContentWithMenuTemplate(html`<or-input class="plus-button" type="${InputType.BUTTON}" icon="plus"></or-input>`,getActionTypesMenu(this.config, this.assetDescriptors),undefined,- (value: string) => this.addAction(value))}+ (values: string[] | string) => this.addAction(values as string))}<span>${i18next.t("rulesEditorAddAction")}</span></span>` : ``}diff --git a/ui/component/or-rules/src/json-viewer/or-rule-when.ts b/ui/component/or-rules/src/json-viewer/or-rule-when.tsindex cb08a0709..6e8edf2de 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-when.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-when.ts@@ -169,7 +169,7 @@ class OrRuleWhen extends translate(i18next)(LitElement) {</div></div>`;- return wrapper(content, condition, group, true, isFirst && index == 0);+ return wrapper(content, condition, group, true, isFirst && index === 0);})}`;isFirst = false;@@ -182,7 +182,7 @@ class OrRuleWhen extends translate(i18next)(LitElement) {html`<or-input class="plus-button" type="${InputType.BUTTON}" icon="plus"></or-input>`,getWhenTypesMenu(this.config, this.assetDescriptors),undefined,- (value: string) => this.addCondition(group, value))}+ (values: string[] | string) => this.addCondition(group, values as string))}<span>${i18next.t("rulesEditorAddCondition")}</span></span>`;@@ -237,7 +237,7 @@ class OrRuleWhen extends translate(i18next)(LitElement) {html`<or-input class="plus-button" type="${InputType.BUTTON}" icon="plus"></or-input>`,getWhenTypesMenu(this.config, this.assetDescriptors),undefined,- (value: string) => this.addGroup(this.rule!.when!, value))}+ (values: string[] | string) => this.addGroup(this.rule!.when!, values as string))}<strong>${i18next.t(this.rule.when.groups == undefined || (this.rule.when.groups && this.rule.when.groups.length === 0) ? "when" : "orWhen")}...</strong></span></or-panel>diff --git a/ui/component/or-rules/src/or-rule-list.ts b/ui/component/or-rules/src/or-rule-list.tsindex ff67271b4..636839f2e 100644--- a/ui/component/or-rules/src/or-rule-list.ts+++ b/ui/component/or-rules/src/or-rule-list.ts@@ -1,5 +1,5 @@import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";-import {JsonRule, RuleCondition, RulesetLang, Tenant, TenantRuleset} from "@openremote/model";+import {JsonRule, RuleCondition, RulesetLang, Tenant, TenantRuleset, ClientRole} from "@openremote/model";import "@openremote/or-translate";import manager, {EventCallback, OREvent} from "@openremote/core";import moment from "moment";@@ -158,6 +158,10 @@ export class OrRuleList extends translate(i18next)(LitElement) {public shouldUpdate(_changedProperties: PropertyValues): boolean {const result = super.shouldUpdate(_changedProperties);+ if (!this.sortBy) {+ this.sortBy = "name";+ }+if (_changedProperties.has("language")) {this._updateLanguage();}@@ -211,7 +215,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {addTemplate = getContentWithMenuTemplate(html`<or-input type="${InputType.BUTTON}" icon="plus"></or-input>`,allowedLanguages.map((l) => {- return {value: l, content: html`<span>${l}</span>`} as MenuItem;+ return {value: l, text: l} as MenuItem;}),this.language,(v) => this._onAddClicked(v as RulesetLang));@@ -236,9 +240,9 @@ export class OrRuleList extends translate(i18next)(LitElement) {${getContentWithMenuTemplate(html`<or-input type="${InputType.BUTTON}" icon="sort-variant"></or-input>`,- ["name", "createdOn"].map((sort) => {return {value: sort, content: html`<span>${i18next.t(sort)}</span>`} as MenuItem;}),+ ["name", "createdOn"].map((sort) => { return {value: sort, text: i18next.t(sort)} as MenuItem; }),this.sortBy,- (v) => this._onSortClicked(v))}+ (v) => this._onSortClicked(v as string))}</div></div>@@ -262,7 +266,7 @@ export class OrRuleList extends translate(i18next)(LitElement) {}protected _isReadonly() {- return this.readonly || !manager.hasRole("write:rules");+ return this.readonly || !manager.hasRole(ClientRole.WRITE_RULES);}protected _nodeTemplate(node: RulesetNode): TemplateResult | string {diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.tsindex a54a3234a..5dac077ac 100644--- a/ui/component/or-rules/src/or-rule-viewer.ts+++ b/ui/component/or-rules/src/or-rule-viewer.ts@@ -7,7 +7,7 @@ import {RulesConfig,RuleView} from "./index";-import {RulesetLang, RulesetUnion} from "@openremote/model";+import {RulesetLang, RulesetUnion, ClientRole} from "@openremote/model";import manager, {DefaultBoxShadow} from "@openremote/core";import "./json-viewer/or-rule-json-viewer";import "@openremote/or-input";@@ -44,7 +44,7 @@ export const style = css`min-height: var(--internal-or-rules-header-height);height: var(--internal-or-rules-header-height);z-index: 1;- padding: 10px 20px 0 20px;+ padding: 15px 20px;--or-icon-fill: var(--internal-or-rules-panel-color);}@@ -72,6 +72,7 @@ export const style = css`background-color: var(--internal-or-rules-background-color);padding: 0px 10px;width: calc(100% - 20px);+ margin-top: -10px;}`;@@ -188,7 +189,7 @@ export class OrRuleViewer extends translate(i18next)(LitElement) {}protected _isReadonly() {- return this.readonly || !manager.hasRole("write:rules");+ return this.readonly || !manager.hasRole(ClientRole.WRITE_RULES);}protected _cannotSave() {diff --git a/ui/component/or-smart-notify/src/index.ts b/ui/component/or-smart-notify/src/index.tsindex d01273da4..0c370f9cb 100644--- a/ui/component/or-smart-notify/src/index.ts+++ b/ui/component/or-smart-notify/src/index.ts@@ -340,7 +340,7 @@ class OrSmartNotify extends LitElement {protected firstUpdated(_changedProperties: PropertyValues): void {super.firstUpdated(_changedProperties);- this.isDisabled = !manager.hasRole("write:assets");+ this.isDisabled = !manager.hasRole(Constants.WRITE_ASSETS_ROLE);}}diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex b99bc939a..552dbf40d 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -85,6 +85,7 @@ generateTypeScript {outputFileType = "implementationFile"outputKind = "module"mapEnum = cz.habarta.typescript.generator.EnumMapping.asEnum+ mapDate = cz.habarta.typescript.generator.DateMapping.asNumberrestNamespacing = "perResource"extensions = ["AggregatedApiClient",diff --git a/ui/tslint.json b/ui/tslint.jsonindex 91b463c8b..8b4f15fc6 100644--- a/ui/tslint.json+++ b/ui/tslint.json@@ -13,6 +13,7 @@"object-literal-sort-keys": false,"ban-types": false,"array-type": false,- "object-literal-shorthand": false+ "object-literal-shorthand": false,+ "no-string-literal": false}}\ No newline at end of filediff --git a/yarn.lock b/yarn.lockindex 5ef0a40de..9fb9c72a9 100644--- a/yarn.lock+++ b/yarn.lock@@ -1478,13 +1478,6 @@resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==-"@material/animation@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/animation/-/animation-3.1.0.tgz#ab04e7c2e92ab370a2b28d12af1b88538d23014f"- integrity sha512-ZfP95awrPBLhpaCTPNx+xKYPp2D88fzf5p5YNVp6diUAGRpq3g12Aq7qJfIHDXAFo5CtrYhgOKRqIKxUVcFisQ==- dependencies:- tslib "^1.9.3"-"@material/animation@^4.0.0":version "4.0.0"resolved "https://registry.yarnpkg.com/@material/animation/-/animation-4.0.0.tgz#19eaf377809f20978f8452a4237d27867d3ffd1d"@@ -1492,13 +1485,6 @@dependencies:tslib "^1.9.3"-"@material/base@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/base/-/base-3.1.0.tgz#ab933896ab6390d4e1d2f9797b74a90f47db272a"- integrity sha512-pWEBHyPrMV3rdnjqWWH96h5t3MxQI6V1J9jOor+UBG7bXQtr6InTabTqhz5CLY7r+qZU8YvNh2OKIy8heP0cyQ==- dependencies:- tslib "^1.9.3"-"@material/base@^4.0.0":version "4.0.0"resolved "https://registry.yarnpkg.com/@material/base/-/base-4.0.0.tgz#535574d0b63c18892cfb70e88b27bc8f8090677a"@@ -1506,57 +1492,59 @@dependencies:tslib "^1.9.3"-"@material/button@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/button/-/button-3.2.0.tgz#859d9ce164d6ee5925ac0fb04af57ea7d9295c6e"- integrity sha512-VEASy3Dtc7BCo8/cuUIp6w0+/l4U1myGZffK5GeFVInP/erStSQOmYXT7jGXkZpUglRzWOpVvEpc6nsvhMqGbw==- dependencies:- "@material/elevation" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"--"@material/checkbox@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/checkbox/-/checkbox-3.2.0.tgz#168d4e16e160bec17948d06416935250fa10fac5"- integrity sha512-4XgQ4sM40j60n4RN43BxXtkFVvyFQgo/vc0W5hf9Qz2uwEah46Shg1nHMYZNvcNW+FXRm96gH8zz3qFgEf1ytA==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/dom" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/theme" "^3.1.0"+"@material/button@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/button/-/button-4.0.0.tgz#714cba51a6d3d33c51fe106f8d0d114596d95b1d"+ integrity sha512-CoQjShblZ7evChPJoM+Cao90Fwi25NCIhdTequzZifD73BvQegyN7MlNdbHaGqpecYzOrm0xq+nocg+yQN90qg==+ dependencies:+ "@material/density" "^4.0.0"+ "@material/elevation" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/touch-target" "^4.0.0"+ "@material/typography" "^4.0.0"++"@material/checkbox@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/checkbox/-/checkbox-4.0.0.tgz#1fd5826f008685ea8d9899fea0606ecf65be9a26"+ integrity sha512-2ONHncYAmyIQewvedKDJGeiMvLjmX7wBH5Lx0OBYSwa9nuwjXGWEQR8tNOHIZzevV+nPyGexl6HyvgZ2QNUVZg==+ dependencies:+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/density" "^4.0.0"+ "@material/dom" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/touch-target" "^4.0.0"tslib "^1.9.3"-"@material/data-table@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/data-table/-/data-table-3.2.0.tgz#4751a83bc4f01252ba7aa908e78dd389f452ed83"- integrity sha512-67Bjo4B3kiB2zPEhd1OyHGWCNyQtoFTLNmOAPDFAxbmfaBquvjzAEYos2/cJpvzP8yUCIMJlOYaP0uvv94n2og==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/checkbox" "^3.2.0"- "@material/dom" "^3.1.0"- "@material/elevation" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"+"@material/data-table@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/data-table/-/data-table-4.0.0.tgz#9ad3fe1e05cd893ac097a73c312d1201ea2a07d6"+ integrity sha512-tCjdynaqPATCIi8YWOCo9ie8tyHlxlIpyfMuRx3dVD90P8aIdNEc74LoeAQc2TuOwKZJJqG8WYkA2p6uUNaz2Q==+ dependencies:+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/checkbox" "^4.0.0"+ "@material/density" "^4.0.0"+ "@material/dom" "^4.0.0"+ "@material/elevation" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/typography" "^4.0.0"tslib "^1.10.0"-"@material/dom@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/dom/-/dom-3.1.0.tgz#1e58cad0cd5e1d9d6f6cb07422e327ad34a9d405"- integrity sha512-RtBLSkrBjMfHwknaGBifAIC8cBWF9pXjz2IYqfI2braB6SfQI4vhdJviwyiA5BmA/psn3cKpBUZbHI0ym0O0SQ==- dependencies:- tslib "^1.9.3"+"@material/density@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/density/-/density-4.0.0.tgz#5bc4bba6c1232f6e075c88295357e6ebdee4353f"+ integrity sha512-PuOCPCXlWjimTq+OuCS8biAb1JE9aXCZwT1dRG9REAIAK7bN8KeeTzkeJp6jTj+ggZjWphwKF0lKeX6Gv+e/lw=="@material/dom@^4.0.0":version "4.0.0"@@ -1565,15 +1553,6 @@dependencies:tslib "^1.9.3"-"@material/elevation@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/elevation/-/elevation-3.1.0.tgz#2fcbde47653cc115519a39acc2d04b34e4cff12b"- integrity sha512-e45LqiG6LfbR1M52YkSLA7pQPeYJOuOVzLp27xy2072TnLuJexMxhEaG4O1novEIjsTtMjqfrfJ/koODU5vEew==- dependencies:- "@material/animation" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/theme" "^3.1.0"-"@material/elevation@^4.0.0":version "4.0.0"resolved "https://registry.yarnpkg.com/@material/elevation/-/elevation-4.0.0.tgz#58ba81c8c9efd0b5d3bfed7fa915d4930d814b97"@@ -1597,128 +1576,111 @@"@material/theme" "^4.0.0""@material/typography" "^4.0.0"-"@material/feature-targeting@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/feature-targeting/-/feature-targeting-3.1.0.tgz#a6f6cacd1e0c9b60dc82f2f3bb2de8cfd472252b"- integrity sha512-aXAa1Pv6w32URacE9LfMsl9zI6hFwx1K0Lp3Xpyf4rAkmaAB6z0gOkhicOrVFc0f64YheJgHjE7hJFieVenQdw==-"@material/feature-targeting@^4.0.0":version "4.0.0"resolved "https://registry.yarnpkg.com/@material/feature-targeting/-/feature-targeting-4.0.0.tgz#8d9d1470801a1fd166773731613d9fa89e0fd85e"integrity sha512-0gk+f151vqmEdWkrQ9ocPlQRU9aUtSGsVBhletqIbsthLUsZIz9qk25FHjV1wHd/bGHknd9NH+T8ENprv3KLFg==-"@material/floating-label@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/floating-label/-/floating-label-3.2.0.tgz#6de47528d1534b7d87f42286ed952fe63153c4d9"- integrity sha512-szzsSou+xXj3E6InEuOCr8E28IE5EdcBfKRaHoR5EBkzgcRxLuZkFSqD19zsUgVErdTCcRSbeU9mYa6cP8+Nzw==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/rtl" "^3.2.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"- tslib "^1.9.3"--"@material/form-field@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/form-field/-/form-field-3.2.0.tgz#be35298526d7436922636ec8b163733814cfafa7"- integrity sha512-4XjZGy1S966IOUxFaRAKcZOvr5qqvx8r1RMvfCsEzTB45y9Lo2puilNyCtatVAULRxCwszZb7Kbd++cpmMpzZA==- dependencies:- "@material/base" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"+"@material/floating-label@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/floating-label/-/floating-label-4.0.0.tgz#288eac6b82ff472472f678032fc94024155a42c8"+ integrity sha512-ovuZKhH7U+YmZk8kXftYCdEaU9InJdkBsPe4TP+dg4HiO1lWmd7ZxVsMo6iTl4yaFofkBPj3VDkbE1fLnHxKPA==+ dependencies:+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/typography" "^4.0.0"tslib "^1.9.3"-"@material/icon-button@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/icon-button/-/icon-button-3.2.0.tgz#7a132fffe5be347db77281d63e7e4c5ffe0881ca"- integrity sha512-UTX1q4x5FxntBeb5TxBsXIjbhwFjQxJxovaUGo8+eUL9V9tU6rJ3NnlrFirx9gZnFIU1Xpssm91NCItVZy/Dpg==+"@material/form-field@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/form-field/-/form-field-4.0.0.tgz#196dc80fa35876ee2d6e4321e8186429ae9401bb"+ integrity sha512-M5+c7mitD4NIH+3kU2+uX1mUJJJPNYSUN3bAmhjbMxMISY9jkrbv9k5T9jlWRaIqvO6qJ1aDFOQASV8CsWstYQ==dependencies:- "@material/base" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/theme" "^3.1.0"+ "@material/base" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/typography" "^4.0.0"tslib "^1.9.3"-"@material/line-ripple@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/line-ripple/-/line-ripple-3.1.0.tgz#63a4f41f2a2a5df01c2e229a76fc2b0735cd62c0"- integrity sha512-o6E6wrDqoOK4esCnM1MQ9t7DC/JQrzSrwYsYdqtOpGnr3G5Jx7WWVt6GEVh2eNXy8OnVYkJdQbMjyPVEVJb/Dg==+"@material/icon-button@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/icon-button/-/icon-button-4.0.0.tgz#f7293462f1b4967712f9b8755b87c2228dcccc3d"+ integrity sha512-b1SyWtr2cwlKgIVo+irxRgW0lpIzauADLAxQEJ8/RTO9qVFviohJUnS+5QQCkC5zex5Q52OmQ+aNl0KRjkUdvQ==dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/theme" "^3.1.0"+ "@material/base" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/theme" "^4.0.0"tslib "^1.9.3"-"@material/list@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/list/-/list-3.2.0.tgz#f14c277f0ffe09d4f0875f0add6daa8b87633d36"- integrity sha512-WtMbN7u4z3qbwU7w/I1DdU6ges5oqorQD5bBXJcS+/c/lMqVul/qchVbnqRUBpewSlX14t7B6HSiLSwptDZK1Q==- dependencies:- "@material/base" "^3.1.0"- "@material/dom" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"+"@material/line-ripple@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/line-ripple/-/line-ripple-4.0.0.tgz#e47eb1fe3ce7e28b36e5271c879dc59fee3bd19b"+ integrity sha512-+vrgKlb2gUBIKxlzVKLn/tX76qJ0Z19RkH2i7mh4IdH8KxeEai8NQQYWqeOOKtyp8JbH0ObGyqJCwPo2VbHDmw==+ dependencies:+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/theme" "^4.0.0"tslib "^1.9.3"-"@material/menu-surface@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/menu-surface/-/menu-surface-3.2.0.tgz#b779276bd69c1ff898f40b7cae54e5d8a874b1a4"- integrity sha512-/B8FB5CR3QVNJZIlJzepeVluxPnQ6V2EbalgIAtOF5GIn441bXRDaZ9fNsq2yV424v2nhnDjyEcRgzBoXdeLVg==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/elevation" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"+"@material/list@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/list/-/list-4.0.0.tgz#206e13920d070c2f538027e0b4905bc2b903e64d"+ integrity sha512-ximtqMQzi+bnnFy1jrdzMUH7jq169XVexCykumxoLI1PbVx4imQ0G3R6LIfJiafbxbBYawfwySZfMXTJkDML7g==+ dependencies:+ "@material/base" "^4.0.0"+ "@material/density" "^4.0.0"+ "@material/dom" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/typography" "^4.0.0"tslib "^1.9.3"-"@material/menu@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/menu/-/menu-3.2.0.tgz#9a34a22f7a97f91d0703ea10f323d9c9d9ce541d"- integrity sha512-UGCSKp1WTAYN/LmPbZGA9uU9Cz6iF+zi32BhgJ7aeLOLW5L5KMvtE0VBO4LciznpK9paxnghww1kiN5W1k+CoA==- dependencies:- "@material/base" "^3.1.0"- "@material/dom" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/list" "^3.2.0"- "@material/menu-surface" "^3.2.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"+"@material/menu-surface@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/menu-surface/-/menu-surface-4.0.0.tgz#6de670bfbc5d0075f26baf58e46d00a91854131f"+ integrity sha512-rEsJMJKL3zr8sytH6M25c989vy2HrIndBCbHs51PYYNzMDYbdEyf//UC/ZnoT4fu/Pq5E90+YcLZDpifES3axA==+ dependencies:+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/elevation" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"tslib "^1.9.3"-"@material/notched-outline@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/notched-outline/-/notched-outline-3.2.0.tgz#3b7e79e6282e747a18e97b0d0c79f06eab924aa0"- integrity sha512-IFuxVoQqlOy/WSSawI2Fglh/U1hS0QtVUiGsc8GUoVUd1pifn7RXidHP3vQrMDEo8M/RwA9p6uveQKjPwW41RA==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/floating-label" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"+"@material/menu@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/menu/-/menu-4.0.0.tgz#febe9194892daea9dd2504a2a38bafc5c76864c1"+ integrity sha512-jI8ImB/TXWUi8V0ymdmnnnrJOrJ8oTFcBI1VZ0FcL/5/pMvSeTGjxbJs44/5ZxSbaIAPr2r5K5/r9ZRZPdbNWA==+ dependencies:+ "@material/base" "^4.0.0"+ "@material/dom" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/list" "^4.0.0"+ "@material/menu-surface" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"tslib "^1.9.3"-"@material/ripple@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/ripple/-/ripple-3.2.0.tgz#f4b714834b73b793b280024d4ebcca01018df3bd"- integrity sha512-GtwkfNakALmfGLs6TpdFIVeAWjRqbyT7WfEw9aU7elUokABfHES+O0KoSKQSMQiSQ8Vjl90MONzNsN1Evi/1YQ==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/dom" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/theme" "^3.1.0"+"@material/notched-outline@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/notched-outline/-/notched-outline-4.0.0.tgz#63c8d1f856de032b3c9a9f2654419de86f4b2b4a"+ integrity sha512-9WNG7dZS83nu72kmoknA3XyvZQIxx8QBjEB2Q2KGyRp4Q8zrzWxfcvTYgiOsYgvz013JnTqaqe4g0wjl6v789g==+ dependencies:+ "@material/base" "^4.0.0"+ "@material/floating-label" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"tslib "^1.9.3""@material/ripple@^4.0.0":@@ -1733,41 +1695,29 @@"@material/theme" "^4.0.0"tslib "^1.9.3"-"@material/rtl@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/rtl/-/rtl-3.2.0.tgz#0b2f7321463100674dfbf4507b54ccd052f05378"- integrity sha512-L/w9m9Yx1ceOw/VjEfeJoqD4rW9QP3IBb9MamXAg3qUi/zsztoXD/FUw179pxkLn4huFFNlVYZ4Y1y6BpM0PMA==-"@material/rtl@^4.0.0":version "4.0.0"resolved "https://registry.yarnpkg.com/@material/rtl/-/rtl-4.0.0.tgz#bc07e0a7c47174b2542862c252b0e35b44329c47"integrity sha512-AP8zByVDEWAJVJoxByVccUbH+BX24IeG7ol+L6Qd8JjzPpz1fzPVJ4BeDNaF0a6sXtHsRmj2zN5dsx/BGC3IHg==-"@material/select@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/select/-/select-3.2.0.tgz#69961f6758eda5cce9ed8ab6a72db32661697fd6"- integrity sha512-6zqNBXXNsUtzaJwKvj+GOGCqvKCiu+MNsPZM+2ClNsCWLphFV6dC7iU83C4XQ2MdT7t+H2ggCQOBj5gieC1l7g==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/floating-label" "^3.2.0"- "@material/line-ripple" "^3.1.0"- "@material/menu" "^3.2.0"- "@material/menu-surface" "^3.2.0"- "@material/notched-outline" "^3.2.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"- tslib "^1.9.3"--"@material/shape@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/shape/-/shape-3.1.0.tgz#7ccac6606d0ae45b779b3e52b8921c09c2b2f429"- integrity sha512-Oyvs7YjHfByA0e9IVVp7ojAlPwgSu3Bl0cioiE0OdkidkAaNu0izM2ryRzMBDH5o8+lRD0kpZoT+9CVVCdaYIg==+"@material/select@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/select/-/select-4.0.0.tgz#18d3428a72277858ca92fae543420b4b7f1ec247"+ integrity sha512-VRGC+m3T0TR+qxT5rvf32QgpMlYRmTW7MHwUIfVBlHWRyoOEEwQ4yiExiChoudwaUMAamSCPRQNK08OdD1Jccw==dependencies:- "@material/feature-targeting" "^3.1.0"+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/floating-label" "^4.0.0"+ "@material/line-ripple" "^4.0.0"+ "@material/menu" "^4.0.0"+ "@material/menu-surface" "^4.0.0"+ "@material/notched-outline" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/typography" "^4.0.0"+ tslib "^1.9.3""@material/shape@^4.0.0":version "4.0.0"@@ -1776,45 +1726,39 @@dependencies:"@material/feature-targeting" "^4.0.0"-"@material/switch@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/switch/-/switch-3.2.0.tgz#003409a8eecfd2f9c9600bfb23e152bf12b7e518"- integrity sha512-gECImbvf3HGpmc/Sj2Meq+z7/ri5jmD5rKOeUUeC6nZ77/HiGCRhmSD66rlS0SH5qUUj0mWSbE8ZVOJmVWySEQ==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/dom" "^3.1.0"- "@material/elevation" "^3.1.0"- "@material/feature-targeting" "^3.1.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/theme" "^3.1.0"- tslib "^1.9.3"--"@material/textfield@^3.2.0":- version "3.2.0"- resolved "https://registry.yarnpkg.com/@material/textfield/-/textfield-3.2.0.tgz#c4272601f9a57f26fd7fce8b3089a5d5d6595ad1"- integrity sha512-xPWDkTzurMOxvH0+DsenzboF7dFoUeLcbqX/9vyhWe3aPlO6ZWFNn3lAmYN24ElqR5FEr5zXNYfeIQ4JLT5mYw==- dependencies:- "@material/animation" "^3.1.0"- "@material/base" "^3.1.0"- "@material/dom" "^3.1.0"- "@material/floating-label" "^3.2.0"- "@material/line-ripple" "^3.1.0"- "@material/notched-outline" "^3.2.0"- "@material/ripple" "^3.2.0"- "@material/rtl" "^3.2.0"- "@material/shape" "^3.1.0"- "@material/theme" "^3.1.0"- "@material/typography" "^3.1.0"+"@material/switch@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/switch/-/switch-4.0.0.tgz#5c5da30389f48f4f5245eb9f325cbc0e5f6bf2d4"+ integrity sha512-90fvz0bYgeGQNBD14rdTOI/dvAPANwDQLIodOpE/r2bOZjge1K0rHSAm+TVwNCnrrM9HGmG8Ew0sIeEIj3jMMw==+ dependencies:+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/dom" "^4.0.0"+ "@material/elevation" "^4.0.0"+ "@material/feature-targeting" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/theme" "^4.0.0"tslib "^1.9.3"-"@material/theme@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/theme/-/theme-3.1.0.tgz#d31147bbc9e20bdaa3e322c9e898e4fc98807d8c"- integrity sha512-N4JX+akOwg1faAvFvIEhDcwW4cZfUpwEn8lct6Vs3WczjLF6/KdIoLVaYh+eVl1bzfsoIuWvx56j0B1PjXZw9g==+"@material/textfield@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/textfield/-/textfield-4.0.0.tgz#3b39a1ed1aee166b0eb757237ef1359eba312f36"+ integrity sha512-1Xg+nriTqFB8+5k8sGkR8LBeD3dRgNuhvwyU8XrUeAs5l/HMfn4CWgbEyZTaJ2EEtFPxnKGedAYqCEwXngwGWg==dependencies:- "@material/feature-targeting" "^3.1.0"+ "@material/animation" "^4.0.0"+ "@material/base" "^4.0.0"+ "@material/density" "^4.0.0"+ "@material/dom" "^4.0.0"+ "@material/floating-label" "^4.0.0"+ "@material/line-ripple" "^4.0.0"+ "@material/notched-outline" "^4.0.0"+ "@material/ripple" "^4.0.0"+ "@material/rtl" "^4.0.0"+ "@material/shape" "^4.0.0"+ "@material/theme" "^4.0.0"+ "@material/typography" "^4.0.0"+ tslib "^1.9.3""@material/theme@^4.0.0":version "4.0.0"@@ -1823,12 +1767,12 @@dependencies:"@material/feature-targeting" "^4.0.0"-"@material/typography@^3.1.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@material/typography/-/typography-3.1.0.tgz#5a3aee31f49f6b8c87ebc91b77c5b896b280c492"- integrity sha512-aSNBQvVxIH1kORSYdLGuSTivx6oJ1MSOSTUAsUwhXPQLQlvbdFeZaqUp7xgn+EvRsHGRFhWk5YGuiBds9+7zQg==+"@material/touch-target@^4.0.0":+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/@material/touch-target/-/touch-target-4.0.0.tgz#a7c8dea3dfdb9c13ca81a90ea7e0af33cf7e40ba"+ integrity sha512-TM8xK1WwTZtP4vYQ7E7aZLdGKyP1GuG5Ilb0qlytX/gmC8Di/kRn6muDSZyeCCUcMXYth5Et0ceWtpNrcAQHMQ==dependencies:- "@material/feature-targeting" "^3.1.0"+ "@material/feature-targeting" "^4.0.0""@material/typography@^4.0.0":version "4.0.0"@@ -1921,17 +1865,6 @@dependencies:"@types/node" "^12.11.1"-"@polymer/app-layout@^3.0.0":- version "3.1.0"- resolved "https://registry.yarnpkg.com/@polymer/app-layout/-/app-layout-3.1.0.tgz#b146cd2ce202e079ac51059a4fcaef03f5b2f3c4"- integrity sha512-+jf5/TtUDj/la9Vi59ooGNjnTN8JTkyIUK8gxAms0N3MmyeqrmcNLlJKDVyE6IIGKz0WfFeGKqKtmtTLHrZIlg==- dependencies:- "@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/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"@@ -1981,7 +1914,7 @@dependencies:"@polymer/polymer" preview-"@polymer/iron-flex-layout@^3.0.0-pre.25", "@polymer/iron-flex-layout@^3.0.0-pre.26":+"@polymer/iron-flex-layout@^3.0.0-pre.25":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==@@ -2002,27 +1935,6 @@dependencies:"@polymer/polymer" preview-"@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"@@ -2043,6 +1955,13 @@dependencies:"@webcomponents/shadycss" "^1.9.1"+"@polymer/polymer@^3.3.1":+ version "3.3.1"+ resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-3.3.1.tgz#9ad48992d2a96775f80b0673f3a615d6df8a3dfc"+ integrity sha512-8KaB48tzyMjdsHdxo5KvCAaqmTe7rYDzQAoj/pyEfq9Fp4YfUaS+/xqwYj0GbiDAUNzwkmEQ7dw9cgnRNdKO8A==+ dependencies:+ "@webcomponents/shadycss" "^1.9.1"+"@polymer/prism-element@^3.0.0-pre.25":version "3.0.1"resolved "https://registry.yarnpkg.com/@polymer/prism-element/-/prism-element-3.0.1.tgz#b35d53eec9ecea5e5fec7c82c7e978e760e53501"@@ -2106,6 +2025,11 @@resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==+"@types/navigo@^7.0.1":+ version "7.0.1"+ resolved "https://registry.yarnpkg.com/@types/navigo/-/navigo-7.0.1.tgz#63d1bd0f898f87f645d16f230e9350930ec32160"+ integrity sha512-auXcoS/pc39onGyf6fr2V3J3BEHUqH0a1Sa1psuGrVkCat+2D592DA7hdXY73lwCUyhGPzkf0lrcE5jH0OFeJg==+"@types/node@*", "@types/node@^12.11.1":version "12.11.7"resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"@@ -2267,11 +2191,6 @@"@webassemblyjs/wast-parser" "1.8.5""@xtuc/long" "4.2.2"-"@webcomponents/html-imports@^1.2.0":- version "1.2.2"- resolved "https://registry.yarnpkg.com/@webcomponents/html-imports/-/html-imports-1.2.2.tgz#5bb74e05b9a0fea4d749370b66cd80dcb4baf380"- integrity sha512-Gub4SCFWBjfmdgz9/Altiy9yPsE0aLODfEDE4WmrAwDu1o2h7vXoQuJM5vBhV25ut9SIY9h98RGRRLYDSiO9kw==-"@webcomponents/shadycss@^1.1.1", "@webcomponents/shadycss@^1.9.1":version "1.9.2"resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.9.2.tgz#6a3a65951b5a97279dd9b92cc277dd815d0e1fad"@@ -2282,6 +2201,11 @@resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.3.3.tgz#5bb82a0d3210c836bd4623e13a4a93145cb9dc27"integrity sha512-eLH04VBMpuZGzBIhOnUjECcQPEPcmfhWEijW9u1B5I+2PPYdWf3vWUExdDxu4Y3GljRSTCOlWnGtS9tpzmXMyQ==+"@webcomponents/webcomponentsjs@^2.2.10":+ version "2.4.0"+ resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.0.tgz#e9dd031d24c234eff8824f7560e5c0c605d3d6a0"+ integrity sha512-kEClEz2nu9/i6SvyBJTV4pCc6CyCzMhK7zEeJ6QhiJoulBp4YZ06Zfj2E2HUXfWfHJIjtKriJYMtfhettKEjEg==+"@xtuc/ieee754@^1.2.0":version "1.2.0"resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"@@ -2327,7 +2251,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@^5.0.0:+"acorn@>= 2.5.2 <= 5.7.3":version "5.7.3"resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==@@ -2732,11 +2656,6 @@ boolbase@~1.0.0:resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=- version "4.3.1"- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"- integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==-brace-expansion@^1.1.7:version "1.1.11"resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"@@ -2761,16 +2680,6 @@ 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"@@ -2849,11 +2758,6 @@ btoa-lite@^1.0.0:resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=- 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"@@ -3472,7 +3376,7 @@ conventional-recommended-bump@^5.0.0:meow "^4.0.0"q "^1.5.1"-convert-source-map@^1.1.0, convert-source-map@^1.5.1:+convert-source-map@^1.1.0: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==@@ -3765,11 +3669,6 @@ 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.2.0:version "4.2.0"resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"@@ -4001,13 +3900,6 @@ dot-prop@^4.2.0:dependencies:is-obj "^1.0.0"-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"-duplexer@^0.1.1:version "0.1.1"resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"@@ -4023,7 +3915,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:readable-stream "^2.0.0"stream-shift "^1.0.0"-earcut@^2.1.3, earcut@^2.1.5:+earcut@^2.1.5:version "2.2.1"resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.1.tgz#3bae0b1b6fec41853b56b126f03a42a34b28f1d5"integrity sha512-5jIMi2RB3HtGPHcYd9Yyl0cczo84y+48lgKPxMijliNQaKAHEZJbdzLmKmdxG/mCdS/YD9DQ1gihL8mxzR0F9w==@@ -4192,30 +4084,6 @@ escape-string-regexp@^1.0.5:resolved "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.12.0"- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"- integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==- 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.3:version "4.0.3"resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"@@ -4229,11 +4097,6 @@ esm@~3.0.84:resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63"integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==-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"@@ -4251,7 +4114,7 @@ esrecurse@^4.1.0:dependencies:estraverse "^4.1.0"-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:+estraverse@^4.1.0, estraverse@^4.1.1:version "4.3.0"resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==@@ -4418,16 +4281,6 @@ extsprintf@^1.2.0:resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=-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"@@ -4458,11 +4311,6 @@ 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"@@ -4619,11 +4467,6 @@ 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=-forever-agent@~0.6.1:version "0.6.1"resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"@@ -4733,17 +4576,7 @@ genfun@^5.0.0:resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==-geojson-rewind@^0.3.0:- version "0.3.1"- resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.3.1.tgz#22240797c847cc2f0c1d313e4aa0c915afa7f29d"- integrity sha1-IiQHl8hHzC8MHTE+SqDJFa+n8p0=- dependencies:- "@mapbox/geojson-area" "0.2.2"- concat-stream "~1.6.0"- minimist "1.2.0"- sharkdown "^0.1.0"--geojson-vt@^3.2.0, geojson-vt@^3.2.1:+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==@@ -4847,11 +4680,6 @@ gitconfiglocal@^1.0.0:dependencies:ini "^1.3.2"-gl-matrix@^2.6.1:- version "2.8.1"- resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-2.8.1.tgz#1c7873448eac61d2cd25803a074e837bd42581a3"- integrity sha512-0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw==-gl-matrix@^3.0.0:version "3.1.0"resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.1.0.tgz#f5b2de17d8fed95a79e5025b10cded0ab9ccbed0"@@ -4979,7 +4807,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==-grid-index@^1.0.0, grid-index@^1.1.0:+grid-index@^1.1.0:version "1.1.0"resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==@@ -5751,11 +5579,6 @@ is-wsl@^1.1.0:resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=- version "0.0.1"- resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"- integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=-[email protected], isarray@^1.0.0, isarray@~1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"@@ -5900,11 +5723,6 @@ jsprim@^1.2.2:json-schema "0.2.3"verror "1.10.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"@@ -5974,15 +5792,7 @@ lerna@^3.18.1:import-local "^2.0.0"npmlog "^4.1.2"-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, lit-element@^2.1.0, lit-element@^2.2.1:+lit-element@^2.1.0, lit-element@^2.2.1:version "2.2.1"resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.2.1.tgz#79c94d8cfdc2d73b245656e37991bd1e4811d96f"integrity sha512-ipDcgQ1EpW6Va2Z6dWm79jYdimVepO5GL0eYkZrFvdr0OD/1N260Q9DH+K5HXHFrRoC7dOg+ZpED2XE0TgGdXw==@@ -6193,13 +6003,6 @@ macos-release@^2.2.0:resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==-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"@@ -6303,36 +6106,6 @@ [email protected]:tinyqueue "^2.0.0"vt-pbf "^3.1.1"-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.js@^3.2.0:version "3.2.1"resolved "https://registry.yarnpkg.com/mapbox.js/-/mapbox.js-3.2.1.tgz#4bacfa026a4adbd103c74ed910e3435720fc0333"@@ -6423,13 +6196,6 @@ [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"-merge-stream@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"@@ -6656,14 +6422,7 @@ modify-values@^1.0.0:resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==-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@*, [email protected], moment@^2.10.2, moment@^2.24.0:[email protected], moment@^2.10.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==@@ -6769,6 +6528,11 @@ nanomatch@^1.2.9:snapdragon "^0.8.1"to-regex "^3.0.1"+navigo@^7.1.2:+ version "7.1.2"+ resolved "https://registry.yarnpkg.com/navigo/-/navigo-7.1.2.tgz#f543098ae5cbc5763b926742b5047ffb68a187e2"+ integrity sha512-OlhxHxhLM62X0Sjbkp5wlm1V6GpOIKShFu7dS/fDS3cVqzMHYS880LT5tu6JjGkrSYQbtCNDADmRIP47MoVGlA==+needle@^2.2.1:version "2.4.0"resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"@@ -7049,17 +6813,12 @@ object-inspect@^1.6.0:resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==-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-is@^1.0.1:version "1.0.1"resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:version "1.1.1"resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==@@ -7147,18 +6906,6 @@ optimist@^0.6.1:minimist "~0.0.1"wordwrap "~0.0.2"-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"@@ -7369,6 +7116,13 @@ parse-json@^4.0.0:error-ex "^1.3.1"json-parse-better-errors "^1.0.1"+parse-link-header@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/parse-link-header/-/parse-link-header-1.0.1.tgz#bedfe0d2118aeb84be75e7b025419ec8a61140a7"+ integrity sha1-vt/g0hGK64S+deewJUGeyKYRQKc=+ dependencies:+ xtend "~4.0.1"+parse-passwd@^1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"@@ -7621,11 +7375,6 @@ 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"@@ -7818,25 +7567,11 @@ quick-lru@^1.0.0:resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=-quickselect@^1.0.0:- version "1.1.1"- resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"- integrity sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==-quickselect@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018"integrity sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==-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"@@ -7951,7 +7686,7 @@ read@1, read@~1.0.1:dependencies:mute-stream "~0.0.4"-"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:+"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:version "2.3.6"resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==@@ -8182,10 +7917,10 @@ 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=+reselect@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"+ integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==resize-observer-polyfill@^1.5.1:version "1.5.1"@@ -8229,7 +7964,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.5, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1:+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1:version "1.12.0"resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==@@ -8471,11 +8206,6 @@ 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.1"resolved "https://registry.yarnpkg.com/sharkdown/-/sharkdown-0.1.1.tgz#64484bd0f08f347f8319e9ff947a670f6b48b1b2"@@ -8520,10 +8250,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=-simplebar@^5.0.6:- version "5.0.6"- resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.0.6.tgz#2392bc27211bb3d4f9077e521d3c00d6311fbc69"- integrity sha512-PAbvrH/eKon7NUTpD0ZxH+xnEeVGPaaQINJFWxJzTj6TtaN7KG80+US2HEU/xgaxaBGotqb1SmDhczaR5YuxYw==+simplebar@^5.0.7:+ version "5.0.7"+ resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.0.7.tgz#9c35a944a7abff1a3c4b6bc5dfb53997dc9b14ed"+ integrity sha512-Bp/s94+3hHBXkhi8VBkuXiNHePMGLDVjMwUEJckC3uIBwLUmJbYnT6jqoETal46l+zXbEklffLRr/TtsQwjw0A==dependencies:can-use-dom "^0.1.0"core-js "^3.0.1"@@ -8791,13 +8521,6 @@ ssri@^7.0.0:figgy-pudding "^3.5.1"minipass "^3.1.1"-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"@@ -8806,26 +8529,6 @@ 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", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:version "1.5.0"resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"@@ -8991,13 +8694,6 @@ 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@^6.0.1:version "6.0.2"resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-6.0.2.tgz#aa2eaae185ef97872f388c683ec29f6991721ee3"@@ -9116,7 +8812,7 @@ thenify-all@^1.0.0:dependencies:any-promise "^1.0.0"-through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:+through2@^2.0.0, through2@^2.0.2:version "2.0.5"resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==@@ -9153,11 +8849,6 @@ tiny-emitter@^2.0.0:resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==-tinyqueue@^1.1.0:- version "1.2.3"- resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-1.2.3.tgz#b6a61de23060584da29f82362e45df1ec7353f3d"- integrity sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA==-tinyqueue@^2.0.0:version "2.0.3"resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"@@ -9293,13 +8984,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=-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"-type-fest@^0.3.0:version "0.3.1"resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"@@ -9566,17 +9250,12 @@ [email protected]:core-util-is "1.0.2"extsprintf "^1.2.0"-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==-vm-browserify@^1.0.1:version "1.1.0"resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==-vt-pbf@^3.0.1, vt-pbf@^3.1.1:+vt-pbf@^3.1.1:version "3.1.1"resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.1.tgz#b0f627e39a10ce91d943b898ed2363d21899fb82"integrity sha512-pHjWdrIoxurpmTcbfBWXaPwSmtPAHS105253P1qyEfSTV2HJddqjM+kIHquaT/L6lVJIk9ltTGc0IxR/G47hYA==@@ -9784,11 +9463,6 @@ wordwrap@~0.0.2:resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=-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.7.0:version "1.7.0"resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"