Skip to content

armgit / core

Public Imported from GitHub
0

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

UI updates: Added or-app component that should be used as skeleton for custom apps

Rich Turner6be7aee0cbaf
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.json
index 6aa70eee7..1a23256da 100644
--- a/deployment/manager/shared/locales/en/or.json
+++ b/deployment/manager/shared/locales/en/or.json
@@ -196,5 +196,14 @@
"clientId": "Client ID",
"realm": "Realm",
"port": "Port",
- "host": "Hostname"
+ "host": "Hostname",
+ "errorOccurred": "An error has occurred",
+ "managerError": {
+ "MANAGER_FAILED_TO_LOAD": "Manager failed to load (see console logs)",
+ "KEYCLOAK_FAILED_TO_LOAD": "Keycloak failed to load (see console logs)",
+ "AUTH_TYPE_UNSUPPORTED": "Requested auth type not supported",
+ "CONSOLE_ERROR": "Console error (see console logs)",
+ "EVENTS_CONNECTION_ERROR": "Event bus connection error (see console logs)",
+ "TRANSLATION_ERROR": "Translations error (see console logs)"
+ }
}
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
index 9d87d0664..675d21c52 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
@@ -488,7 +488,7 @@ public class RulesEngine<T extends Ruleset> {
if (deployment.getStatus() == DEPLOYED) {
- RULES_LOG.fine("Firing rules @" + clock + " of: " + deployment);
+ RULES_LOG.fine("Executing rules @" + clock + " of: " + deployment);
// If full detail logging is enabled
if (RULES_LOG.isLoggable(Level.FINEST)) {
@@ -506,7 +506,7 @@ public class RulesEngine<T extends Ruleset> {
}
} catch (Exception ex) {
- LOG.log(Level.SEVERE, "On " + RulesEngine.this + ", error firing rules of: " + deployment, ex);
+ LOG.log(Level.SEVERE, "On " + RulesEngine.this + ", error executing rules of: " + deployment, ex);
deployment.setStatus(ex instanceof RulesLoopException ? LOOP_ERROR : EXECUTION_ERROR);
deployment.setError(ex);
diff --git a/ui/app/main/.htaccess b/ui/app/main/.htaccess
deleted file mode 100644
index 168af4142..000000000
--- a/ui/app/main/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-<ifModule mod_rewrite.c>
- Options +FollowSymLinks
- IndexIgnore */*
- RewriteEngine On
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule (.*) index.html
-</ifModule>
\ No newline at end of file
diff --git a/ui/app/main/.travis.yml b/ui/app/main/.travis.yml
deleted file mode 100644
index 95411b36e..000000000
--- a/ui/app/main/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: node_js
-matrix:
- include:
- - node_js: '9'
- os: osx
- script: npm run test:integration
- - node_js: '9'
- sudo: required
- os: linux
- dist: trusty
- addons:
- chrome: stable
- firefox: latest
- before_script:
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
- script:
- - npm run test:unit
- - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run test:sauce; fi
-env:
- global:
- - secure: C+/z9HB1amzxgntbpkNhjcWeYFt6uagVAp2TuceInyzCpwD8A9mOG+X3pfBX8A0OJnKchSduXbcUzcg8Rw2ZVR/RZajkzWUnInFNeFm4WMgHZFQxc+pHq9o5UyCw+Q237+S5IdC+WI0lfAGh3+5OeGvS+JoC3jUarYb6UlCybgfkqA+Zo0wy6Xyjisb3vYKPnmmF+Ki5fkzwLqpkcqQI3zZQZimTZHNwGOJO6ib2uEEjaCVhvG1XKDlF8M+07arE97hKOJEEKIHHPOaPtABw634OfwbiS5lPHlb626VD+ry08P1FH7mg3XM+XdUS7T+o3Lb2RScjA5jetF27s2E9mK467zIw60kC5e8eDx8/uJWlx/c3jT4nQQ+epjTp7M5lbOQBYiQttGureaWHSVVvUJKTrSN8CxceV7Zmia1N9dtC3o2CEDZyrbJ5+2tR8POkUZkz5XHNhHg0/U/vq0dm3LjhOGfyKCqD4o1qS2ytdzPVu2fwHdD63NxU1pKPeYNcO3aKASTgUJpPWA4j/JQWWNF/HTUU6NMO3ihKxX+ZeenX/wtvSrurNIFhIqf81hr0iRYVH+pMOZ7shfr65w6GgllQjO2gFz8IZyc0t9I5CJnOVyhHfgdVj4XgeTHaxDalYE/eB/ny1unxbG/c+6v06pHWJ9HNXFd5VXPTmtNu1m8=
- - secure: MIqRhLuXEh4qKMvVnbqs2jAtwsGgnl8qLYRNGKeG5eUf3aJT86FJefcccddVAipNun10fnkSkNd2rpNb/G8Htxvyg9lYiOeCDOvxsaDtYwxvz1WGk2u5kRUjkfyb2LVzUV0MCUSiR+o/9qUXy5TVcwrzAN/4Jin8diMPVkuektP5xhyVm1BAMufn+IcX56xtkT123Egz1Y0N47TKB4rEqhVUazYvMy2Vq2Xs2NIpVT2v8+91UzRLCeESIKKPFfZvdgVHovqKiKmsXLMsGTsAKT6FjimSmKvknC4iR7B3CiQQwoo0GIJjd/QKy35S3wMUoZEy+WpN8hBuKoJLg2GtaVmsV1MEAyKBFtMRPQwUTSPSxz5RQzVYKby9TsOKulFbsfk1jRzAlJSc4USSXO7/HH/vcTF0NZJhqvZAo8mX43UqQSmOEo6vobEASM8I5lysQnuqjrDTowg8Wou7a0yhIaKiGBhf5Yy61mSqURNBXCpRHR75SDr2/9qtqU8hfH6PqCuLHtQ0eEhNzfcjo8fPRcAx2QWPmmnOpDAZcxFvVGlkiM5aOFlRiPbGLFADkzm1uDh7GYfSChoLoEhM/MJMxl0OeLIcKpsgXUjrQv2KdJCVtbu610jMlH98J5GsfoA7SkKUn8DYujkuhaHBqYKLjZ7tCVLXsoMZqJcQf7W5Q3g=
diff --git a/ui/app/main/index.html b/ui/app/main/index.html
index 8811e4187..acb59aaba 100644
--- a/ui/app/main/index.html
+++ b/ui/app/main/index.html
@@ -66,10 +66,6 @@
</head>
<body>
-<div class="vertical-section-container centered">
- <my-app apptitle="OpenRemote Demo"></my-app>
-</div>
-
<!--
Use the webcomponents-loader script which will feature detect which Web
Components features are missing and lazy load the appropriate polyfills.
diff --git a/ui/app/main/package.json b/ui/app/main/package.json
index 90051440d..98572481d 100644
--- a/ui/app/main/package.json
+++ b/ui/app/main/package.json
@@ -15,25 +15,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
- "@openremote/core": "^1.1.0",
- "@openremote/or-asset-tree": "^1.1.0",
- "@openremote/or-asset-viewer": "^1.1.0",
- "@openremote/or-header": "^1.1.0",
- "@openremote/or-map": "^1.1.0",
- "@openremote/or-chart": "^1.1.0",
- "@openremote/or-rules": "^1.1.0",
- "@openremote/or-smart-notify": "^1.1.0",
- "@openremote/or-timeline": "^1.1.0",
- "@openremote/rest": "^1.1.0",
- "@types/navigo": "^7.0.1",
- "@webcomponents/webcomponentsjs": "^2.2.10",
- "lit-element": "^2.2.1",
- "moment": "^2.24.0",
- "navigo": "^7.1.2",
- "pwa-helpers": "^0.9.0",
- "redux": "^4.0.0",
- "redux-thunk": "^2.3.0",
- "reselect": "^4.0.0"
+ "@openremote/or-app": "^1.1.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
diff --git a/ui/app/main/src/actions/app.ts b/ui/app/main/src/actions/app.ts
deleted file mode 100644
index 7dd690a41..000000000
--- a/ui/app/main/src/actions/app.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import {Action, ActionCreator} from "redux";
-import {ThunkAction} from "redux-thunk";
-import {RootState} from "../store";
-
-export const UPDATE_PAGE = "UPDATE_PAGE";
-export const UPDATE_RULE = "UPDATE_RULE";
-export const RESOLVE_APP = "RESOLVE_APP";
-export const UPDATE_DRAWER = "UPDATE_DRAWER";
-export const SET_SCROLL_TOP = "SET_SCROLL_TOP";
-export const SET_ACTIVE_ASSET = "SET_ACTIVE_ASSET";
-
-
-export interface AppActionUpdatePage extends Action<typeof UPDATE_PAGE> {
- page: string;
-}
-
-export interface AppActionSetActiveAsset extends Action<typeof SET_ACTIVE_ASSET> {
- assetId: string;
-}
-
-export interface AppActionSetScrollTop extends Action<typeof SET_SCROLL_TOP> {
- top: number;
-}
-
-export interface AppActionUpdateRule extends Action<typeof UPDATE_RULE> {
- id: string;
-}
-
-export interface AppActionResolveApp extends Action<typeof RESOLVE_APP> {
- resolved: boolean;
-}
-
-export interface AppActionUpdateDrawer extends Action<typeof UPDATE_DRAWER> {
- opened: boolean;
-}
-
-export type AppAction =
- AppActionUpdatePage
- | AppActionSetActiveAsset
- | AppActionSetScrollTop
- | AppActionUpdateRule
- | AppActionUpdateDrawer
- | AppActionResolveApp;
-
-type ThunkResult = ThunkAction<void, RootState, undefined, AppAction>;
-
-export const setScrollTop: ActionCreator<ThunkResult> = (top: number) => (dispatch) => {
- dispatch({
- type: SET_SCROLL_TOP,
- top
- });
-};
-
-export const setActiveAsset: ActionCreator<ThunkResult> = (assetId: string) => (dispatch) => {
- dispatch({
- type: SET_ACTIVE_ASSET,
- assetId
- });
-};
-
-export const updatePage: ActionCreator<ThunkResult> = (page: string) => (dispatch) => {
- dispatch({
- type: UPDATE_PAGE,
- page
- });
-
- // Close the drawer - in case the *path* change came from a link in the drawer.
- dispatch(updateDrawer(false));
-};
-
-
-export const updateRule: ActionCreator<ThunkResult> = (id: string) => (dispatch) => {
- dispatch({
- type: UPDATE_RULE,
- id
- });
-};
-
-export const resolveApp: ActionCreator<ThunkResult> = (resolved: boolean) => (dispatch) => {
- dispatch({
- type: RESOLVE_APP,
- resolved
- });
-};
-
-export const updateDrawer: ActionCreator<ThunkResult> = (opened: boolean) => (dispatch) => {
- dispatch({
- type: UPDATE_DRAWER,
- opened
- });
-};
diff --git a/ui/app/main/src/actions/map.ts b/ui/app/main/src/actions/map.ts
deleted file mode 100644
index 32866fb9c..000000000
--- a/ui/app/main/src/actions/map.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import {Action, ActionCreator} from "redux";
-import {ThunkAction} from "redux-thunk";
-import {RootState} from "../store";
-import manager from "@openremote/core";
-import {AssetEvent, AttributeEvent} from "@openremote/model";
-
-export const ASSET_EVENT_RECEIVED = "ASSET_EVENT_RECEIVED";
-export const ATTRIBUTE_EVENT_RECEIVED = "ATTRIBUTE_EVENT_RECEIVED";
-export const UPDATE_ASSET_SUBSCRIPTION_ID = "UPDATE_ASSET_SUBSCRIPTION_ID";
-export const UPDATE_ATTRIBUTE_SUBSCRIPTION_ID = "UPDATE_ATTRIBUTE_SUBSCRIPTION_ID";
-export const SET_CURRENT_ASSET_ID = "SET_CURRENT_ASSET_ID";
-
-export interface MapActionAssetEventReceived extends Action<typeof ASSET_EVENT_RECEIVED> {
- event: AssetEvent;
-}
-
-export interface MapActionAttributeEventReceived extends Action<typeof ATTRIBUTE_EVENT_RECEIVED> {
- event: AttributeEvent;
-}
-
-export interface MapActionUpdateAssetSubscriptionId extends Action<typeof UPDATE_ASSET_SUBSCRIPTION_ID> {
- id: string;
-}
-
-export interface MapActionUpdateAttributeSubscriptionId extends Action<typeof UPDATE_ATTRIBUTE_SUBSCRIPTION_ID> {
- id: string;
-}
-
-export interface MapActionSetCurrentAssetId extends Action<typeof SET_CURRENT_ASSET_ID> {
- id: string;
-}
-
-export type MapAction = MapActionAssetEventReceived | MapActionAttributeEventReceived | MapActionUpdateAssetSubscriptionId | MapActionUpdateAttributeSubscriptionId | MapActionSetCurrentAssetId;
-
-type ThunkResult = ThunkAction<void, RootState, undefined, MapAction>;
-
-export const subscribeAssets: ActionCreator<ThunkResult> = () => async (dispatch) => {
-
- try {
- const result = await manager.rest.api.AssetResource.queryAssets({
- select: {
- excludeAttributes: true,
- excludeParentInfo: true,
- excludePath: true
- }
- });
-
- if (result.data) {
- const ids = result.data.map(
- asset => asset.id
- );
-
- let subscriptionId = await manager.events.subscribeAssetEvents(ids, true, (event) => {
- dispatch(assetEventReceived(event));
- });
- dispatch(updateAssetSubscriptionId(subscriptionId));
-
- subscriptionId = await manager.events.subscribeAttributeEvents(ids, false, (event) => {
- dispatch(attributeEventReceived(event));
- });
- dispatch(updateAttributeSubscriptionId(subscriptionId));
- }
-
- } catch (e) {
- console.error("Failed to subscribe to assets", e)
- }
-};
-
-export const assetEventReceived = (event: AssetEvent): MapActionAssetEventReceived => {
- return {
- type: ASSET_EVENT_RECEIVED,
- event: event
- }
-};
-
-export const unsubscribeAssets: ActionCreator<ThunkResult> = () => (dispatch, getState) => {
- if (getState().map.assetSubscriptionId) {
- manager.events.unsubscribe(getState().map.assetSubscriptionId);
- dispatch(
- updateAssetSubscriptionId(null)
- );
- }
- if (getState().map.attributeSubscriptionId) {
- manager.events.unsubscribe(getState().map.attributeSubscriptionId);
- dispatch(
- updateAttributeSubscriptionId(null)
- );
- }
-};
-
-export const attributeEventReceived = (event: AttributeEvent): MapActionAttributeEventReceived => {
- return {
- type: ATTRIBUTE_EVENT_RECEIVED,
- event: event
- }
-};
-
-export const updateAssetSubscriptionId = (id: string): MapActionUpdateAssetSubscriptionId => {
- return {
- type: UPDATE_ASSET_SUBSCRIPTION_ID,
- id: id
- }
-};
-
-export const updateAttributeSubscriptionId = (id: string): MapActionUpdateAttributeSubscriptionId => {
- return {
- type: UPDATE_ATTRIBUTE_SUBSCRIPTION_ID,
- id: id
- }
-};
-
-export const setCurrentAssetId = (id: string): MapActionSetCurrentAssetId => {
- return {
- type: SET_CURRENT_ASSET_ID,
- id: id
- }
-};
diff --git a/ui/app/main/src/components/my-app.ts b/ui/app/main/src/components/my-app.ts
deleted file mode 100644
index 857054366..000000000
--- a/ui/app/main/src/components/my-app.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import {css, customElement, html, LitElement, property, PropertyValues, unsafeCSS, TemplateResult} from "lit-element";
-import {updateMetadata} from "pwa-helpers/metadata";
-import "@openremote/or-header";
-import "@openremote/or-icon";
-import manager, {DefaultColor2, DefaultColor3, DefaultHeaderHeight} from "@openremote/core";
-import {router} from "../index";
-import {RootState, store} from "../store";
-import "../components/pages/page-map";
-import "../components/pages/page-assets";
-import "../components/pages/page-rules";
-import "../components/pages/page-insights";
-import "../components/pages/page-logs";
-import "../components/pages/page-gateway";
-import i18next from "i18next";
-import {connect} from "pwa-helpers/connect-mixin";
-
-// Declare require method which we'll use for importing webpack resources (using ES6 imports will confuse typescript parser)
-declare function require(name: string): any;
-
-const logoImage = require("../../images/logo.png");
-const logoMobileImage = require("../../images/logo-mobile.png");
-
-@customElement("my-app")
-class MyApp extends connect(store)(LitElement) {
-
- @property({type: String})
- public appTitle = "";
-
- @property({type: Boolean, attribute: false})
- protected resolved = false;
-
- @property({type: String, attribute: false})
- protected page = "";
-
- static get styles() {
- return css`
- :host {
- --or-app-color2: ${unsafeCSS(DefaultColor2)};
- --or-app-color3: #22211f;
- --or-app-color4: #4D9D2A;
- color: ${unsafeCSS(DefaultColor3)};
- fill: ${unsafeCSS(DefaultColor3)};
- font-size: 14px;
- }
-
- .main-content {
- display: flex;
- padding-top: ${unsafeCSS(DefaultHeaderHeight)};
- height: 100vh;
- box-sizing: border-box;
- background-color: var(--or-app-color2);
- }
-
- .page {
- display: flex;
- flex: 1;
- position: relative;
- }
-
- .desktop-hidden {
- display: none !important;
- }
-
- @media only screen and (max-width: 780px){
- .desktop-hidden {
- display: inline-block !important;
- }
- }
-
- /* HEADER STYLES */
- or-header a > or-icon {
- margin-right: 10px;
- }
- `;
- }
-
- protected render(): TemplateResult | void {
-
- if (!this.resolved) {
- return html``;
- }
-
- return html`
- <or-header logo="${logoImage}" logoMobile="${logoMobileImage}"></or-header>
-
- <!-- Main content -->
- <main role="main" class="main-content d-none">
- ${this.page === "map" ? html`<page-map class="page"></page-map>` : ``}
- ${this.page === "assets" ? html`<page-assets class="page"></page-assets>` : ``}
- ${this.page === "rules" ? html`<page-rules class="page"></page-rules>` : ``}
- ${this.page === "insights" ? html`<page-insights class="page"></page-insights>` : ``}
- ${this.page === "logs" ? html`<page-logs class="page"></page-logs>` : ``}
- ${this.page === "gateway" ? html`<page-gateway class="page"></page-gateway>` : ``}
- </main>
- `;
- }
-
- public logout() {
- manager.logout();
- }
-
- public stateChanged(state: RootState) {
- this.page = state.app!.page;
- this.resolved = state.app.resolved;
- }
-
- protected updated(changedProps: PropertyValues) {
- super.updated(changedProps);
-
- if (changedProps.has("page")) {
- const pageTitle = i18next.isInitialized ? i18next.t(this.appTitle) + " - " + i18next.t(this.page) : this.appTitle + " - " + this.page;
- updateMetadata({
- title: pageTitle,
- description: pageTitle
- });
- }
- }
-}
\ No newline at end of file
diff --git a/ui/app/main/src/components/pages/page-gateway.ts b/ui/app/main/src/components/pages/page-gateway.ts
deleted file mode 100644
index 6c10414c0..000000000
--- a/ui/app/main/src/components/pages/page-gateway.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {css, customElement, html, LitElement} from "lit-element";
-import {store} from "../../store";
-import {connect} from "pwa-helpers/connect-mixin";
-import "../or-gateway-connection-panel/src/index";
-
-@customElement("page-gateway")
-class PageGateway extends connect(store)(LitElement) {
- // language=CSS
- static get styles() {
- return css`
- :host {
- flex: 1;
- width: 100%;
-
- display: flex;
- justify-content: center;
- }
-
- or-gateway-connection-panel {
- max-width: 1000px;
- margin-top: 40px;
- }
-
- @media only screen and (max-width: 1080px){
- or-gateway-connection-panel {
- margin: 0;
- }
- }
- `;
- }
-
- protected render() {
- return html`
-
- <or-gateway-connection-panel></or-gateway-connection-panel>
- `;
- }
-}
diff --git a/ui/app/main/src/components/pages/page-insights.ts b/ui/app/main/src/components/pages/page-insights.ts
deleted file mode 100644
index 8953312a0..000000000
--- a/ui/app/main/src/components/pages/page-insights.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {customElement, html, LitElement, property, TemplateResult, css, unsafeCSS} from "lit-element";
-import {store} from "../../store";
-import {connect} from "pwa-helpers/connect-mixin";
-import "@openremote/or-data-viewer";
-import {DataViewerConfig} from "@openremote/or-data-viewer";
-import {DefaultBoxShadow} from "@openremote/core";
-
-// language=CSS
-const style = css`
-
- or-asset-tree {
- align-items: stretch;
- z-index: 1;
- }
-
- .hideMobile {
- display: none;
- }
-
- or-asset-viewer {
- align-items: stretch;
- z-index: 0;
- }
-
- @media only screen and (min-width: 768px){
- or-asset-tree {
- width: 300px;
- min-width: 300px;
- box-shadow: ${unsafeCSS(DefaultBoxShadow)}
- }
-
- .hideMobile {
- display: flex;
- }
-
- or-asset-viewer,
- or-asset-viewer.hideMobile {
- display: initial;
- }
-
-
-
- }
-`;
-
-const viewerConfig: DataViewerConfig = {
- panels: {
- "chart": {
- type: "chart",
- hideOnMobile: true,
- panelStyles: {
- gridColumn: "1 / -1",
- gridRowStart: "1"
- },
- defaults: [{
- assetId:"5442Ite2XVp3Ky9X2y647a",
- attributes: ["UVIndex"]
- }]
- }
- }
-};
-
-@customElement("page-insights")
-class PageInsights extends connect(store)(LitElement) {
-
- static get styles() {
- return style;
- }
-
- @property()
- protected _assetId;
-
- protected render(): TemplateResult | void {
- return html`
- <or-data-viewer .config="${viewerConfig}"></or-data-viewer>
- `;
- }
-
-}
diff --git a/ui/app/main/src/components/pages/page-logs.ts b/ui/app/main/src/components/pages/page-logs.ts
deleted file mode 100644
index f8b0f479a..000000000
--- a/ui/app/main/src/components/pages/page-logs.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {css, customElement, html, LitElement} from "lit-element";
-import {store} from "../../store";
-import {connect} from "pwa-helpers/connect-mixin";
-import "@openremote/or-log-viewer";
-import {ViewerConfig} from "@openremote/or-log-viewer";
-import {SyslogCategory} from "@openremote/model";
-
-@customElement("page-logs")
-class PageLogs extends connect(store)(LitElement) {
-
- static get styles() {
- return css`
- :host {
- flex: 1;
- width: 100%;
- }
-
- or-log-viewer {
- width: 100%;
- }
- `;
- }
-
- protected config: ViewerConfig = {
- };
-
- protected render() {
- return html`
- <or-log-viewer .config="${this.config}"></or-log-viewer>
- `;
- }
-}
diff --git a/ui/app/main/src/components/pages/page-map.ts b/ui/app/main/src/components/pages/page-map.ts
deleted file mode 100644
index 0f386cf08..000000000
--- a/ui/app/main/src/components/pages/page-map.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import {css, customElement, html, LitElement, property, query} from "lit-element";
-import {connect} from "pwa-helpers/connect-mixin";
-import "@openremote/or-map";
-import "@openremote/or-map/dist/or-map-asset-card";
-import {ViewerConfig} from "@openremote/or-map/dist/or-map-asset-card";
-
-import {Util} from "@openremote/core";
-import {OrMap, OrMapClickedEvent, OrMapMarkerAsset, OrMapMarkerClickedEvent} from "@openremote/or-map";
-import {RootState, store} from "../../store";
-import {setCurrentAssetId, subscribeAssets, unsubscribeAssets} from "../../actions/map";
-import map from "../../reducers/map";
-import {createSelector} from "reselect";
-import {Asset, AttributeType, MetaItemType} from "@openremote/model";
-import {MapStyle} from "./style";
-import {router} from "../../index";
-store.addReducers({
- map
-});
-
-const mapCardConfig: ViewerConfig = {
- default: {
- exclude: ["userNotes"]
- },
- assetTypes: {
- "urn:openremote:asset:iems:weather": {
- exclude: ["location"]
- }
- }
-};
-
-@customElement("page-map")
-class PageMap extends connect(store)(LitElement) {
-
- static get styles() {
- return MapStyle;
- }
-
- @query("#map")
- protected _map?: OrMap;
-
- @property()
- protected _assets: Asset[] = [];
-
- @property()
- protected _currentAsset?: Asset;
-
- protected _assetSelector = (state: RootState) => state.map.assets;
- protected _currentAssetSelector = (state: RootState) => state.app.activeAsset;
-
- protected _getMapAssets = createSelector(
- [this._assetSelector],
- (assets) => {
- return assets;
- });
-
- protected _getCurrentAsset = createSelector(
- [this._assetSelector, this._currentAssetSelector],
- (assets, currentId) => {
- if (!currentId) {
- return null;
- }
- return assets.find((asset) => asset.id === currentId);
- });
-
- protected render() {
-
- return html`
-
- ${this._currentAsset ? html `<or-map-asset-card .config="${mapCardConfig}" .asset="${this._currentAsset}"></or-map-asset-card>` : ``}
-
- <or-map id="map" class="or-map">
- ${
- this._assets.map((asset) => {
- const attr = Util.getAssetAttribute(asset, AttributeType.LOCATION.attributeName!);
- const showOnMapMeta = Util.getFirstMetaItem(attr, MetaItemType.SHOW_ON_DASHBOARD.urn!);
- if(!showOnMapMeta || !showOnMapMeta.value) return html``;
- return html`
- <or-map-marker-asset ?active="${this._currentAsset && this._currentAsset.id === asset.id}" .asset="${asset}"></or-map-marker-asset>
- `;
- })
- }
- </or-map>
- `;
- }
-
- public connectedCallback() {
- super.connectedCallback();
- this.addEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);
- this.addEventListener(OrMapClickedEvent.NAME, this.onMapClick);
- store.dispatch(subscribeAssets());
- }
-
- public disconnectedCallback() {
- super.disconnectedCallback();
- this.removeEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);
- this.removeEventListener(OrMapClickedEvent.NAME, this.onMapClick);
- store.dispatch(unsubscribeAssets());
- }
-
- stateChanged(state: RootState) {
- this._assets = this._getMapAssets(state);
- this._currentAsset = this._getCurrentAsset(state);
- }
-
- protected onMapMarkerClick(e: OrMapMarkerClickedEvent) {
- const asset = (e.detail.marker as OrMapMarkerAsset).asset;
- store.dispatch(setCurrentAssetId(asset.id));
-
- router.navigate('map/'+asset.id);
- }
-
- protected onMapClick(e: OrMapClickedEvent) {
- router.navigate('map');
- }
-
- protected getCurrentAsset() {
- this._getCurrentAsset(store.getState());
- }
-}
diff --git a/ui/app/main/src/components/pages/style.ts b/ui/app/main/src/components/pages/style.ts
deleted file mode 100644
index 6a289f279..000000000
--- a/ui/app/main/src/components/pages/style.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {css, CSSResult} from "lit-element";
-
-// language=CSS
-export const MapStyle: CSSResult = css`
- or-map-asset-card {
- height: 166px;
- position: absolute;
- bottom: 0px;
- right: 0px;
- width: calc(100vw - 10px);
- margin: 5px;
- z-index: 99;
- }
-
- or-map {
- display: block;
- height: 100%;
- width: 100%;
- }
-
- @media only screen and (min-width: 415px){
- or-map-asset-card {
- position: absolute;
- top: 20px;
- right: 20px;
- width: 320px;
- margin: 0;
- height: 400px; /* fallback for IE */
- height: max-content;
- max-height: calc(100vh - 150px);
- }
- }
-`;
\ No newline at end of file
diff --git a/ui/app/main/src/index.ts b/ui/app/main/src/index.ts
index 0b1ab2a7a..a13e85d35 100644
--- a/ui/app/main/src/index.ts
+++ b/ui/app/main/src/index.ts
@@ -1,77 +1,91 @@
-import Navigo from "navigo";
-import manager, {Auth} from "@openremote/core";
-import {store} from "./store";
-import "./components/my-app";
-import {resolveApp, updatePage, updateRule, setActiveAsset} from "./actions/app";
+// Declare require method which we'll use for importing webpack resources (using ES6 imports will confuse typescript parser)
+declare function require(name: string): any;
-// Declare MANAGER_URL
-declare var MANAGER_URL: string;
+import {combineReducers, configureStore} from "@reduxjs/toolkit";
+import "@openremote/or-app";
+import {
+ OrApp,
+ AppConfig,
+ appReducer,
+ headerItemGatewayConnection,
+ headerItemLanguage,
+ headerItemLogout,
+ headerItemLogs,
+ headerItemMap,
+ headerItemAssets,
+ headerItemRules,
+ headerItemInsights} from "@openremote/or-app";
+import "@openremote/or-app/dist/pages/page-map";
+import {pageMapReducer, pageMapProvider} from "@openremote/or-app/dist/pages/page-map";
+import "@openremote/or-app/dist/pages/page-assets";
+import {pageAssetsProvider} from "@openremote/or-app/dist/pages/page-assets";
+import "@openremote/or-app/dist/pages/page-gateway";
+import {pageGatewayProvider} from "@openremote/or-app/dist/pages/page-gateway";
+import "@openremote/or-app/dist/pages/page-insights";
+import {pageInsightsProvider} from "@openremote/or-app/dist/pages/page-insights";
+import "@openremote/or-app/dist/pages/page-rules";
+import {pageRulesProvider} from "@openremote/or-app/dist/pages/page-rules";
+import "@openremote/or-app/dist/pages/page-logs";
+import {pageLogsProvider} from "@openremote/or-app/dist/pages/page-logs";
-// Configure routing
-export const router = new Navigo(null, true, "#!");
-
-router.on({
- "map": (params, query) => {
- store.dispatch(setActiveAsset(null));
- store.dispatch(updatePage("map"));
- },
- "map/:id": (params, query) => {
- store.dispatch(setActiveAsset(params.id));
- store.dispatch(updatePage("map"));
- },
- "insights": (params, query) => {
- store.dispatch(setActiveAsset(null));
- store.dispatch(updatePage("insights"));
- },
- "insights/:id": (params, query) => {
- store.dispatch(setActiveAsset(params.id));
- store.dispatch(updatePage("insights", params.id));
- },
- "assets": (params, query) => {
- store.dispatch(setActiveAsset(null));
- store.dispatch(updatePage("assets"));
- },
- "assets/:id": (params, query) => {
- store.dispatch(setActiveAsset(params.id));
- store.dispatch(updatePage("assets", params.id));
- },
- "rules": (params, query) => {
- store.dispatch(updatePage("rules"));
- },
- "rules/:id": (params, query) => {
- store.dispatch(updateRule(params.id));
- store.dispatch(updatePage("rules"));
- },
- "logs": (params, query) => {
- store.dispatch(updatePage("logs"));
- },
- "gateway": (params, query) => {
- store.dispatch(updatePage("gateway"));
- },
- "*": (params, query) => {
- store.dispatch(updatePage("map"));
- }
+const rootReducer = combineReducers({
+ app: appReducer,
+ map: pageMapReducer
});
-function getUrlParameter(name) {
- name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
- const regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
- const results = regex.exec(location.search);
- return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}
+type RootState = ReturnType<typeof rootReducer>;
-const realmFromPath = getUrlParameter("realm");
+export const store = configureStore({
+ reducer: rootReducer
+});
+
+const orApp = new OrApp(store);
-manager.init({
- managerUrl: MANAGER_URL,
- auth: Auth.KEYCLOAK,
- autoLogin: true,
- realm: realmFromPath,
- consoleAutoEnable: true,
- loadTranslations: ["app", "or"]
-}).then(() => {
- if (manager.authenticated) {
- router.resolve();
- store.dispatch(resolveApp(true));
+const appConfig: AppConfig<RootState> = {
+ pages: {
+ default: pageMapProvider(store),
+ assets: pageAssetsProvider(store),
+ gateway: pageGatewayProvider(store),
+ logs: pageLogsProvider(store),
+ insights: pageInsightsProvider(store),
+ rules: pageRulesProvider(store)
+ },
+ default: {
+ appTitle: "OpenRemote Demo",
+ logo: require("../images/logo.png"),
+ logoMobile: require("../images/logo-mobile.png"),
+ header: {
+ mainMenu: [
+ headerItemMap(orApp),
+ headerItemAssets(orApp),
+ headerItemRules(orApp),
+ headerItemInsights(orApp)
+ // {
+ // icon: "android-messages",
+ // href: "#!messages",
+ // text: "messages",
+ // }
+ ],
+ secondaryMenu: [
+ headerItemGatewayConnection(orApp),
+ headerItemLanguage(orApp),
+ headerItemLogs(orApp),
+ headerItemLogout(orApp)
+ // {
+ // icon: "account-cog",
+ // value: "User management",
+ // text: "User management",
+ // isSuperUser: true
+ // },
+ // {
+ // icon: "tune",
+ // value: "Settings",
+ // text: "Settings"
+ // }
+ ]
+ }
}
-});
\ No newline at end of file
+};
+
+orApp.appConfig = appConfig;
+document.body.appendChild(orApp);
diff --git a/ui/app/main/src/reducers/app.ts b/ui/app/main/src/reducers/app.ts
deleted file mode 100644
index 6ceece8da..000000000
--- a/ui/app/main/src/reducers/app.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Reducer } from "redux";
-import {
- UPDATE_PAGE,
- SET_SCROLL_TOP,
- UPDATE_DRAWER,
- RESOLVE_APP,
- AppAction, SET_ACTIVE_ASSET
-} from "../actions/app";
-
-export interface AppState {
- page: string;
- activeAsset: string;
- offline: boolean;
- resolved: boolean,
- drawerOpened: boolean;
- scrollTop: number;
-}
-
-const INITIAL_STATE: AppState = {
- page: "",
- activeAsset: undefined,
- offline: false,
- resolved: false,
- drawerOpened: false,
- scrollTop: 0,
-};
-
-const app: Reducer<AppState, AppAction> = (state = INITIAL_STATE, action) => {
- switch (action.type) {
- case UPDATE_PAGE:
- return {
- ...state,
- page: action.page
- };
- case RESOLVE_APP:
- return {
- ...state,
- resolved: action.resolved
- };
- case UPDATE_DRAWER:
- return {
- ...state,
- drawerOpened: action.opened
- };
- case SET_SCROLL_TOP:
- return {
- ...state,
- scrollTop: action.top
- };
- case SET_ACTIVE_ASSET:
- return {
- ...state,
- activeAsset: action.assetId
- };
- default:
- return state;
- }
-};
-
-export default app;
diff --git a/ui/app/main/src/reducers/map.ts b/ui/app/main/src/reducers/map.ts
deleted file mode 100644
index 49113055a..000000000
--- a/ui/app/main/src/reducers/map.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {Reducer} from "redux";
-import {MapAction, ASSET_EVENT_RECEIVED, SET_CURRENT_ASSET_ID, ATTRIBUTE_EVENT_RECEIVED} from "../actions/map";
-import {Asset, AssetEventCause} from "@openremote/model";
-import {Util} from "@openremote/core";
-
-export interface MapState {
- assets: Asset[];
- currentAssetId: string;
- assetSubscriptionId: string;
- attributeSubscriptionId: string;
-}
-
-const INITIAL_STATE: MapState = {
- assets: [],
- currentAssetId: undefined,
- assetSubscriptionId: undefined,
- attributeSubscriptionId: undefined
-};
-
-const reducer: Reducer<MapState, MapAction> = (state = INITIAL_STATE, action) => {
- switch (action.type) {
-
- case ASSET_EVENT_RECEIVED: {
- let assets = state.assets.filter((asst) => asst.id !== action.event.asset.id);
- if (action.event.cause !== AssetEventCause.DELETE) {
- assets.push(action.event.asset);
- }
- return {
- ...state,
- assets: assets
- };
- }
- case ATTRIBUTE_EVENT_RECEIVED: {
- let assets = state.assets;
- const assetId = action.event.attributeState.attributeRef.entityId;
- const index = assets.findIndex((asst) => asst.id === assetId);
- let asset = index >= 0 ? assets[index] : null;
-
- if (!asset) {
- return state;
- }
-
- asset = Util.updateAsset(asset, action.event);
-
- return {
- ...state,
- assets: [
- ...assets.slice(0, index),
- asset,
- ...assets.slice(index + 1)
- ]
- };
- }
- case SET_CURRENT_ASSET_ID:
- return {
- ...state,
- currentAssetId: action.id
- };
- default:
- return state;
- }
-};
-
-export default reducer;
diff --git a/ui/app/main/src/store.ts b/ui/app/main/src/store.ts
deleted file mode 100644
index 934299bff..000000000
--- a/ui/app/main/src/store.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import {MapAction} from "./actions/map";
-
-declare global {
- interface Window {
- process?: Object;
- __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose;
- }
-}
-
-import {
- createStore,
- compose,
- applyMiddleware,
- combineReducers,
- Reducer,
- StoreEnhancer
-} from "redux";
-import thunk, { ThunkMiddleware } from "redux-thunk";
-import { lazyReducerEnhancer } from "pwa-helpers/lazy-reducer-enhancer";
-
-import app, { AppState } from "./reducers/app";
-import { AppAction } from "./actions/app";
-import {MapState} from "./reducers/map";
-
-// Overall state extends static states and partials lazy states.
-export interface RootState {
- app?: AppState;
- map?: MapState;
-}
-
-export type RootAction = AppAction | MapAction;
-
-// Sets up a Chrome extension for time travel debugging.
-// See https://github.com/zalmoxisus/redux-devtools-extension for more information.
-const devCompose: <Ext0, Ext1, StateExt0, StateExt1>(
- f1: StoreEnhancer<Ext0, StateExt0>, f2: StoreEnhancer<Ext1, StateExt1>
-) => StoreEnhancer<Ext0 & Ext1, StateExt0 & StateExt1> =
- window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-
-// Initializes the Redux store with a lazyReducerEnhancer (so that you can
-// lazily add reducers after the store has been created) and redux-thunk (so
-// that you can dispatch async actions). See the "Redux and state management"
-// section of the wiki for more details:
-// https://github.com/Polymer/pwa-starter-kit/wiki/4.-Redux-and-state-management
-export const store = createStore(
- (state) => state as Reducer<RootState, RootAction>,
- devCompose(
- lazyReducerEnhancer(combineReducers),
- applyMiddleware(thunk as ThunkMiddleware<RootState, RootAction>))
-);
-
-// Initially loaded reducers.
-store.addReducers({
- app
-});
-
diff --git a/ui/app/main/tsconfig.json b/ui/app/main/tsconfig.json
index 47da40701..5a06f0da9 100644
--- a/ui/app/main/tsconfig.json
+++ b/ui/app/main/tsconfig.json
@@ -5,22 +5,9 @@
"strict": false
},
"include": [
- "./src",
- "../../component/or-map/@types"
+ "./src"
],
"references": [
- { "path": "../../component/core" },
- { "path": "../../component/or-icon" },
- { "path": "../../component/or-header" },
- { "path": "../../component/or-input" },
- { "path": "../../component/or-map" },
- { "path": "../../component/or-asset-tree" },
- { "path": "../../component/or-data-viewer" },
- { "path": "../../component/or-log-viewer" },
- { "path": "../../component/or-attribute-input" },
- { "path": "../../component/or-chart" },
- { "path": "../../component/or-asset-viewer" },
- { "path": "../../component/or-rules" },
- { "path": "../../component/or-table" }
+ { "path": "../or-app" }
]
}
\ No newline at end of file
diff --git a/ui/app/main/webpack.config.js b/ui/app/main/webpack.config.js
index bf743b1df..df1b92bc3 100644
--- a/ui/app/main/webpack.config.js
+++ b/ui/app/main/webpack.config.js
@@ -88,18 +88,17 @@ module.exports = (env, argv) => {
ignore: "!*.js"
},
{
- from: "./images",
- to: "images"
- },
- {
- from: "./locales",
+ from: path.join(path.dirname(require.resolve("@openremote/or-app/package.json")), "locales"),
to: "locales"
},
{
- from: ".htaccess",
- to: ".htaccess",
- toType: 'file'
+ from: "./images",
+ to: "images"
}
+ // {
+ // from: "./locales",
+ // to: "locales"
+ // }
])
];
diff --git a/ui/app/or-app/.gitignore b/ui/app/or-app/.gitignore
new file mode 100644
index 000000000..632fd9253
--- /dev/null
+++ b/ui/app/or-app/.gitignore
@@ -0,0 +1,11 @@
+build/
+node_modules/
+test/integration/screenshots-current/
+_site/
+.DS_Store
+src/**/*.d.ts
+src/**/*.js
+src/**/*.js.map
+openremote/**/*.d.ts
+openremote/**/*.js
+openremote/**/*.js.map
\ No newline at end of file
diff --git a/ui/component/or-header/.npmignore b/ui/app/or-app/.npmignore
similarity index 100%
rename from ui/component/or-header/.npmignore
rename to ui/app/or-app/.npmignore
diff --git a/ui/app/or-app/README.md b/ui/app/or-app/README.md
new file mode 100644
index 000000000..2472fe7cb
--- /dev/null
+++ b/ui/app/or-app/README.md
@@ -0,0 +1,87 @@
+# @openremote/or-asset-viewer \<or-asset-viewer\>
+[![NPM Version][npm-image]][npm-url]
+[![Linux Build][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
+Web Component for displaying an asset tree. This component requires an OpenRemote Manager to retrieve, save and query assets.
+
+## Install
+```bash
+npm i @openremote/or-asset-viewer
+yarn add @openremote/or-asset-viewer
+```
+
+## Usage
+By default the or-asset-viewer is using a 2 columns grid. This can be changed by using a different config.
+
+4 column grid, 25% for each column:
+```javascript
+const viewerConfig = {
+ viewerStyles: {
+ gridTemplateColumns: "repeat(auto-fill, minmax(calc(25%),1fr))";
+ }
+};
+<or-asset-viewer .config="${viewerConfig}"></or-asset-viewer>
+```
+
+
+The position of a panel can also be changed by changing the config of or-asset-viewer
+
+To change the width of a panel use gridColumn:
+```javascript
+const viewerConfig = {
+ panels: {
+ "info": {
+ type: "property",
+ panelStyles: {
+ gridColumn: "1 / -1" // same as 1 / 3 in a 2 column grid: Start on column 1, End on column 3
+ }
+ }
+ }
+};
+```
+
+gridColumn can also be used to change the position horizontaly.
+```javascript
+const viewerConfig = {
+ panels: {
+ "info": {
+ type: "property",
+ panelStyles: {
+ gridColumnStart: "2" // start the panel in the second column
+ }
+ }
+ }
+};
+```
+
+To change the vertical position of a panel use gridRowStart. To start the panel on the first row set gridRowStart to 1:
+```javascript
+const viewerConfig = {
+ panels: {
+ "info": {
+ type: "property",
+ panelStyles: {
+ gridRowStart: "1"
+ }
+ }
+ }
+};
+```
+
+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-asset-list
+[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=master
diff --git a/ui/component/or-header/build.gradle b/ui/app/or-app/build.gradle
similarity index 100%
rename from ui/component/or-header/build.gradle
rename to ui/app/or-app/build.gradle
diff --git a/ui/app/main/locales/en/app.json b/ui/app/or-app/locales/en/app.json
similarity index 100%
rename from ui/app/main/locales/en/app.json
rename to ui/app/or-app/locales/en/app.json
diff --git a/ui/app/main/locales/nl/app.json b/ui/app/or-app/locales/nl/app.json
similarity index 100%
rename from ui/app/main/locales/nl/app.json
rename to ui/app/or-app/locales/nl/app.json
diff --git a/ui/app/or-app/package.json b/ui/app/or-app/package.json
new file mode 100644
index 000000000..61ef8d9ac
--- /dev/null
+++ b/ui/app/or-app/package.json
@@ -0,0 +1,64 @@
+{
+ "name": "@openremote/or-app",
+ "version": "1.1.0",
+ "description": "OpenRemote app template",
+ "author": "OpenRemote",
+ "license": "AGPL-3.0-or-later",
+ "main": "dist/umd/index.bundle.js",
+ "module": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "private": true,
+ "scripts": {
+ "clean": "npx shx rm -rf dist",
+ "modelBuild": "node ../../model-build.js",
+ "modelWatch": "node ../../model-watch.js",
+ "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",
+ "serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack-dev-server --mode development",
+ "watch": "npx tsc -b -w",
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "dependencies": {
+ "@openremote/core": "^1.1.0",
+ "@openremote/or-asset-tree": "^1.1.0",
+ "@openremote/or-asset-viewer": "^1.1.0",
+ "@openremote/or-chart": "^1.1.0",
+ "@openremote/or-map": "^1.1.0",
+ "@openremote/or-rules": "^1.1.0",
+ "@openremote/or-smart-notify": "^1.1.0",
+ "@openremote/or-timeline": "^1.1.0",
+ "@openremote/rest": "^1.1.0",
+ "@reduxjs/toolkit": "^1.3.6",
+ "@types/navigo": "^7.0.1",
+ "@webcomponents/webcomponentsjs": "^2.2.10",
+ "lit-element": "^2.2.1",
+ "moment": "^2.24.0",
+ "navigo": "^7.1.2",
+ "pwa-helpers": "^0.9.0"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.2.2",
+ "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+ "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+ "@babel/plugin-transform-regenerator": "^7.0.0",
+ "@babel/plugin-transform-runtime": "^7.2.0",
+ "@babel/preset-env": "^7.2.0",
+ "@babel/runtime": "^7.2.0",
+ "babel-loader": "^8.0.4",
+ "copy-webpack-plugin": "^4.6.0",
+ "cross-env": "^5.2.0",
+ "css-loader": "^2.0.0",
+ "fast-async": "^6.3.8",
+ "file-loader": "^2.0.0",
+ "html-webpack-plugin": "^3.2.0",
+ "raw-loader": "^0.5.1",
+ "shx": "^0.3.2",
+ "source-map-loader": "^0.2.4",
+ "style-loader": "^0.23.1",
+ "tslint": ">=5.11.0",
+ "typescript": ">=3.4.5",
+ "url-loader": "^1.1.2",
+ "webpack": "^4.41.2",
+ "webpack-cli": "^3.3.9",
+ "webpack-dev-server": "^3.9.0"
+ }
+}
diff --git a/ui/app/or-app/src/app.ts b/ui/app/or-app/src/app.ts
new file mode 100644
index 000000000..f29dea90e
--- /dev/null
+++ b/ui/app/or-app/src/app.ts
@@ -0,0 +1,57 @@
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
+export interface AppState {
+ page: string;
+ params: {[k in string]: any} | undefined;
+ offline: boolean;
+ resolved: boolean,
+ drawerOpened: boolean;
+ scrollTop: number;
+}
+
+export interface AppStateKeyed {
+ app: AppState;
+}
+
+const INITIAL_STATE: AppState = {
+ page: "",
+ params: undefined,
+ offline: false,
+ resolved: false,
+ drawerOpened: false,
+ scrollTop: 0,
+};
+
+const appSlice = createSlice({
+ name: "app",
+ initialState: INITIAL_STATE,
+ reducers: {
+ updatePage(state, action: PayloadAction<string>) {
+ return {
+ ...state,
+ page: action.payload
+ };
+ },
+ updateParams(state, action: PayloadAction<{[k in string]: any}>) {
+ return {
+ ...state,
+ params: action.payload
+ };
+ },
+ updateDrawer(state, action: PayloadAction<boolean>) {
+ return {
+ ...state,
+ drawerOpened: action.payload
+ };
+ },
+ scrollToTop(state, action: PayloadAction<number>) {
+ return {
+ ...state,
+ scrollTop: action.payload
+ };
+ }
+ }
+});
+
+export const {updatePage, updateParams, updateDrawer, scrollToTop} = appSlice.actions;
+export const appReducer = appSlice.reducer;
diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.ts
new file mode 100644
index 000000000..c620f9dc7
--- /dev/null
+++ b/ui/app/or-app/src/index.ts
@@ -0,0 +1,453 @@
+import {
+ css,
+ customElement,
+ html,
+ LitElement,
+ property,
+ PropertyValues,
+ query,
+ TemplateResult,
+ unsafeCSS
+} from "lit-element";
+import {updateMetadata} from "pwa-helpers/metadata";
+import i18next from "i18next";
+import Navigo from "navigo";
+import manager, {Auth, DefaultColor2, DefaultColor3, DefaultHeaderHeight, ManagerConfig, Util} from "@openremote/core";
+import "@openremote/or-mwc-components/dist/or-mwc-menu";
+import "./or-header";
+import {DEFAULT_LANGUAGES, HeaderConfig, HeaderItem, Languages} from "./or-header";
+import {DialogConfig, OrMwcDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";
+import {AnyAction, EnhancedStore, Unsubscribe} from "@reduxjs/toolkit";
+import {AppStateKeyed, updatePage, updateParams} from "./app";
+import {ThunkMiddleware} from "redux-thunk";
+import { translate } from "@openremote/or-translate";
+
+export * from "./app";
+export * from "./or-header";
+
+// Declare MANAGER_URL - Global var injected by webpack
+declare var MANAGER_URL: string;
+
+// Configure routing
+export const router = new Navigo(null, true, "#!");
+export {HeaderConfig};
+
+export interface DefaultAppConfig {
+ appTitle: string;
+ logo: HTMLTemplateElement | string;
+ logoMobile: HTMLTemplateElement | string;
+ language?: string;
+ header: HeaderConfig;
+ styles?: TemplateResult;
+}
+
+export interface RealmAppConfig {
+ appTitle?: string;
+ logo?: HTMLTemplateElement | string;
+ logoMobile?: HTMLTemplateElement | string;
+ language?: string;
+ header?: HeaderConfig;
+ styles?: TemplateResult;
+}
+
+export interface AppConfig<S extends AppStateKeyed> {
+ pages?: {
+ default: PageProvider<S>;
+ [name: string]: PageProvider<S>;
+ }
+ default?: DefaultAppConfig;
+ realms?: {
+ [realm: string]: RealmAppConfig;
+ }
+}
+
+export interface PageProvider<S extends AppStateKeyed> {
+ routes: string[];
+ pageCreator: () => Page<S>;
+}
+
+export abstract class Page<S extends AppStateKeyed> extends translate(i18next)(LitElement) {
+
+ protected _store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware>>;
+
+ protected _storeUnsubscribe!: Unsubscribe;
+
+ constructor(store: EnhancedStore<S>) {
+ super();
+ this._store = store;
+ }
+
+ connectedCallback() {
+ if (super.connectedCallback) {
+ super.connectedCallback();
+ }
+
+ this._storeUnsubscribe = this._store.subscribe(() => this.stateChanged(this._store.getState()));
+ this.stateChanged(this._store.getState());
+ }
+
+ disconnectedCallback() {
+ this._storeUnsubscribe();
+
+ if (super.disconnectedCallback) {
+ super.disconnectedCallback();
+ }
+ }
+
+ abstract stateChanged(state: S);
+}
+
+export function headerItemMap<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "map",
+ href: "#!map",
+ text: "map"
+ };
+}
+
+export function headerItemAssets<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "rhombus-split",
+ href: "#!assets",
+ text: "asset_plural",
+ };
+}
+
+export function headerItemRules<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "state-machine",
+ href: "#!rules",
+ text: "rule_plural",
+ hideMobile: true
+ };
+}
+
+export function headerItemInsights<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "chart-areaspline",
+ href: "#!insights",
+ text: "insights",
+ hideMobile: true
+ };
+}
+
+export function headerItemGatewayConnection<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "cloud",
+ href: "#!gateway",
+ text: "gatewayConnection",
+ roles: ["write:admin", "read:admin"]
+ };
+}
+
+export function headerItemLanguage<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "web",
+ value: "language",
+ text: "language",
+ action: () => {
+ orApp.showLanguageModal();
+ }
+ };
+}
+
+export function headerItemLogout<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "logout",
+ value: "logout",
+ text: "logout",
+ action: () => {
+ orApp.logout();
+ }
+ };
+}
+
+export function headerItemLogs<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {
+ return {
+ icon: "file-document-box-search-outline",
+ value: "logs",
+ href: "#!logs",
+ text: "logs",
+ hideMobile: true
+ };
+}
+
+function getRealm(): string {
+ return Util.getQueryParameter(location.search, "realm");
+}
+
+const DEFAULT_MANAGER_CONFIG: ManagerConfig = {
+ managerUrl: MANAGER_URL,
+ auth: Auth.KEYCLOAK,
+ autoLogin: true,
+ realm: getRealm(),
+ consoleAutoEnable: true,
+ loadTranslations: ["app", "or"]
+};
+
+@customElement("or-app")
+export class OrApp<S extends AppStateKeyed> extends LitElement {
+
+ @property({type: Object})
+ public appConfig!: AppConfig<S>;
+
+ @property({type: Object})
+ public managerConfig?: ManagerConfig;
+
+ @query("main")
+ protected _mainElem!: HTMLElement;
+
+ @property()
+ protected _initialised = false;
+
+ @property()
+ protected _page?: string;
+
+ @query("#app-modal")
+ protected _appModal!: OrMwcDialog;
+
+ protected _config!: DefaultAppConfig;
+
+ protected _store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware>>;
+ protected _storeUnsubscribe!: Unsubscribe;
+
+ //language=CSS
+ static get styles() {
+ return css`
+ :host {
+ --or-app-color2: ${unsafeCSS(DefaultColor2)};
+ --or-app-color3: #22211f;
+ --or-app-color4: #4D9D2A;
+ color: ${unsafeCSS(DefaultColor3)};
+ fill: ${unsafeCSS(DefaultColor3)};
+ font-size: 14px;
+ }
+
+ .main-content {
+ display: flex;
+ padding-top: ${unsafeCSS(DefaultHeaderHeight)};
+ height: 100vh;
+ box-sizing: border-box;
+ background-color: var(--or-app-color2);
+ }
+
+ main > * {
+ display: flex;
+ flex: 1;
+ position: relative;
+ }
+
+ .desktop-hidden {
+ display: none !important;
+ }
+
+ @media only screen and (max-width: 780px) {
+ .desktop-hidden {
+ display: inline-block !important;
+ }
+ }
+
+ /* HEADER STYLES */
+ or-header a > or-icon {
+ margin-right: 10px;
+ }
+ `;
+ }
+
+ constructor(store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware>>) {
+ super();
+ this._store = store;
+ }
+
+ connectedCallback() {
+ if (super.connectedCallback) {
+ super.connectedCallback();
+ }
+
+ this._storeUnsubscribe = this._store.subscribe(() => this.stateChanged(this._store.getState()));
+ this.stateChanged(this._store.getState());
+ }
+
+ disconnectedCallback() {
+ this._storeUnsubscribe();
+
+ if (super.disconnectedCallback) {
+ super.disconnectedCallback();
+ }
+ }
+
+ protected firstUpdated(_changedProperties: Map<PropertyKey, unknown>): void {
+ super.firstUpdated(_changedProperties);
+
+ if (!this.appConfig) {
+ console.error("No AppConfig supplied");
+ return;
+ }
+
+ if (!this._store) {
+ console.error("No Redux store supplied");
+ return;
+ }
+
+ if (!this.appConfig.pages || Object.keys(this.appConfig.pages).length === 0) {
+ console.error("No page providers");
+ return;
+ }
+
+ Object.entries(this.appConfig.pages).map(([pageName, provider]) => {
+ if (provider.routes) {
+ provider.routes.forEach((route) => {
+ router.on(
+ route, (params, query) => {
+ this._store.dispatch(updatePage(pageName));
+ this._store.dispatch(updateParams(params));
+ }
+ )
+ });
+ }
+ });
+
+ if (this.appConfig.pages.default) {
+ router.on("*", (params, query) => {
+ this._store.dispatch(updatePage("default"));
+ })
+ }
+
+ const realm = getRealm();
+ const config = this._getConfig(realm);
+
+ if (!config) {
+ console.error("No default AppConfig or realm specific config for requested realm: " + realm);
+ return;
+ } else {
+ this._config = config;
+ }
+
+ const managerConfig = this.managerConfig || DEFAULT_MANAGER_CONFIG;
+
+ console.info("Initialising the manager");
+
+ manager.init(managerConfig).then((success) => {
+ if (success) {
+ this._initialised = true;
+ router.resolve();
+ } else {
+ this.showErrorModal(manager.isError ? "managerError." + manager.error : "");
+ }
+ });
+ }
+
+ protected updated(changedProps: PropertyValues) {
+ super.updated(changedProps);
+
+ if (!this._initialised) {
+ return;
+ }
+
+ if (changedProps.has("_page")) {
+ const appTitle = this._config.appTitle || "OpenRemote Manager";
+ let pageTitle = (i18next.isInitialized ? i18next.t(appTitle) : appTitle);
+
+ if (this._mainElem) {
+ if (this._mainElem.firstElementChild) {
+ this._mainElem.firstElementChild.remove();
+ }
+ if (this._page && this.appConfig.pages[this._page]) {
+ const pageElem = this.appConfig.pages[this._page].pageCreator();
+ this._mainElem.appendChild(pageElem);
+ pageTitle += (i18next.isInitialized ? " - " + i18next.t(this._page) : " - " + this._page);
+ }
+ }
+
+ updateMetadata({
+ title: pageTitle,
+ description: pageTitle
+ });
+ }
+ }
+
+ protected render(): TemplateResult | void {
+
+ if (!this._initialised) {
+ return html`<or-mwc-dialog id="app-modal"></or-mwc-dialog>`;
+ }
+
+ return html`
+ <or-header .logo="${this._config.logo}" .logoMobile="${this._config.logoMobile}" .config="${this._config.header}"></or-header>
+
+ <!-- Main content -->
+ <main role="main" class="main-content d-none"></main>
+
+ <or-mwc-dialog id="app-modal"></or-mwc-dialog>
+ `;
+ }
+
+ public logout() {
+ manager.logout();
+ }
+
+ public setLanguage(lang: string) {
+ manager.language = lang;
+ }
+
+ public showLanguageModal() {
+ this.showModal(this._getLanguageModalConfig(DEFAULT_LANGUAGES));
+ }
+
+ public showErrorModal(errorMessage: string) {
+ this.showModal({
+ title: "error",
+ content: html`
+ <div>
+ <p><or-translate value="errorOccurred"></or-translate>
+ ${errorMessage ? html`
+ :</p>
+ <p>
+ <or-translate value="error"></or-translate>
+ <span> = </span>
+ <or-translate .value="${errorMessage}"></or-translate>
+ ` : ``}
+ </p>
+ </div>`,
+ actions: [{
+ actionName: "ok",
+ content: i18next.t("ok"),
+ default: true
+ }]
+ })
+ }
+
+ public showModal(config: DialogConfig) {
+ if (this._appModal) {
+ this._appModal.config = config;
+ this._appModal.open();
+ }
+ }
+
+ public stateChanged(state: S) {
+ this._page = state.app!.page;
+ }
+
+ protected _getConfig(realm: string): DefaultAppConfig {
+ const realmConfig = this.appConfig.realms ? this.appConfig.realms![realm] : undefined;
+ return Object.assign({}, this.appConfig!.default, realmConfig);
+ }
+
+ protected _getLanguageModalConfig(languages: Languages): DialogConfig {
+ const title = "language";
+ const actions = Object.entries(languages).map(([key, value]) => {
+ return {
+ content: i18next.t(value),
+ actionName: key,
+ action: () => {
+ manager.language = key;
+ }
+ };
+ });
+
+ return {
+ title: title,
+ actions: actions
+ };
+ }
+}
diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.ts
new file mode 100644
index 000000000..6b3df2935
--- /dev/null
+++ b/ui/app/or-app/src/or-header.ts
@@ -0,0 +1,432 @@
+import {customElement, html, LitElement, property, query, TemplateResult, css, unsafeCSS} from "lit-element";
+import {until} from "lit-html/directives/until";
+import i18next from "i18next";
+import {DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor4, DefaultBoxShadowBottom, DefaultHeaderHeight} from "@openremote/core";
+import manager from "@openremote/core";
+import "@openremote/or-mwc-components/dist/or-mwc-dialog";
+import "@openremote/or-icon";
+import {MenuItem, getContentWithMenuTemplate} from "@openremote/or-mwc-components/dist/or-mwc-menu";
+
+export interface HeaderConfig {
+ mainMenu: HeaderItem[];
+ secondaryMenu?: HeaderItem[];
+}
+
+export interface HeaderItem {
+ icon: string;
+ text: string;
+ value?: string;
+ href?: string;
+ action?: () => void;
+ hideMobile?: boolean;
+ roles?: string[];
+}
+
+export interface Languages {
+ [langKey: string]: string;
+}
+
+export const DEFAULT_LANGUAGES: Languages = {
+ "en": "english",
+ "nl": "dutch",
+ "fr": "french",
+ "de": "german",
+ "es": "spanish"
+};
+
+function getHeaderMenuItems(items: HeaderItem[]): MenuItem[] {
+ return items.filter(option => !option.roles || option.roles.some(r => manager.hasRole(r))).map(option => {
+ return {
+ text: option.text,
+ value: option.value ? option.value : "",
+ icon: option.icon,
+ href: option.href
+ };
+ });
+}
+
+function getRealmMenu(callback: (language: string) => void): TemplateResult {
+ if (!manager.isSuperUser()) {
+ return html``;
+ }
+
+ const picker = manager.rest.api.TenantResource.getAll().then((response) => {
+
+ const menuItems = response.data.map((r) => {
+ return {
+ text: r.displayName!,
+ value: r.realm!
+ } as MenuItem;
+ });
+
+ return html`
+ ${getContentWithMenuTemplate(
+ html`
+ <div id="realm-picker">
+ <span style="margin-left: 10px;">${manager.displayRealm}</span>
+ <or-icon icon="chevron-down"></or-icon>
+ </div>
+ `,
+ menuItems,
+ manager.displayRealm,
+ (values: string | string[]) => callback(values as string))}
+ `;
+ });
+
+ return html`${until(picker, html``)}`;
+}
+
+@customElement("or-header")
+class OrHeader extends LitElement {
+
+ @property({type: Boolean})
+ private _drawerOpened = false;
+
+ @property({type: String})
+ public logo?: string;
+
+ @property({ type: String })
+ public logoMobile? : string;
+
+ @property({ type: Object })
+ public config?: HeaderConfig;
+
+ @property({ type: String })
+ private activeMenu: string | undefined = window.location.hash ? window.location.hash : "#!map";
+
+ @query("div[id=mobile-bottom]")
+ protected _mobileBottomDiv!: HTMLDivElement;
+
+ protected _realmPicker?: TemplateResult;
+ protected _hashCallback = (e: Event) => {
+ this._onHashChanged(e);
+ };
+
+ // language=CSS
+ static get styles() {
+ return css`
+
+ :host {
+ --internal-or-header-color: var(--or-header-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));
+ --internal-or-header-selected-color: var(--or-header-selected-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
+ --internal-or-header-text-color: var(--or-header-text-color, var(--or-app-color3, inherit));
+ --internal-or-header-height: var(--or-header-height, ${unsafeCSS(DefaultHeaderHeight)});
+ --internal-or-header-logo-margin: var(--or-header-logo-margin, 0 40px 0 0);
+ --internal-or-header-logo-height: var(--or-header-logo-height, var(--internal-or-header-height, ${unsafeCSS(DefaultHeaderHeight)}));
+ --internal-or-header-item-size: var(--or-header-item-size, calc(${unsafeCSS(DefaultHeaderHeight)} - 20px));
+ --internal-or-header-drawer-color: var(--or-header-drawer-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));
+ --internal-or-header-drawer-text-color: var(--or-header-drawer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));
+ --internal-or-header-drawer-item-size: var(--or-header-drawer-item-size, 30px);
+ --internal-or-header-drawer-separator-color: var(--or-header-drawer-separator-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
+
+ display: block;
+ }
+
+ #toolbar-top {
+ display: flex;
+ padding: 0;
+ }
+
+ #logo-mobile {
+ margin: 8px;
+ height: calc(var(--internal-or-header-logo-height) - 16px);
+ display: block;
+ }
+
+ #logo {
+ display: none;
+ }
+
+ #header {
+ opacity: 1;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: var(--internal-or-header-height);
+ text-align: center;
+ background-color: var(--internal-or-header-color);
+ color: var(--internal-or-header-text-color);
+ --or-icon-fill: var(--internal-or-header-text-color);
+ --or-icon-height: calc(var(--internal-or-header-item-size) - 12px);
+ --or-icon-width: calc(var(--internal-or-header-item-size) - 12px);
+ z-index: 9999999;
+ }
+
+ .shadow {
+ -webkit-box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};
+ -moz-box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};
+ box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};
+ }
+
+ #drawer {
+ z-index: 999999;
+ position: absolute;
+ top: var(--internal-or-header-height);
+ width: 100%;
+ height: calc(100% - var(--internal-or-header-height));
+ transition: all 300ms ease-in;
+ transition-property: -webkit-transform;
+ transition-property: transform;
+ -webkit-transform: translate3d(0, -100%, 0);
+ transform: translate3d(0, -100%, 0);
+ background: var(--internal-or-header-drawer-color);
+ color: var(--internal-or-header-drawer-text-color);
+ --or-icon-fill: var(--internal-or-header-drawer-text-color);
+ --or-icon-height: calc(var(--internal-or-header-drawer-item-size) - 10px);
+ --or-icon-width: calc(var(--internal-or-header-drawer-item-size) - 10px);
+ }
+
+ #drawer[opened] {
+ -webkit-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+ }
+
+ #drawer > div {
+ box-sizing: border-box;
+ width: 100%;
+ height: 100%;
+ padding: 6px 24px;
+ position: relative;
+ }
+
+ .menu-btn {
+ background: none;
+ border: none;
+ cursor: pointer;
+ padding: 0 6px;
+ height: 100%;
+ }
+
+ #menu-btn-mobile {
+ margin-left: auto;
+ }
+
+ #menu-btn-desktop {
+ display: none;
+ }
+
+ #desktop-right {
+ margin-left: auto;
+ padding-right: 10px;
+ display: none;
+ }
+
+ #mobile-bottom {
+ border-top: 1px solid var(--internal-or-header-drawer-separator-color);
+ margin-top: 20px;
+ padding-top: 10px;
+ }
+
+ .menu-item {
+ opacity: 0.7;
+ cursor: pointer;
+ text-decoration: none !important;
+ color: inherit;
+ padding: 0 20px;
+ font-size: 14px;
+ }
+
+ .menu-item:hover,
+ .menu-item[selected] {
+ opacity: 1;
+ }
+
+ #desktop-left .menu-item {
+ display: none;
+ line-height: calc(var(--internal-or-header-height) - 4px);
+ }
+
+ #desktop-right .menu-item {
+ line-height: var(--internal-or-header-height);
+ }
+
+ #drawer .menu-item {
+ display: block;
+ line-height: var(--internal-or-header-drawer-item-size);
+ margin: 10px 0;
+ }
+
+ #desktop-left .menu-item[selected] {
+ display: inline-block;
+ line-height: var(--internal-or-header-height);
+ }
+
+ or-mwc-menu {
+ margin-right: 10px;
+ display: block;
+ }
+
+ .or-language-container {
+ display: flex;
+ height: 50px;
+ align-items: center;
+ }
+
+ #realm-picker {
+ position: relative;
+ display: flex;
+ height: 50px;
+ align-items: center;
+ }
+
+ /* Wide layout: when the viewport width is bigger than 780px, layout
+ changes to a wide layout. */
+
+
+ @media (min-width: 780px) {
+ #menu-btn-desktop {
+ display: block;
+ }
+
+ #menu-btn-mobile {
+ display: none;
+ }
+
+ #drawer {
+ display: none;
+ }
+
+ #desktop-right {
+ display: flex;
+ }
+
+ #desktop-left .menu-item {
+ display: inline-block;
+ }
+
+ #desktop-left .menu-item or-icon{
+ display: none;
+ }
+
+ #desktop-left .menu-item[selected] {
+ border-bottom: 4px solid var(--internal-or-header-selected-color);
+ line-height: calc(var(--internal-or-header-height) - 4px);
+ }
+ }
+
+ @media (min-width: 1024px) {
+ #logo {
+ margin: var(--internal-or-header-logo-margin);
+ height: var(--internal-or-header-logo-height);
+ display: block;
+ }
+
+ #logo-mobile {
+ display: none;
+ }
+
+ #desktop-left .menu-item or-icon{
+ display: inline-block;
+ }
+ }
+ `;
+ }
+
+ connectedCallback(): void {
+ super.connectedCallback();
+ window.addEventListener("hashchange", this._hashCallback, false);
+ }
+
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ window.removeEventListener("hashchange", this._hashCallback);
+ }
+
+ _onHashChanged(e: Event) {
+ const menu = window.location.hash.split('/')[0];
+ this.activeMenu = menu;
+ }
+
+ protected render() {
+
+ if (!this._realmPicker) {
+ this._realmPicker = getRealmMenu((value: string) => this._onRealmSelect(value));
+ }
+
+ const mainItems = this.config ? this.config.mainMenu : undefined;
+ const secondaryItems = this.config ? this.config.secondaryMenu : undefined;
+
+ return html`
+ <!-- Header -->
+ <div id="header" class="shadow">
+ <div id="toolbar-top">
+ <div><img id="logo" src="${this.logo}" /><img id="logo-mobile" src="${this.logoMobile}" /></div>
+
+ <!-- This gets hidden on a small screen-->
+ <nav id="toolbar-list">
+ <div id="desktop-left">
+ ${mainItems ? mainItems.filter(option => !option.roles || option.roles.some(r => manager.hasRole(r))).map(headerItem => {
+ return html`
+ <a class="menu-item" href="${headerItem.href}" @click="${(e: MouseEvent) => this._onHeaderItemSelect(headerItem)}" ?selected="${this.activeMenu === headerItem.href}"><or-icon icon="${headerItem.icon}"></or-icon><or-translate value="${headerItem.text}"></or-translate></a>
+ `
+ }) : ``}
+ </div>
+ </nav>
+ <div id="desktop-right">
+ ${this._realmPicker}
+ ${secondaryItems ? getContentWithMenuTemplate(html`
+ <button id="menu-btn-desktop" class="menu-btn" title="Menu"><or-icon icon="dots-vertical"></or-icon></button>
+ `,
+ getHeaderMenuItems(secondaryItems),
+ undefined,
+ (values: string | string[]) => this._onSecondaryMenuSelect(values as string)) : ``}
+ </div>
+ <div id="menu-btn-mobile">
+ <button id="menu-btn" class="menu-btn" title="Menu" @click="${this._toggleDrawer}"><or-icon icon="${this._drawerOpened ? "close" : "menu"}"></or-icon></button>
+ </div>
+ </div>
+ </div>
+ <div id="drawer" ?opened="${this._drawerOpened}" @click="${this._closeDrawer}">
+ <div>
+ <div id="mobile-top">
+ <nav id="drawer-list">
+ ${mainItems ? mainItems.filter(option => !option.hideMobile && (!option.roles || option.roles.some(r => manager.hasRole(r)))).map(headerItem => {
+ return html`
+ <a class="menu-item" href="${headerItem.href}" @click="${(e: MouseEvent) => this._onHeaderItemSelect(headerItem)}" ?selected="${this.activeMenu === headerItem.href}"><or-icon icon="${headerItem.icon}"></or-icon><or-translate value="${headerItem.text}"></or-translate></a>
+ `
+ }) : ``}
+ </nav>
+ </div>
+
+ ${secondaryItems ? html`
+ <div id="mobile-bottom">
+ ${secondaryItems.filter(option => !option.hideMobile && (!option.roles || option.roles.some(r => manager.hasRole(r)))).map(headerItem => {
+ return html`
+ <a class="menu-item" href="${headerItem.href}" @click="${(e: MouseEvent) => this._onHeaderItemSelect(headerItem)}" ?selected="${this.activeMenu === headerItem.href}"><or-icon icon="${headerItem.icon}"></or-icon><or-translate value="${headerItem.text}"></or-translate></a>
+ `
+ })}
+ </div>` : ``}
+ </div>
+ </div>
+ `;
+ }
+
+ protected _onSecondaryMenuSelect(value: string) {
+ const headerItem = this.config!.secondaryMenu!.find((item) => item.value === value);
+ if (headerItem) {
+ this._onHeaderItemSelect(headerItem);
+ }
+ }
+
+ protected _onHeaderItemSelect(headerItem: HeaderItem) {
+ if (headerItem.action) {
+ headerItem.action();
+ } else if (headerItem.href) {
+ window.location.href = headerItem.href;
+ }
+ }
+
+ protected _onRealmSelect(realm: string) {
+ manager.displayRealm = realm;
+ this.requestUpdate();
+ }
+
+ protected _closeDrawer() {
+ this._drawerOpened = false;
+ }
+
+ protected _toggleDrawer() {
+ this._drawerOpened = !this._drawerOpened;
+ }
+}
diff --git a/ui/app/main/src/components/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.ts
similarity index 92%
rename from ui/app/main/src/components/pages/page-assets.ts
rename to ui/app/or-app/src/pages/page-assets.ts
index 7d8f22c71..88eed904f 100644
--- a/ui/app/main/src/components/pages/page-assets.ts
+++ b/ui/app/or-app/src/pages/page-assets.ts
@@ -1,51 +1,24 @@
-import {customElement, html, LitElement, property, TemplateResult, css, unsafeCSS} from "lit-element";
-import {store} from "../../store";
-import {connect} from "pwa-helpers/connect-mixin";
+import {customElement, html, property, TemplateResult, css, unsafeCSS} from "lit-element";
import "@openremote/or-asset-tree";
import "@openremote/or-asset-viewer";
import {ViewerConfig} from "@openremote/or-asset-viewer";
import {OrAssetTreeSelectionChangedEvent} from "@openremote/or-asset-tree";
import {DefaultBoxShadow} from "@openremote/core";
import moment from "moment";
-import {router} from "../../index";
+import {AppStateKeyed, Page, router} from "../index";
+import {EnhancedStore} from "@reduxjs/toolkit";
-// language=CSS
-const style = css`
-
- or-asset-tree {
- align-items: stretch;
- z-index: 1;
- }
-
- .hideMobile {
- display: none;
- }
-
- or-asset-viewer {
- align-items: stretch;
- z-index: 0;
- }
-
- @media only screen and (min-width: 768px){
- or-asset-tree {
- width: 300px;
- min-width: 300px;
- box-shadow: ${unsafeCSS(DefaultBoxShadow)}
- }
-
- .hideMobile {
- display: flex;
- }
-
- or-asset-viewer,
- or-asset-viewer.hideMobile {
- display: initial;
+export function pageAssetsProvider<S extends AppStateKeyed>(store: EnhancedStore<S>) {
+ return {
+ routes: [
+ "assets",
+ "assets/:id"
+ ],
+ pageCreator: () => {
+ return new PageAssets(store);
}
-
-
-
- }
-`;
+ };
+}
const viewerConfig: ViewerConfig = {
historyConfig: {
@@ -433,15 +406,52 @@ const viewerConfig: ViewerConfig = {
};
@customElement("page-assets")
-class PageAssets extends connect(store)(LitElement) {
+class PageAssets<S extends AppStateKeyed> extends Page<S> {
static get styles() {
- return style;
+ // language=CSS
+ return css`
+
+ or-asset-tree {
+ align-items: stretch;
+ z-index: 1;
+ }
+
+ .hideMobile {
+ display: none;
+ }
+
+ or-asset-viewer {
+ align-items: stretch;
+ z-index: 0;
+ }
+
+ @media only screen and (min-width: 768px){
+ or-asset-tree {
+ width: 300px;
+ min-width: 300px;
+ box-shadow: ${unsafeCSS(DefaultBoxShadow)}
+ }
+
+ .hideMobile {
+ display: flex;
+ }
+
+ or-asset-viewer,
+ or-asset-viewer.hideMobile {
+ display: initial;
+ }
+ }
+ `;
}
@property()
protected _assetId;
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ }
+
firstUpdated() {
this.shadowRoot.getElementById('pageAssetTree').addEventListener(OrAssetTreeSelectionChangedEvent.NAME, (evt) => this._onTreeSelectionChanged(evt));
}
diff --git a/ui/app/main/src/components/or-gateway-connection-panel/src/index.ts b/ui/app/or-app/src/pages/page-gateway.ts
similarity index 85%
rename from ui/app/main/src/components/or-gateway-connection-panel/src/index.ts
rename to ui/app/or-app/src/pages/page-gateway.ts
index 821776dcb..e32c71f4d 100644
--- a/ui/app/main/src/components/or-gateway-connection-panel/src/index.ts
+++ b/ui/app/or-app/src/pages/page-gateway.ts
@@ -1,28 +1,51 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";
+import {css, customElement, html, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";
import i18next from "i18next";
-import "@openremote/or-log-viewer";
import "@openremote/or-panel";
-import {GatewayConnection, GatewayConnectionStatusEvent, ConnectionStatus} from "@openremote/model";
-import { translate } from "@openremote/or-translate";
-import manager, { DefaultColor1 } from "@openremote/core";
-import { InputType, OrInputChangedEvent } from "@openremote/or-input";
+import {ConnectionStatus, GatewayConnection, GatewayConnectionStatusEvent} from "@openremote/model";
+import manager, {DefaultColor1} from "@openremote/core";
+import {InputType, OrInputChangedEvent} from "@openremote/or-input";
+import {AppStateKeyed, Page} from "../index";
+import {EnhancedStore} from "@reduxjs/toolkit";
+
+export function pageGatewayProvider<S extends AppStateKeyed>(store: EnhancedStore<S>) {
+ return {
+ routes: [
+ "gateway"
+ ],
+ pageCreator: () => {
+ return new PageGateway(store);
+ }
+ };
+}
-@customElement("or-gateway-connection-panel")
-export class OrGatewayConnectionPanel extends translate(i18next)(LitElement) {
+@customElement("page-gateway")
+class PageGateway<S extends AppStateKeyed> extends Page<S> {
- // language=CSS
static get styles() {
+ // language=CSS
return css`
:host {
flex: 1;
width: 100%;
+
+ display: flex;
+ justify-content: center;
+
--or-panel-heading-margin: 0 0 5px 10px;
--or-panel-background-color: var(--or-app-color1, ${unsafeCSS(DefaultColor1)});
- --or-panel-heading-font-size: large;
+ --or-panel-heading-font-size: large;
+ }
+
+ @media only screen and (max-width: 1080px){
+ or-panel {
+ margin: 0;
+ }
}
or-panel {
position: relative;
+ max-width: 1000px;
+ margin-top: 40px;
}
#status {
@@ -49,8 +72,7 @@ export class OrGatewayConnectionPanel extends translate(i18next)(LitElement) {
}
#buttons > or-input {
- margin: 10px;
-
+ margin: 10px;
}
`;
}
@@ -73,6 +95,10 @@ export class OrGatewayConnectionPanel extends translate(i18next)(LitElement) {
protected _readonly = false;
protected _eventSubscriptionId?: string;
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ }
+
connectedCallback() {
super.connectedCallback();
this._readonly = !manager.hasRole("write:admin");
@@ -127,6 +153,9 @@ export class OrGatewayConnectionPanel extends translate(i18next)(LitElement) {
`;
}
+ public stateChanged(state: S) {
+ }
+
protected async _subscribeEvents() {
if (manager.events) {
this._eventSubscriptionId = await manager.events.subscribe<GatewayConnectionStatusEvent>({
diff --git a/ui/app/or-app/src/pages/page-insights.ts b/ui/app/or-app/src/pages/page-insights.ts
new file mode 100644
index 000000000..6739aee4c
--- /dev/null
+++ b/ui/app/or-app/src/pages/page-insights.ts
@@ -0,0 +1,91 @@
+import {css, customElement, html, property, TemplateResult, unsafeCSS} from "lit-element";
+import "@openremote/or-data-viewer";
+import {DataViewerConfig} from "@openremote/or-data-viewer";
+import {DefaultBoxShadow} from "@openremote/core";
+import {AppStateKeyed, Page} from "../index";
+import {EnhancedStore} from "@reduxjs/toolkit";
+
+export function pageInsightsProvider<S extends AppStateKeyed>(store: EnhancedStore<S>) {
+ return {
+ routes: [
+ "insights",
+ "insights/:id"
+ ],
+ pageCreator: () => {
+ return new PageInsights(store);
+ }
+ };
+}
+
+const viewerConfig: DataViewerConfig = {
+ panels: {
+ "chart": {
+ type: "chart",
+ hideOnMobile: true,
+ panelStyles: {
+ gridColumn: "1 / -1",
+ gridRowStart: "1"
+ },
+ defaults: [{
+ assetId:"5442Ite2XVp3Ky9X2y647a",
+ attributes: ["UVIndex"]
+ }]
+ }
+ }
+};
+
+@customElement("page-insights")
+class PageInsights<S extends AppStateKeyed> extends Page<S> {
+
+ static get styles() {
+ // language=CSS
+ return css`
+ or-asset-tree {
+ align-items: stretch;
+ z-index: 1;
+ }
+
+ .hideMobile {
+ display: none;
+ }
+
+ or-asset-viewer {
+ align-items: stretch;
+ z-index: 0;
+ }
+
+ @media only screen and (min-width: 768px){
+ or-asset-tree {
+ width: 300px;
+ min-width: 300px;
+ box-shadow: ${unsafeCSS(DefaultBoxShadow)}
+ }
+
+ .hideMobile {
+ display: flex;
+ }
+
+ or-asset-viewer,
+ or-asset-viewer.hideMobile {
+ display: initial;
+ }
+ }
+ `;
+ }
+
+ @property()
+ protected _assetId;
+
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ }
+
+ protected render(): TemplateResult | void {
+ return html`
+ <or-data-viewer .config="${viewerConfig}"></or-data-viewer>
+ `;
+ }
+
+ public stateChanged(state: S) {
+ }
+}
diff --git a/ui/app/or-app/src/pages/page-logs.ts b/ui/app/or-app/src/pages/page-logs.ts
new file mode 100644
index 000000000..9ddc33cf7
--- /dev/null
+++ b/ui/app/or-app/src/pages/page-logs.ts
@@ -0,0 +1,50 @@
+import {css, customElement, html} from "lit-element";
+import "@openremote/or-log-viewer";
+import {ViewerConfig} from "@openremote/or-log-viewer";
+import {AppStateKeyed, Page} from "../index";
+import {EnhancedStore} from "@reduxjs/toolkit";
+
+export function pageLogsProvider<S extends AppStateKeyed>(store: EnhancedStore<S>) {
+ return {
+ routes: [
+ "logs"
+ ],
+ pageCreator: () => {
+ return new PageLogs(store);
+ }
+ };
+}
+
+@customElement("page-logs")
+class PageLogs<S extends AppStateKeyed> extends Page<S> {
+
+ static get styles() {
+ // language=CSS
+ return css`
+ :host {
+ flex: 1;
+ width: 100%;
+ }
+
+ or-log-viewer {
+ width: 100%;
+ }
+ `;
+ }
+
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ }
+
+ public stateChanged(state: S) {
+ }
+
+ protected config: ViewerConfig = {
+ };
+
+ protected render() {
+ return html`
+ <or-log-viewer .config="${this.config}"></or-log-viewer>
+ `;
+ }
+}
diff --git a/ui/app/or-app/src/pages/page-map.ts b/ui/app/or-app/src/pages/page-map.ts
new file mode 100644
index 000000000..b5c59ac57
--- /dev/null
+++ b/ui/app/or-app/src/pages/page-map.ts
@@ -0,0 +1,273 @@
+import {customElement, html, property, query, css} from "lit-element";
+import {Action, createSlice, EnhancedStore, PayloadAction, ThunkAction} from "@reduxjs/toolkit";
+import "@openremote/or-map";
+import "@openremote/or-map/dist/or-map-asset-card";
+import {ViewerConfig} from "@openremote/or-map/dist/or-map-asset-card";
+
+import manager, {Util} from "@openremote/core";
+import {OrMap, OrMapClickedEvent, OrMapMarkerAsset, OrMapMarkerClickedEvent} from "@openremote/or-map";
+import {createSelector} from "reselect";
+import {Asset, AssetEvent, AssetEventCause, AttributeEvent, AttributeType, MetaItemType} from "@openremote/model";
+import {Page, router} from "../index";
+import {AppStateKeyed} from "../app";
+
+export interface MapState {
+ assets: Asset[];
+ currentAssetId: string;
+ assetSubscriptionId: string;
+ attributeSubscriptionId: string;
+}
+
+export interface MapStateKeyed extends AppStateKeyed {
+ map: MapState;
+}
+
+const INITIAL_STATE: MapState = {
+ assets: [],
+ currentAssetId: undefined,
+ assetSubscriptionId: undefined,
+ attributeSubscriptionId: undefined
+};
+
+const pageMapSlice = createSlice({
+ name: "pageMap",
+ initialState: INITIAL_STATE,
+ reducers: {
+ assetEventReceived(state: MapState, action: PayloadAction<AssetEvent>) {
+ let assets = state.assets.filter((asst) => asst.id !== action.payload.asset.id);
+ if (action.payload.cause !== AssetEventCause.DELETE) {
+ assets.push(action.payload.asset);
+ }
+ return {
+ ...state,
+ assets: assets
+ };
+ },
+ attributeEventReceived(state: MapState, action: PayloadAction<AttributeEvent>) {
+ let assets = state.assets;
+ const assetId = action.payload.attributeState.attributeRef.entityId;
+ const index = assets.findIndex((asst) => asst.id === assetId);
+ let asset = index >= 0 ? assets[index] : null;
+
+ if (!asset) {
+ return state;
+ }
+
+ asset = Util.updateAsset(asset, action.payload);
+
+ return {
+ ...state,
+ assets: [
+ ...assets.slice(0, index),
+ asset,
+ ...assets.slice(index + 1)
+ ]
+ };
+ },
+ setAssetSubscriptionId(state, action: PayloadAction<string>) {
+ return {
+ ...state,
+ assetSubscriptionId: action.payload
+ };
+ },
+ setAttributeSubscriptionId(state, action: PayloadAction<string>) {
+ return {
+ ...state,
+ attributeSubscriptionId: action.payload
+ };
+ }
+ }
+});
+
+const {assetEventReceived, attributeEventReceived, setAssetSubscriptionId, setAttributeSubscriptionId} = pageMapSlice.actions;
+export const pageMapReducer = pageMapSlice.reducer;
+
+export function pageMapProvider<S extends MapStateKeyed>(store: EnhancedStore<S>) {
+ return {
+ routes: [
+ "map",
+ "map/:id"
+ ],
+ pageCreator: () => {
+ return new PageMap(store);
+ }
+ };
+}
+
+const subscribeAssets = (): ThunkAction<void, MapStateKeyed, unknown, Action<string>> => async (dispatch) => {
+
+ try {
+ const result = await manager.rest.api.AssetResource.queryAssets({
+ select: {
+ excludeAttributes: true,
+ excludeParentInfo: true,
+ excludePath: true
+ }
+ });
+
+ if (result.data) {
+ const ids = result.data.map(
+ asset => asset.id
+ );
+
+ await manager.events.subscribeAssetEvents(ids, true, (event) => {
+ dispatch(assetEventReceived(event));
+ });
+
+ await manager.events.subscribeAttributeEvents(ids, false, (event) => {
+ dispatch(attributeEventReceived(event));
+ });
+ }
+
+ } catch (e) {
+ console.error("Failed to subscribe to assets", e)
+ }
+};
+
+const unsubscribeAssets = (): ThunkAction<void, MapStateKeyed, unknown, Action<string>> => (dispatch, getState) => {
+ if (getState().map.assetSubscriptionId) {
+ manager.events.unsubscribe(getState().map.assetSubscriptionId);
+ dispatch(setAssetSubscriptionId(null));
+ }
+ if (getState().map.attributeSubscriptionId) {
+ manager.events.unsubscribe(getState().map.attributeSubscriptionId);
+ dispatch(setAttributeSubscriptionId(null));
+ }
+};
+
+const mapCardConfig: ViewerConfig = {
+ default: {
+ exclude: ["userNotes"]
+ },
+ assetTypes: {
+ "urn:openremote:asset:iems:weather": {
+ exclude: ["location"]
+ }
+ }
+};
+
+@customElement("page-map")
+export class PageMap<S extends MapStateKeyed> extends Page<S> {
+
+ static get styles() {
+ // language=CSS
+ return css`
+ or-map-asset-card {
+ height: 166px;
+ position: absolute;
+ bottom: 0px;
+ right: 0px;
+ width: calc(100vw - 10px);
+ margin: 5px;
+ z-index: 99;
+ }
+
+ or-map {
+ display: block;
+ height: 100%;
+ width: 100%;
+ }
+
+ @media only screen and (min-width: 415px){
+ or-map-asset-card {
+ position: absolute;
+ top: 20px;
+ right: 20px;
+ width: 320px;
+ margin: 0;
+ height: 400px; /* fallback for IE */
+ height: max-content;
+ max-height: calc(100vh - 150px);
+ }
+ }
+ `;
+ }
+
+ @query("#map")
+ protected _map?: OrMap;
+
+ @property()
+ protected _assets: Asset[] = [];
+
+ @property()
+ protected _currentAsset?: Asset;
+
+ protected _assetSelector = (state: S) => state.map.assets;
+ protected _paramsSelector = (state: S) => state.app.params;
+
+ protected _getMapAssets = createSelector(
+ [this._assetSelector],
+ (assets) => {
+ return assets;
+ });
+
+ protected _getCurrentAsset = createSelector(
+ [this._assetSelector, this._paramsSelector],
+ (assets, params) => {
+ const currentId = params ? params.id : undefined;
+
+ if (!currentId) {
+ return null;
+ }
+
+ return assets.find((asset) => asset.id === currentId);
+ });
+
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ }
+
+ protected render() {
+
+ return html`
+
+ ${this._currentAsset ? html `<or-map-asset-card .config="${mapCardConfig}" .asset="${this._currentAsset}"></or-map-asset-card>` : ``}
+
+ <or-map id="map" class="or-map">
+ ${
+ this._assets.filter((asset) => {
+ const attr = Util.getAssetAttribute(asset, AttributeType.LOCATION.attributeName!);
+ const showOnMapMeta = Util.getFirstMetaItem(attr, MetaItemType.SHOW_ON_DASHBOARD.urn!);
+ return showOnMapMeta && showOnMapMeta.value;
+ }).map((asset) => {
+ return html`
+ <or-map-marker-asset ?active="${this._currentAsset && this._currentAsset.id === asset.id}" .asset="${asset}"></or-map-marker-asset>
+ `;
+ })
+ }
+ </or-map>
+ `;
+ }
+
+ public connectedCallback() {
+ super.connectedCallback();
+ this.addEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);
+ this.addEventListener(OrMapClickedEvent.NAME, this.onMapClick);
+ this._store.dispatch(subscribeAssets());
+ }
+
+ public disconnectedCallback() {
+ super.disconnectedCallback();
+ this.removeEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);
+ this.removeEventListener(OrMapClickedEvent.NAME, this.onMapClick);
+ this._store.dispatch(unsubscribeAssets());
+ }
+
+ stateChanged(state: S) {
+ this._assets = this._getMapAssets(state);
+ this._currentAsset = this._getCurrentAsset(state);
+ }
+
+ protected onMapMarkerClick(e: OrMapMarkerClickedEvent) {
+ const asset = (e.detail.marker as OrMapMarkerAsset).asset;
+ router.navigate("map/" + asset.id);
+ }
+
+ protected onMapClick(e: OrMapClickedEvent) {
+ router.navigate('map');
+ }
+
+ protected getCurrentAsset() {
+ this._getCurrentAsset(this._store.getState());
+ }
+}
diff --git a/ui/app/main/src/components/pages/page-rules.ts b/ui/app/or-app/src/pages/page-rules.ts
similarity index 56%
rename from ui/app/main/src/components/pages/page-rules.ts
rename to ui/app/or-app/src/pages/page-rules.ts
index 72725513b..ee62077e6 100644
--- a/ui/app/main/src/components/pages/page-rules.ts
+++ b/ui/app/or-app/src/pages/page-rules.ts
@@ -1,9 +1,21 @@
-import {css, customElement, html, LitElement} from "lit-element";
-import {store} from "../../store";
-import {connect} from "pwa-helpers/connect-mixin";
+import {css, customElement, html} from "lit-element";
import "@openremote/or-rules";
import {RulesConfig} from "@openremote/or-rules";
-import {AssetType, AttributeType, RulesetLang} from "@openremote/model";
+import {AssetType, RulesetLang} from "@openremote/model";
+import {AppStateKeyed, Page} from "../index";
+import {EnhancedStore} from "@reduxjs/toolkit";
+
+export function pageRulesProvider<S extends AppStateKeyed>(store: EnhancedStore<S>) {
+ return {
+ routes: [
+ "rules",
+ "rules/:id"
+ ],
+ pageCreator: () => {
+ return new PageRules(store);
+ }
+ };
+}
const rulesConfig: RulesConfig = {
controls: {
@@ -26,9 +38,10 @@ const rulesConfig: RulesConfig = {
};
@customElement("page-rules")
-class PageRules extends connect(store)(LitElement) {
+class PageRules<S extends AppStateKeyed> extends Page<S> {
static get styles() {
+ // language=CSS
return css`
:host {
@@ -41,9 +54,16 @@ class PageRules extends connect(store)(LitElement) {
`;
}
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ }
+
protected render() {
return html`
<or-rules .config="${rulesConfig}"></or-rules>
`;
}
+
+ public stateChanged(state: S) {
+ }
}
diff --git a/ui/app/or-app/tsconfig.json b/ui/app/or-app/tsconfig.json
new file mode 100644
index 000000000..fcba31fc8
--- /dev/null
+++ b/ui/app/or-app/tsconfig.json
@@ -0,0 +1,27 @@
+{
+ "extends": "../../tsconfig",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "tsBuildInfoFile": "./dist/.tsbuildinfo",
+ "rootDir": "src",
+ "strict": false
+ },
+ "include": [
+ "./src",
+ "../../component/or-map/@types"
+ ],
+ "references": [
+ { "path": "../../component/core" },
+ { "path": "../../component/or-icon" },
+ { "path": "../../component/or-input" },
+ { "path": "../../component/or-map" },
+ { "path": "../../component/or-asset-tree" },
+ { "path": "../../component/or-data-viewer" },
+ { "path": "../../component/or-log-viewer" },
+ { "path": "../../component/or-attribute-input" },
+ { "path": "../../component/or-chart" },
+ { "path": "../../component/or-asset-viewer" },
+ { "path": "../../component/or-rules" },
+ { "path": "../../component/or-table" }
+ ]
+}
\ No newline at end of file
diff --git a/ui/app/or-app/typedoc.js b/ui/app/or-app/typedoc.js
new file mode 100644
index 000000000..7268c271b
--- /dev/null
+++ b/ui/app/or-app/typedoc.js
@@ -0,0 +1,3 @@
+module.exports = {
+ ... require('../../typedoc.js')
+};
\ No newline at end of file
diff --git a/ui/app/or-app/webpack.config.js b/ui/app/or-app/webpack.config.js
new file mode 100644
index 000000000..38892358d
--- /dev/null
+++ b/ui/app/or-app/webpack.config.js
@@ -0,0 +1,7 @@
+const util = require("../webpack.util");
+
+bundles = {
+ "index.orbundle": undefined
+};
+
+module.exports = util.generateExports(__dirname);
\ No newline at end of file
diff --git a/ui/component/core/package.json b/ui/component/core/package.json
index 940ba7fd1..a031044ff 100644
--- a/ui/component/core/package.json
+++ b/ui/component/core/package.json
@@ -23,7 +23,8 @@
"i18next-sprintf-postprocessor": "0.2.2",
"moment": "^2.24.0",
"platform": "^1.3.5",
- "url-search-params-polyfill": "^5.0.0"
+ "url-search-params-polyfill": "^5.0.0",
+ "qs": "^6.8.0"
},
"devDependencies": {
"@mdi/svg": ">=4.5.95",
@@ -32,6 +33,7 @@
"webpack": "^4.41.2",
"webpack-cli": "^3.3.9",
"xmldom": "^0.1.27",
- "xpath": "^0.0.27"
+ "xpath": "^0.0.27",
+ "@types/qs": "^6.5.3"
}
}
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 5814d0aae..12c59d3ff 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -15,7 +15,6 @@ import {
} from "@openremote/model";
import * as Util from "./util";
import orIconSet from "./or-icon-set";
-import {TemplateResult} from "lit-element";
// Re-exports
export {Util};
@@ -48,12 +47,12 @@ export declare type Keycloak = {
}
export enum ORError {
- NONE = "NONE",
MANAGER_FAILED_TO_LOAD = "MANAGER_FAILED_TO_LOAD",
KEYCLOAK_FAILED_TO_LOAD = "KEYCLOAK_FAILED_TO_LOAD",
AUTH_TYPE_UNSUPPORTED = "AUTH_TYPE_UNSUPPORTED",
CONSOLE_ERROR = "CONSOLE_INIT_ERROR",
- EVENTS_CONNECTION_ERROR = "EVENTS_CONNECTION_ERROR"
+ EVENTS_CONNECTION_ERROR = "EVENTS_CONNECTION_ERROR",
+ TRANSLATION_ERROR = "TRANSLATION_ERROR"
}
export enum Auth {
@@ -90,17 +89,6 @@ export interface LoginOptions {
credentials?: Credentials;
}
-export interface RealmConfig {
- appTitle?: string;
- colors?: TemplateResult;
- logo?: HTMLTemplateElement | string;
- logoMobile?: HTMLTemplateElement | string;
- language?: string;
-}
-export interface RealmConfigs {
- [key: string]: RealmConfig
-}
-
export interface ManagerConfig {
managerUrl: string;
keycloakUrl?: string;
@@ -117,7 +105,6 @@ export interface ManagerConfig {
loadDescriptors?: boolean;
loadTranslations?: string[];
translationsLoadPath?: string;
- realmConfigs?: RealmConfigs;
configureTranslationsOptions?: (i18next: i18next.InitOptions) => void;
}
@@ -363,10 +350,6 @@ export class Manager implements EventProviderFactory {
return this._authenticated;
}
- get initialised() {
- return this._config != null;
- }
-
get ready() {
return this._ready;
}
@@ -398,7 +381,7 @@ export class Manager implements EventProviderFactory {
}
get isError() {
- return this._error != null && this._error !== ORError.NONE;
+ return !!this._error;
}
get connectionStatus() {
@@ -501,7 +484,7 @@ export class Manager implements EventProviderFactory {
return normalisedConfig;
}
- private _error: ORError = ORError.NONE;
+ private _error?: ORError;
private _config!: ManagerConfig;
private _authenticated: boolean = false;
private _ready: boolean = false;
@@ -516,7 +499,7 @@ export class Manager implements EventProviderFactory {
private _displayRealm?: string = "";
public isManagerSameOrigin(): boolean {
- if (!this.initialised) {
+ if (!this.ready) {
return false;
}
@@ -668,6 +651,7 @@ export class Manager implements EventProviderFactory {
await i18next.use(sprintf).use(i18nextXhr).init(initOptions);
} catch (e) {
console.error(e);
+ this._setError(ORError.TRANSLATION_ERROR);
return false;
}
@@ -804,7 +788,7 @@ export class Manager implements EventProviderFactory {
}
public login(options?: LoginOptions) {
- if (!this.initialised) {
+ if (!this.ready) {
return;
}
switch (this._config.auth) {
diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.ts
index bc602b348..3decc3da4 100644
--- a/ui/component/core/src/util.ts
+++ b/ui/component/core/src/util.ts
@@ -13,11 +13,10 @@ import {
AssetAttribute,
AttributeDescriptor,
MetaItemType,
- MetaItemDescriptor,
- AttributeValueType
+ MetaItemDescriptor
} from "@openremote/model";
-import {AssetModelUtil} from "./index";
import i18next from "i18next";
+import Qs from "qs";
export class Deferred<T> {
@@ -51,6 +50,16 @@ export interface GeoNotification {
notification?: PushNotificationMessage;
}
+export function getQueryParameters(queryStr: string): any {
+ const parsed = Qs.parse(queryStr, {ignoreQueryPrefix: true});
+ return parsed;
+}
+
+export function getQueryParameter(queryStr: string, parameter: string): any | undefined {
+ const parsed = getQueryParameters(queryStr);
+ return parsed ? parsed[parameter] : undefined;
+}
+
export function getGeoNotificationsFromRulesSet(rulesetDefinition: JsonRulesetDefinition): GeoNotification[] {
const geoNotifications: GeoNotification[] = [];
@@ -203,18 +212,9 @@ export function getEnumKeyAsString(enm: object, val: string): string {
return key!;
}
-export function getQueryParameter(name: string): string {
- name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
- const regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
- const results = regex.exec(location.search);
- return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}
-
export function getAssetAttribute(asset: Asset, attributeName: string): AssetAttribute | undefined {
if (asset.attributes && asset.attributes.hasOwnProperty(attributeName)) {
- const attr = asset.attributes[attributeName] as AssetAttribute;
- attr.name = attributeName;
- attr.assetId = asset.id;
+ const attr = {...asset.attributes[attributeName], name: attributeName, assetId: asset.id} as AssetAttribute;
return attr;
}
}
@@ -222,8 +222,7 @@ export function getAssetAttribute(asset: Asset, attributeName: string): AssetAtt
export function getAssetAttributes(asset: Asset, exclude?: string[]): AssetAttribute[] {
if (asset.attributes) {
return Object.entries(asset.attributes as {[s: string]: AssetAttribute}).filter(([name, attr]) => !exclude || exclude.indexOf(name) >= 0).map(([name, attr]) => {
- attr.name = name;
- attr.assetId = asset.id;
+ attr = {...attr, name: name, assetId: asset.id};
return attr;
});
}
diff --git a/ui/component/or-header/README.md b/ui/component/or-header/README.md
deleted file mode 100644
index cd8da3ac1..000000000
--- a/ui/component/or-header/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# @openremote/or-header \<or-header\>
-[![NPM Version][npm-image]][npm-url]
-[![Linux Build][travis-image]][travis-url]
-[![Test Coverage][coveralls-image]][coveralls-url]
-
-Web Component for displaying a header with a menu based on slots.
-
-## Install
-```bash
-npm i @openremote/or-header
-yarn add @openremote/or-header
-```
-
-## 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-header
-[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=master
diff --git a/ui/component/or-header/package.json b/ui/component/or-header/package.json
deleted file mode 100644
index c7d871568..000000000
--- a/ui/component/or-header/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "@openremote/or-header",
- "version": "1.1.0",
- "description": "Displays header with menu for mobile and desktop",
- "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": {
- "lit-element": "^2.2.1"
- },
- "devDependencies": {
- "tslint": ">=5.11.0",
- "typescript": ">=3.4.5",
- "webpack": "^4.41.2",
- "webpack-cli": "^3.3.9"
- }
-}
diff --git a/ui/component/or-header/src/index.ts b/ui/component/or-header/src/index.ts
deleted file mode 100644
index 05f76ae03..000000000
--- a/ui/component/or-header/src/index.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import {style} from "./style";
-import {customElement, html, LitElement, property, query} from "lit-element";
-import {MDCDialog} from "@material/dialog";
-import i18next from "i18next";
-import manager, {Util} from "@openremote/core";
-import {MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";
-import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/dist/or-mwc-menu";
-import "@openremote/or-icon";
-import "./or-language";
-import "./or-language-modal";
-import "./or-realm-picker";
-import {Constants} from "@openremote/model";
-
-interface MenuOption {
- icon: string;
- text: string;
- value?: string;
- href?: string;
- hideMobile?: boolean;
- roles?: string[];
-}
-
-const mainItems: MenuOption[] = [
- {
- icon: "map",
- href: "#!map",
- text: "map"
- },
- {
- icon: "rhombus-split",
- href: "#!assets",
- text: "asset_plural",
- },
- {
- icon: "state-machine",
- href: "#!rules",
- text: "rule_plural",
- hideMobile: true
- },
- {
- icon: "chart-areaspline",
- href: "#!insights",
- text: "insights",
- hideMobile: true
- },
- // {
- // icon: "android-messages",
- // href: "#!messages",
- // text: "messages",
- // }
-];
-
-const secondaryItems: MenuOption[] = [
- {
- icon: "cloud",
- href: "#!gateway",
- text: "gatewayConnection",
- roles: ["write:admin", "read:admin"]
- },
- {
- icon: "web",
- value: "language",
- text: "language"
- },
- {
- icon: "file-document-box-search-outline",
- value: "logs",
- href: "#!logs",
- text: "logs",
- hideMobile: true
- },
- // {
- // icon: "account-cog",
- // value: "User management",
- // text: "User management",
- // isSuperUser: true
- // },
- // {
- // icon: "tune",
- // value: "Settings",
- // text: "Settings"
- // },
- {
- icon: "logout",
- value: "logout",
- text: "logout"
- }
-];
-
-function getHeaderMenu(items: MenuOption[]): MenuItem[] {
- return items.filter(option => !option.roles || option.roles.some(r => manager.hasRole(r))).map(option => {
- return {
- text: option.text,
- value: option.value ? option.value : "",
- icon: option.icon,
- href: option.href
- };
- });
-}
-
-export class OrHeaderMenuChangedEvent extends CustomEvent<boolean> {
-
- public static readonly NAME = "or-header-menu-changed";
-
- constructor() {
- super(OrHeaderMenuChangedEvent.NAME, {
- bubbles: true,
- composed: true
- });
- }
-}
-@customElement("or-header")
-class OrHeader extends LitElement {
-
- @property({type: Boolean})
- private _drawerOpened = false;
-
- @property({type: String})
- private logo = "";
-
- @property({ type: String })
- private logoMobile = "";
-
- @property({ type: Array })
- private mainItems: MenuOption[] = mainItems;
-
- @property({ type: Array })
- private secondaryItems: MenuOption[] = secondaryItems;
-
- @property({ type: String })
- private activeMenu: string | undefined = window.location.hash ? window.location.hash : "#!map";
-
- @query("slot[name=mobile-bottom]")
- protected _mobileBottomSlot?: HTMLSlotElement;
-
- @query("div[id=mobile-bottom]")
- protected _mobileBottomDiv?: HTMLDivElement;
-
-
- static get styles() {
- return [
- style
- ];
- }
-
- constructor() {
- super();
-
- this.addEventListener(OrHeaderMenuChangedEvent.NAME, this._hashChanged);
- window.addEventListener("hashchange", () => {
- this.dispatchEvent(new OrHeaderMenuChangedEvent());
- }, false);
- }
-
- _hashChanged(e: Event) {
- const menu = window.location.hash.split('/')[0];
- this.activeMenu = menu;
- }
-
- protected render() {
- return html`
- <!-- Header -->
- <div id="header" class="shadow">
- <div id="toolbar-top">
- <div><img id="logo" src="${this.logo}" /><img id="logo-mobile" src="${this.logoMobile}" /></div>
- <!-- This gets hidden on a small screen-->
-
- <nav id="toolbar-list">
- <div id="desktop-left">
- ${this.mainItems.filter(option => !option.roles || option.roles.some(r => manager.hasRole(r))).map(menuItem => {
- return html`
- <a class="menu-item" href="${menuItem.href}" ?selected="${this.activeMenu === menuItem.href}" data-navigo @click="${() => this.activeMenu = menuItem.href}"><or-icon icon="${menuItem.icon}"></or-icon><or-translate value="${menuItem.text}"></or-translate></a>
- `
- })}
- </div>
- </nav>
- <div id="desktop-right">
- ${(manager.isSuperUser() ? html`<a slot="desktop-right"><or-realm-picker></or-realm-picker></a>` : ``)}
- <slot name="desktop-right"></slot>
- </div>
- ${getContentWithMenuTemplate(
- html`
- <button id="desktop-menu-btn" class="menu-btn" title="Menu"><or-icon icon="dots-vertical"></or-icon></button>
- `,
- getHeaderMenu(this.secondaryItems),
- this.activeMenu,
- (values: string | string[]) => this.setActiveMenu(values as string))}
- <div id="menu-btn-mobile" >
- <button id="menu-btn" class="menu-btn" title="Menu" @click="${this._menuButtonClicked}">${this._drawerOpened ? html`<or-icon icon="close"></or-icon>` : html`<or-icon icon="menu"></or-icon>`}</button>
- </div>
- </div>
- </div>
- <or-language-modal id="language-modal"></or-language-modal>
- <div id="drawer" ?opened="${this._drawerOpened}" @click="${this._close}">
- <div>
- <div id="mobile-top">
- <nav id="drawer-list">
- ${this.mainItems.filter(option => !option.hideMobile && (!option.roles || option.roles.some(r => manager.hasRole(r)))).map(menuItem => {
- return html`
- <a class="menu-item" href="${menuItem.href}" ?selected="${this.activeMenu === menuItem.href}" data-navigo @click="${() => this.activeMenu = menuItem.href}"><or-icon icon="${menuItem.icon}"></or-icon><or-translate value="${menuItem.text}"></or-translate></a>
- `
- })}
- </nav>
- </div>
-
- <div id="mobile-bottom">
- ${this.secondaryItems.filter(option => !option.hideMobile && (!option.roles || option.roles.some(r => manager.hasRole(r)))).map(menuItem => {
- if(menuItem.href)
- return html`
- <a class="menu-item" href="${menuItem.href}" ?selected="${this.activeMenu === menuItem.href}" data-navigo @click="${() => this.activeMenu = menuItem.href}"><or-icon icon="${menuItem.icon}"></or-icon><or-translate value="${menuItem.text}"></or-translate></a>
- `
- else
- return html`
- <a class="menu-item" @click=${() => this.setActiveMenu(menuItem.value as string)} ><or-icon icon="${menuItem.icon}"></or-icon><or-translate value="${menuItem.text}"></or-translate></a>
- `
- })}
- </div>
- </div>
- </div>
- `;
- }
-
- protected firstUpdated(_changedProperties: Map<PropertyKey, unknown>): void {
- if (this._mobileBottomSlot && this._mobileBottomDiv) {
- const childNodes = this._mobileBottomSlot.assignedNodes();
- if (childNodes.length > 0) {
- this._mobileBottomDiv.classList.add("has-children");
- }
- }
- }
-
- private _close() {
- this._drawerOpened = false;
- }
-
- private _menuButtonClicked() {
- this._drawerOpened = !this._drawerOpened;
- }
-
- setActiveMenu(value: string) {
- switch (value) {
- case "logout":
- manager.logout();
- break;
- case "language":
- const modal = this.shadowRoot!.getElementById("language-modal");
- if (modal && modal.shadowRoot) {
- const component = modal.shadowRoot.getElementById("mdc-dialog-language");
- if (component) {
- const dialog = new MDCDialog(component);
- if (dialog) {
- dialog.open();
- }
- }
- }
-
- break;
- }
- this.activeMenu = value;
- }
-
-}
diff --git a/ui/component/or-header/src/or-language-modal.ts b/ui/component/or-header/src/or-language-modal.ts
deleted file mode 100644
index 0cab77a3f..000000000
--- a/ui/component/or-header/src/or-language-modal.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import {customElement, html, css, LitElement, property, query, unsafeCSS} from "lit-element";
-import "@openremote/or-icon";
-import i18next from "i18next";
-import manager from "@openremote/core";
-import { InputType } from "@openremote/or-input";
-import {MDCDialog} from '@material/dialog';
-const dialogStyle = require("!!raw-loader!@material/dialog/dist/mdc.dialog.css");
-
-// language=CSS
-const style = css`
- :host {
- position: relative;
- }
-
- #language-dialog-content {
- display: flex;
- }
-
- #language-picker {
- flex: 1 1 0;
- }
-
-`;
-interface languageOptions {
- [key: string]: string;
-}
-
-export const languageOptions: languageOptions = {
- "en": "english",
- "nl": "dutch",
- "fr": "french",
- "de": "german",
- "es": "spanish"
-};
-
-const getLanguageOptions = () => {
- return Object.entries(languageOptions);
-}
-
-@customElement("or-language-modal")
-export class OrLanguageModal extends LitElement {
-
-
- @property({type: Boolean})
- isVisible?: boolean = false;
-
- @property({type: String})
- language: string = manager.language;
-
- @query("#mdc-dialog-language")
- protected _dialogElem!: HTMLElement;
-
- protected _dialog!: MDCDialog;
-
-
- static get styles() {
- return [
- css`${unsafeCSS(dialogStyle)}`,
- style
- ];
- }
-
- firstUpdated() {
- this.language = manager.language ? manager.language : "en";
- this._dialog = new MDCDialog(this._dialogElem);
- }
-
- protected render() {
- return html`
- <div id="mdc-dialog-language"
- class="mdc-dialog"
- role="alertdialog"
- aria-modal="true"
- aria-labelledby="my-dialog-title"
- aria-describedby="my-dialog-content">
- <div class="mdc-dialog__container">
- <div class="mdc-dialog__surface">
- <h2 class="mdc-dialog__title" id="my-dialog-title"><or-translate value="selectLanguage"></or-translate></h2>
- <div class="dialog-container mdc-dialog__content" id="language-dialog-content">
- <or-input id="language-picker"
- .label="${i18next.t("language")}"
- .type="${InputType.LIST}"
- .options="${getLanguageOptions()}"></or-input>
- </div>
- <footer class="mdc-dialog__actions">
- <or-input class="button"
- slot="secondaryAction"
- .type="${InputType.BUTTON}"
- label="${i18next.t("cancel")}"
- class="mdc-button mdc-dialog__button"
- data-mdc-dialog-action="no"></or-input>
-
- <or-input class="button"
- slot="primaryAction"
- .type="${InputType.BUTTON}"
- label="${i18next.t("ok")}"
- class="mdc-button mdc-dialog__button"
- data-mdc-dialog-action="yes"
- @click="${this.changeLanguage}"></or-input>
-
- </footer>
- </div>
- </div>
- <div class="mdc-dialog__scrim"></div>
- </div>
- `;
- }
-
- changeLanguage() {
- if(this.shadowRoot && this.shadowRoot.getElementById('language-picker')){
- const elm = this.shadowRoot.getElementById('language-picker') as HTMLInputElement;
- manager.language = elm.value;
- this.language = manager.language;
- this.requestUpdate();
- }
- }
-}
diff --git a/ui/component/or-header/src/or-language.ts b/ui/component/or-header/src/or-language.ts
deleted file mode 100644
index e9ccc43cd..000000000
--- a/ui/component/or-header/src/or-language.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import {customElement, html, css, LitElement, property} from "lit-element";
-import "@openremote/or-icon";
-import i18next from "i18next";
-import manager from "@openremote/core";
-import {MenuItem} from "@openremote/or-mwc-components/dist/or-mwc-menu";
-import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/dist/or-mwc-menu";
-
-// language=CSS
-const style = css`
- :host {
- position: relative;
- }
-
- .or-language-container {
- display: flex;
- height: 50px;
- align-items: center;
- }
-`;
-interface languageOptions {
- [key: string]: string;
-}
-
-export const languageOptions: languageOptions = {
- "en": "english",
- "nl": "dutch",
- "fr": "french",
- "de": "german",
- "es": "spanish"
-};
-
-function getLanguageMenu(): MenuItem[] {
-
- return Object.entries(languageOptions).map(([key, value]) => {
- return {
- text: i18next.t(value),
- value: key
- };
- });
-}
-// TODO remove because deprecated?
-@customElement("or-language")
-export class OrLanguage extends LitElement {
-
-
- @property({type: Boolean})
- isVisible?: boolean = false;
-
- @property({type: String})
- language: string = manager.language;
-
- static styles = style;
-
- firstUpdated() {
- this.language = manager.language ? manager.language : "en";
- }
-
- protected render() {
- return html`
- ${getContentWithMenuTemplate(
- html`
- <div class="or-language-container">
- <or-icon icon="web"></or-icon>
- <span style="margin-left: 10px; text-transform: uppercase;">${this.language}</span>
- </div>
- `,
- getLanguageMenu(),
- this.language,
- (values: string | string[]) => this.changeLanguage(values as string))}
- `;
- }
-
- changeLanguage(language: string) {
- manager.language = language;
- this.language = language;
- this.isVisible = false;
- }
-}
diff --git a/ui/component/or-header/src/or-realm-picker.ts b/ui/component/or-header/src/or-realm-picker.ts
deleted file mode 100644
index 4ebe45e96..000000000
--- a/ui/component/or-header/src/or-realm-picker.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { customElement, html, LitElement, property, css, PropertyValues } from "lit-element";
-import "@openremote/or-icon";
-import manager, { EventCallback, OREvent } from "@openremote/core";
-import { MenuItem } from "@openremote/or-mwc-components/dist/or-mwc-menu";
-import { Tenant } from "@openremote/model";
-import { getContentWithMenuTemplate } from "@openremote/or-mwc-components/dist/or-mwc-menu";
-
-// language=CSS
-const style = css`
- :host {
- position: relative;
- }
-
- .or-realm-picker-container {
- display: flex;
- height: 50px;
- align-items: center;
- }
-`;
-
-@customElement("or-realm-picker")
-export class OrRealmPicker extends LitElement {
- public static styles = style;
-
- protected _initCallback?: EventCallback;
-
- @property({ attribute: false })
- private realms: Tenant[] = [];
-
- protected firstUpdated(_changedProperties: PropertyValues): void {
- super.firstUpdated(_changedProperties);
-
- if (!manager.ready) {
- // Defer until openremote is initialised
- this._initCallback = (initEvent: OREvent) => {
- if (initEvent === OREvent.READY) {
- this.loadRealms();
- manager.removeListener(this._initCallback!);
- }
- };
- manager.addListener(this._initCallback);
- } else {
- this.loadRealms();
- }
- }
-
- protected render() {
- if (!manager.isSuperUser() || this.realms.length === 0) {
- return html``;
- }
-
- return html`
- ${getContentWithMenuTemplate(
- html`
- <div class="or-realm-picker-container">
- <span style="margin-left: 10px;">${manager.displayRealm}</span>
- <or-icon icon="chevron-down"></or-icon>
- </div>
- `,
- this.getMenuItems(),
- manager.displayRealm,
- (values: string | string[]) => this.changeRealm(values as string))}
- `;
- }
-
- private getMenuItems(): MenuItem[] {
- return this.realms.map((r) => {
- return {
- text: r.displayName || "invalid",
- value: r.realm || "invalid"
- };
- });
- }
-
- private changeRealm(displayRealm: string) {
- manager.displayRealm = displayRealm;
- this.requestUpdate();
- }
-
- private loadRealms() {
- if (manager.isSuperUser()) {
- manager.rest.api.TenantResource.getAll().then((response) => {
- this.realms = response.data;
- });
- }
- }
-}
diff --git a/ui/component/or-header/src/style.ts b/ui/component/or-header/src/style.ts
deleted file mode 100644
index bc40e1551..000000000
--- a/ui/component/or-header/src/style.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import {css, unsafeCSS} from "lit-element";
-import {DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor4, DefaultBoxShadowBottom, DefaultHeaderHeight} from "@openremote/core";
-
-// language=CSS
-export const style = css`
-
- :host {
- --internal-or-header-color: var(--or-header-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));
- --internal-or-header-selected-color: var(--or-header-selected-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
- --internal-or-header-text-color: var(--or-header-text-color, var(--or-app-color3, inherit));
- --internal-or-header-height: var(--or-header-height, ${unsafeCSS(DefaultHeaderHeight)});
- --internal-or-header-logo-margin: var(--or-header-logo-margin, 0 40px 0 0);
- --internal-or-header-logo-height: var(--or-header-logo-height, var(--internal-or-header-height, ${unsafeCSS(DefaultHeaderHeight)}));
- --internal-or-header-item-size: var(--or-header-item-size, calc(${unsafeCSS(DefaultHeaderHeight)} - 20px));
- --internal-or-header-drawer-color: var(--or-header-drawer-color, var(--or-app-color2, ${unsafeCSS(DefaultColor2)}));
- --internal-or-header-drawer-text-color: var(--or-header-drawer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));
- --internal-or-header-drawer-item-size: var(--or-header-drawer-item-size, 30px);
- --internal-or-header-drawer-separator-color: var(--or-header-drawer-separator-color, var(--or-app-color4, ${unsafeCSS(DefaultColor4)}));
-
- display: block;
- }
-
- #toolbar-top {
- display: flex;
- padding: 0;
- }
-
- #logo-mobile {
- margin: 8px;
- height: calc(var(--internal-or-header-logo-height) - 16px);
- display: block;
- }
-
- #logo {
- display: none;
- }
-
- #header {
- opacity: 1;
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: var(--internal-or-header-height);
- text-align: center;
- background-color: var(--internal-or-header-color);
- color: var(--internal-or-header-text-color);
- --or-icon-fill: var(--internal-or-header-text-color);
- --or-icon-height: calc(var(--internal-or-header-item-size) - 12px);
- --or-icon-width: calc(var(--internal-or-header-item-size) - 12px);
- z-index: 9999999;
- }
-
- .shadow {
- -webkit-box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};
- -moz-box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};
- box-shadow: ${unsafeCSS(DefaultBoxShadowBottom)};
- }
-
- #drawer {
- z-index: 999999;
- position: absolute;
- top: var(--internal-or-header-height);
- width: 100%;
- height: calc(100% - var(--internal-or-header-height));
- transition: all 300ms ease-in;
- transition-property: -webkit-transform;
- transition-property: transform;
- -webkit-transform: translate3d(0, -100%, 0);
- transform: translate3d(0, -100%, 0);
- background: var(--internal-or-header-drawer-color);
- color: var(--internal-or-header-drawer-text-color);
- --or-icon-fill: var(--internal-or-header-drawer-text-color);
- --or-icon-height: calc(var(--internal-or-header-drawer-item-size) - 10px);
- --or-icon-width: calc(var(--internal-or-header-drawer-item-size) - 10px);
- }
-
- #drawer[opened] {
- -webkit-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
- }
-
- #drawer > div {
- box-sizing: border-box;
- width: 100%;
- height: 100%;
- padding: 6px 24px;
- position: relative;
- }
-
- .menu-btn {
- background: none;
- border: none;
- cursor: pointer;
- padding: 0 6px;
- height: 100%;
- margin: 0 10px 0 auto;
- }
-
- #menu-btn-mobile {
- margin-left: auto;
- }
-
- #desktop-menu-btn {
- display: none;
- }
-
- #desktop-right {
- margin-left: auto;
- display: none;
- }
-
- #desktop-right slot {
- display: flex;
- }
-
- #mobile-bottom {
- border-top: 1px solid var(--internal-or-header-drawer-separator-color);
- margin-top: 20px;
- padding-top: 10px;
- }
-
- .menu-item {
- opacity: 0.7;
- cursor: pointer;
- text-decoration: none !important;
- color: inherit;
- padding: 0 20px;
- font-size: 14px;
- }
-
-
-
- .menu-item:hover,
- .menu-item[selected] {
- opacity: 1;
- }
-
-
- #desktop-left .menu-item {
- display: none;
- line-height: calc(var(--internal-or-header-height) - 4px);
- }
-
- #desktop-right .menu-item {
- line-height: var(--internal-or-header-height);
- }
-
- #drawer .menu-item {
- display: block;
- line-height: var(--internal-or-header-drawer-item-size);
- margin: 10px 0;
- }
-
- #desktop-left .menu-item[selected] {
- display: inline-block;
- line-height: var(--internal-or-header-height);
- }
-
- or-mwc-menu {
- margin-right: 10px;
- display: block;
- }
-
- /* Wide layout: when the viewport width is bigger than 780px, layout
- changes to a wide layout. */
-
-
- @media (min-width: 780px) {
- #desktop-menu-btn {
- display: block;
- }
-
-
-
- #menu-btn-mobile {
- display: none;
- }
-
- #drawer {
- display: none;
- }
-
- #desktop-right {
- display: block;
- }
-
- #desktop-left .menu-item {
- display: inline-block;
- }
-
- #desktop-left .menu-item or-icon{
- display: none;
- }
-
- #desktop-left .menu-item[selected] {
- border-bottom: 4px solid var(--internal-or-header-selected-color);
- line-height: calc(var(--internal-or-header-height) - 4px);
- }
- }
-
- @media (min-width: 1024px) {
- #logo {
- margin: var(--internal-or-header-logo-margin);
- height: var(--internal-or-header-logo-height);
- display: block;
- }
-
- #logo-mobile {
- display: none;
- }
-
- #desktop-left .menu-item or-icon{
- display: inline-block;
- }
- }
-`;
\ No newline at end of file
diff --git a/ui/component/or-header/tsconfig.json b/ui/component/or-header/tsconfig.json
deleted file mode 100644
index 7fc0e6f3b..000000000
--- a/ui/component/or-header/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "extends": "../../tsconfig",
- "compilerOptions": {
- "outDir": "./dist",
- "tsBuildInfoFile": "./dist/.tsbuildinfo",
- "rootDir": "src"
- },
- "include": [
- "./src"
- ],
- "references": [
- { "path": "../core" },
- { "path": "../or-input" },
- { "path": "../or-mwc-components" }
- ]
-}
\ No newline at end of file
diff --git a/ui/component/or-header/webpack.config.js b/ui/component/or-header/webpack.config.js
deleted file mode 100644
index bda3df670..000000000
--- a/ui/component/or-header/webpack.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const util = require("../webpack.util");
-
-bundles = {
- "index": {
- excludeOr: true
- },
- "index.orbundle": undefined
-};
-
-module.exports = util.generateExports(__dirname);
\ No newline at end of file
diff --git a/ui/component/or-mwc-components/src/or-mwc-dialog.ts b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
index a53038095..49df845a9 100644
--- a/ui/component/or-mwc-components/src/or-mwc-dialog.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
@@ -4,19 +4,28 @@ import {
html,
LitElement,
property,
- PropertyValues,
query,
TemplateResult,
unsafeCSS
} from "lit-element";
-import {MDCDialog, MDCDialogCloseEventDetail} from "@material/dialog";
+import {MDCDialog} from "@material/dialog";
import "@openremote/or-translate";
+import "@openremote/or-input";
+import {InputType} from "@openremote/or-input";
const dialogStyle = require("!!raw-loader!@material/dialog/dist/mdc.dialog.css");
+const listStyle = require("!!raw-loader!@material/list/dist/mdc.list.css");
+
+export interface DialogConfig {
+ title?: string;
+ content?: TemplateResult;
+ actions?: DialogAction[];
+ avatar?: boolean;
+}
export interface DialogAction {
default?: boolean;
- content: TemplateResult;
+ content: TemplateResult | string;
actionName: string;
action?: () => void;
}
@@ -66,10 +75,20 @@ export class OrMwcDialog extends LitElement {
static get styles() {
return [
css`${unsafeCSS(dialogStyle)}`,
+ css`${unsafeCSS(listStyle)}`,
style
];
}
+ public set config(config: DialogConfig) {
+ if (config) {
+ this.dialogTitle = config.title;
+ this.dialogContent = config.content;
+ this.dialogActions = config.actions;
+ this.avatar = config.avatar;
+ }
+ };
+
@property({type: String})
public dialogTitle?: string;
@@ -79,12 +98,18 @@ export class OrMwcDialog extends LitElement {
@property({type: Array, attribute: false})
public dialogActions?: DialogAction[];
+ @property({type: Boolean})
+ public avatar?: boolean;
+
@query("#dialog")
protected _mdcElem!: HTMLElement;
protected _mdcComponent?: MDCDialog;
public open() {
+ if (this._mdcElem && !this._mdcComponent) {
+ this._mdcComponent = new MDCDialog(this._mdcElem);
+ }
if (this._mdcComponent) {
this._mdcComponent.open();
}
@@ -117,29 +142,32 @@ export class OrMwcDialog extends LitElement {
@MDCDialog:closed="${(evt: any) => this._onDialogClosed(evt.detail.action)}">
<div class="mdc-dialog__container">
<div class="mdc-dialog__surface">
- <h2 class="mdc-dialog__title" id="dialog-title"><or-translate value="${this.dialogTitle}"></or-translate></h2>
- <div class="dialog-container mdc-dialog__content" id="dialog-content">
- ${this.dialogContent ? this.dialogContent : html`<slot></slot>`}
- </div>
- <footer class="mdc-dialog__actions">
- ${this.dialogActions ? this.dialogActions.map((action) => {
- return html`<div class="mdc-button mdc-dialog__button" ?data-mdc-dialog-button-default="${action.default}" data-mdc-dialog-action="${action.actionName}">${action.content}</div>`
- }) : ``}
- </footer>
+ <h2 class="mdc-dialog__title" id="dialog-title"><or-translate value="${this.dialogTitle}"></or-translate></h2>
+ ${this.dialogContent ? html`
+ <div class="dialog-container mdc-dialog__content" id="dialog-content">
+ ${this.dialogContent ? this.dialogContent : html`<slot></slot>`}
+ </div>
+ <footer class="mdc-dialog__actions">
+ ${this.dialogActions ? this.dialogActions.map((action) => {
+ return html`
+ <div class="mdc-button mdc-dialog__button" ?data-mdc-dialog-button-default="${action.default}" data-mdc-dialog-action="${action.actionName}">
+ ${typeof(action.content) === "string" ? html`<or-input .type="${InputType.BUTTON}" .label="${action.content}"></or-input>` : action.content}
+ </div>`
+ }) : ``}
+ </footer>
+ ` : html`
+ <ul class="mdc-list ${this.avatar ? "mdc-list--avatar-list" : ""}">
+ ${!this.dialogActions ? `` : this.dialogActions!.map((action, index) => {
+ return html`<li class="mdc-list-item" data-mdc-dialog-action="${action.actionName}"><span class="mdc-list-item__text">${action.content}</span></li>`;
+ })}
+ </ul>
+ `}
</div>
- </div>
- <div class="mdc-dialog__scrim"></div>
</div>
+ <div class="mdc-dialog__scrim"></div>
`;
}
- protected firstUpdated(_changedProperties: PropertyValues): void {
- super.firstUpdated(_changedProperties);
- if (this._mdcElem) {
- this._mdcComponent = new MDCDialog(this._mdcElem);
- }
- }
-
protected _onDialogOpened() {
this.dispatchEvent(new OrMwcDialogOpenedEvent());
}
diff --git a/ui/component/or-mwc-components/src/or-mwc-menu.ts b/ui/component/or-mwc-components/src/or-mwc-menu.ts
index a01aafb8d..8a8a3a73f 100644
--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts
@@ -24,7 +24,6 @@ export interface MenuItem {
text?: string;
secondaryText?: string;
value: string;
- href?: string;
styleMap?: {[style: string]: string};
}
@@ -189,7 +188,6 @@ export class OrMwcMenu extends LitElement {
const isSelected = this.isValueSelected((item as MenuItem).value);
let icon = item.icon;
- const href = item.href;
const text = item.text !== undefined ? item.text : item.value;
let leftTemplate: TemplateResult | string = ``;
let rightTemplate: TemplateResult | string = ``;
@@ -209,7 +207,8 @@ export class OrMwcMenu extends LitElement {
<or-icon icon="${item.trailingIcon}"></or-icon>
</span>`;
}
- const listItem = html`
+
+ 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`
@@ -221,18 +220,6 @@ export class OrMwcMenu extends LitElement {
${rightTemplate}
</li>
`;
-
- if(href) {
- return html`
- <a href="${href}" data-navigo>
- ${listItem}
- </a>
- `;
- } else {
- return listItem;
- }
-
-
})}
`;
}
@@ -270,12 +257,13 @@ export class OrMwcMenu extends LitElement {
}
private _itemClicked(e: MouseEvent, item: MenuItem) {
+ e.stopPropagation();
const value = item.value;
if (!this.multiSelect) {
this.values = value;
+ this._mdcComponent!.open = false;
} else {
- e.stopPropagation();
if (!Array.isArray(this.values)) {
this.values = this.values ? [this.values] : [];
}
diff --git a/yarn.lock b/yarn.lock
index 607b5dd10..a5e1c9abe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,6 +9,22 @@
dependencies:
"@babel/highlight" "^7.0.0"
+"@babel/code-frame@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+ integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+ dependencies:
+ "@babel/highlight" "^7.8.3"
+
+"@babel/compat-data@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
+ integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
+ dependencies:
+ browserslist "^4.11.1"
+ invariant "^2.2.4"
+ semver "^5.5.0"
+
"@babel/core@^7.2.2":
version "7.6.4"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
@@ -39,6 +55,16 @@
lodash "^4.17.13"
source-map "^0.5.0"
+"@babel/generator@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
+ integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+ dependencies:
+ "@babel/types" "^7.9.6"
+ jsesc "^2.5.1"
+ lodash "^4.17.13"
+ source-map "^0.5.0"
+
"@babel/helper-annotate-as-pure@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
@@ -46,6 +72,13 @@
dependencies:
"@babel/types" "^7.0.0"
+"@babel/helper-annotate-as-pure@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
+ integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
@@ -54,6 +87,14 @@
"@babel/helper-explode-assignable-expression" "^7.1.0"
"@babel/types" "^7.0.0"
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
+ integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+ dependencies:
+ "@babel/helper-explode-assignable-expression" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
"@babel/helper-call-delegate@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
@@ -63,6 +104,26 @@
"@babel/traverse" "^7.4.4"
"@babel/types" "^7.4.4"
+"@babel/helper-compilation-targets@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
+ integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
+ dependencies:
+ "@babel/compat-data" "^7.9.6"
+ browserslist "^4.11.1"
+ invariant "^2.2.4"
+ levenary "^1.1.1"
+ semver "^5.5.0"
+
+"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
+ version "7.8.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
+ integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.8.3"
+ "@babel/helper-regex" "^7.8.3"
+ regexpu-core "^4.7.0"
+
"@babel/helper-define-map@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
@@ -72,6 +133,15 @@
"@babel/types" "^7.5.5"
lodash "^4.17.13"
+"@babel/helper-define-map@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
+ integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+ dependencies:
+ "@babel/helper-function-name" "^7.8.3"
+ "@babel/types" "^7.8.3"
+ lodash "^4.17.13"
+
"@babel/helper-explode-assignable-expression@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
@@ -80,6 +150,14 @@
"@babel/traverse" "^7.1.0"
"@babel/types" "^7.0.0"
+"@babel/helper-explode-assignable-expression@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
+ integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+ dependencies:
+ "@babel/traverse" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
"@babel/helper-function-name@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
@@ -89,6 +167,15 @@
"@babel/template" "^7.1.0"
"@babel/types" "^7.0.0"
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+ integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+ dependencies:
+ "@babel/helper-get-function-arity" "^7.8.3"
+ "@babel/template" "^7.8.3"
+ "@babel/types" "^7.9.5"
+
"@babel/helper-get-function-arity@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
@@ -96,6 +183,13 @@
dependencies:
"@babel/types" "^7.0.0"
+"@babel/helper-get-function-arity@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+ integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-hoist-variables@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
@@ -103,6 +197,13 @@
dependencies:
"@babel/types" "^7.4.4"
+"@babel/helper-hoist-variables@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
+ integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-member-expression-to-functions@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
@@ -110,6 +211,13 @@
dependencies:
"@babel/types" "^7.5.5"
+"@babel/helper-member-expression-to-functions@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+ integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-module-imports@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
@@ -117,6 +225,13 @@
dependencies:
"@babel/types" "^7.0.0"
+"@babel/helper-module-imports@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+ integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a"
@@ -129,6 +244,19 @@
"@babel/types" "^7.5.5"
lodash "^4.17.13"
+"@babel/helper-module-transforms@^7.9.0":
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+ integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+ dependencies:
+ "@babel/helper-module-imports" "^7.8.3"
+ "@babel/helper-replace-supers" "^7.8.6"
+ "@babel/helper-simple-access" "^7.8.3"
+ "@babel/helper-split-export-declaration" "^7.8.3"
+ "@babel/template" "^7.8.6"
+ "@babel/types" "^7.9.0"
+ lodash "^4.17.13"
+
"@babel/helper-optimise-call-expression@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
@@ -136,11 +264,23 @@
dependencies:
"@babel/types" "^7.0.0"
+"@babel/helper-optimise-call-expression@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+ integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
"@babel/helper-plugin-utils@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
+"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+ integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
+
"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
@@ -148,6 +288,13 @@
dependencies:
lodash "^4.17.13"
+"@babel/helper-regex@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
+ integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+ dependencies:
+ lodash "^4.17.13"
+
"@babel/helper-remap-async-to-generator@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
@@ -159,6 +306,17 @@
"@babel/traverse" "^7.1.0"
"@babel/types" "^7.0.0"
+"@babel/helper-remap-async-to-generator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
+ integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.8.3"
+ "@babel/helper-wrap-function" "^7.8.3"
+ "@babel/template" "^7.8.3"
+ "@babel/traverse" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
"@babel/helper-replace-supers@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
@@ -169,6 +327,16 @@
"@babel/traverse" "^7.5.5"
"@babel/types" "^7.5.5"
+"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
+ integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+ dependencies:
+ "@babel/helper-member-expression-to-functions" "^7.8.3"
+ "@babel/helper-optimise-call-expression" "^7.8.3"
+ "@babel/traverse" "^7.9.6"
+ "@babel/types" "^7.9.6"
+
"@babel/helper-simple-access@^7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
@@ -177,6 +345,14 @@
"@babel/template" "^7.1.0"
"@babel/types" "^7.0.0"
+"@babel/helper-simple-access@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+ integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+ dependencies:
+ "@babel/template" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
"@babel/helper-split-export-declaration@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
@@ -184,6 +360,18 @@
dependencies:
"@babel/types" "^7.4.4"
+"@babel/helper-split-export-declaration@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+ integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+ dependencies:
+ "@babel/types" "^7.8.3"
+
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+ integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
"@babel/helper-wrap-function@^7.1.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
@@ -194,6 +382,16 @@
"@babel/traverse" "^7.1.0"
"@babel/types" "^7.2.0"
+"@babel/helper-wrap-function@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
+ integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+ dependencies:
+ "@babel/helper-function-name" "^7.8.3"
+ "@babel/template" "^7.8.3"
+ "@babel/traverse" "^7.8.3"
+ "@babel/types" "^7.8.3"
+
"@babel/helpers@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153"
@@ -212,11 +410,25 @@
esutils "^2.0.2"
js-tokens "^4.0.0"
+"@babel/highlight@^7.8.3":
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+ integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.9.0"
+ chalk "^2.0.0"
+ js-tokens "^4.0.0"
+
"@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
version "7.6.4"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
+"@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
+ integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+
"@babel/plugin-proposal-async-generator-functions@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
@@ -226,6 +438,15 @@
"@babel/helper-remap-async-to-generator" "^7.1.0"
"@babel/plugin-syntax-async-generators" "^7.2.0"
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
+ integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/helper-remap-async-to-generator" "^7.8.3"
+ "@babel/plugin-syntax-async-generators" "^7.8.0"
+
"@babel/plugin-proposal-dynamic-import@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
@@ -234,6 +455,14 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-dynamic-import" "^7.2.0"
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
+ integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+
"@babel/plugin-proposal-json-strings@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
@@ -242,6 +471,30 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-json-strings" "^7.2.0"
+"@babel/plugin-proposal-json-strings@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
+ integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-json-strings" "^7.8.0"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
+ integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+
+"@babel/plugin-proposal-numeric-separator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
+ integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+
"@babel/plugin-proposal-object-rest-spread@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
@@ -250,6 +503,15 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+"@babel/plugin-proposal-object-rest-spread@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
+ integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+ "@babel/plugin-transform-parameters" "^7.9.5"
+
"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
@@ -258,6 +520,30 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
+ integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+
+"@babel/plugin-proposal-optional-chaining@^7.9.0":
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+ integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+ version "7.8.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
+ integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.8.8"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-proposal-unicode-property-regex@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802"
@@ -274,6 +560,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-syntax-async-generators@^7.8.0":
+ version "7.8.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+ integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
"@babel/plugin-syntax-dynamic-import@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
@@ -281,6 +574,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+ integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
"@babel/plugin-syntax-json-strings@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
@@ -288,6 +588,27 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-syntax-json-strings@^7.8.0":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+ integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+ integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+ integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-syntax-object-rest-spread@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
@@ -295,6 +616,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+ integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
@@ -302,6 +630,27 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+ integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+ integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
+ integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-arrow-functions@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
@@ -309,6 +658,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
+ integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-async-to-generator@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
@@ -318,6 +674,15 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-remap-async-to-generator" "^7.1.0"
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
+ integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+ dependencies:
+ "@babel/helper-module-imports" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/helper-remap-async-to-generator" "^7.8.3"
+
"@babel/plugin-transform-block-scoped-functions@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
@@ -325,6 +690,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
+ integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-block-scoping@^7.6.3":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
@@ -333,6 +705,14 @@
"@babel/helper-plugin-utils" "^7.0.0"
lodash "^4.17.13"
+"@babel/plugin-transform-block-scoping@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
+ integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ lodash "^4.17.13"
+
"@babel/plugin-transform-classes@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
@@ -347,6 +727,20 @@
"@babel/helper-split-export-declaration" "^7.4.4"
globals "^11.1.0"
+"@babel/plugin-transform-classes@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
+ integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.8.3"
+ "@babel/helper-define-map" "^7.8.3"
+ "@babel/helper-function-name" "^7.9.5"
+ "@babel/helper-optimise-call-expression" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/helper-replace-supers" "^7.8.6"
+ "@babel/helper-split-export-declaration" "^7.8.3"
+ globals "^11.1.0"
+
"@babel/plugin-transform-computed-properties@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
@@ -354,6 +748,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-computed-properties@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
+ integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-destructuring@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
@@ -361,6 +762,21 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-destructuring@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
+ integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
+ integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-dotall-regex@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9"
@@ -377,6 +793,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
+ integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-exponentiation-operator@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
@@ -385,6 +808,14 @@
"@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
+ integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+ dependencies:
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-for-of@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
@@ -392,6 +823,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-for-of@^7.9.0":
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
+ integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-function-name@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
@@ -400,6 +838,14 @@
"@babel/helper-function-name" "^7.1.0"
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-function-name@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
+ integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+ dependencies:
+ "@babel/helper-function-name" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-literals@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
@@ -407,6 +853,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-literals@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
+ integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-member-expression-literals@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
@@ -414,6 +867,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
+ integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-modules-amd@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
@@ -423,6 +883,15 @@
"@babel/helper-plugin-utils" "^7.0.0"
babel-plugin-dynamic-import-node "^2.3.0"
+"@babel/plugin-transform-modules-amd@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
+ integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.9.0"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ babel-plugin-dynamic-import-node "^2.3.3"
+
"@babel/plugin-transform-modules-commonjs@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486"
@@ -433,6 +902,16 @@
"@babel/helper-simple-access" "^7.1.0"
babel-plugin-dynamic-import-node "^2.3.0"
+"@babel/plugin-transform-modules-commonjs@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
+ integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.9.0"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/helper-simple-access" "^7.8.3"
+ babel-plugin-dynamic-import-node "^2.3.3"
+
"@babel/plugin-transform-modules-systemjs@^7.5.0":
version "7.5.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
@@ -442,6 +921,16 @@
"@babel/helper-plugin-utils" "^7.0.0"
babel-plugin-dynamic-import-node "^2.3.0"
+"@babel/plugin-transform-modules-systemjs@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
+ integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+ dependencies:
+ "@babel/helper-hoist-variables" "^7.8.3"
+ "@babel/helper-module-transforms" "^7.9.0"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ babel-plugin-dynamic-import-node "^2.3.3"
+
"@babel/plugin-transform-modules-umd@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
@@ -450,6 +939,14 @@
"@babel/helper-module-transforms" "^7.1.0"
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-modules-umd@^7.9.0":
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
+ integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.9.0"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"
@@ -457,6 +954,13 @@
dependencies:
regexpu-core "^4.6.0"
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
+ integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+
"@babel/plugin-transform-new-target@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
@@ -464,6 +968,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-new-target@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
+ integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-object-super@^7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
@@ -472,6 +983,14 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-replace-supers" "^7.5.5"
+"@babel/plugin-transform-object-super@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
+ integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/helper-replace-supers" "^7.8.3"
+
"@babel/plugin-transform-parameters@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
@@ -481,6 +1000,14 @@
"@babel/helper-get-function-arity" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-parameters@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
+ integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+ dependencies:
+ "@babel/helper-get-function-arity" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-property-literals@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
@@ -488,6 +1015,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-property-literals@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
+ integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.4.5":
version "7.4.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
@@ -495,6 +1029,13 @@
dependencies:
regenerator-transform "^0.14.0"
+"@babel/plugin-transform-regenerator@^7.8.7":
+ version "7.8.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+ integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+ dependencies:
+ regenerator-transform "^0.14.2"
+
"@babel/plugin-transform-reserved-words@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
@@ -502,6 +1043,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-reserved-words@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
+ integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-runtime@^7.2.0":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz#2669f67c1fae0ae8d8bf696e4263ad52cb98b6f8"
@@ -512,6 +1060,16 @@
resolve "^1.8.1"
semver "^5.5.1"
+"@babel/plugin-transform-runtime@^7.8.3":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
+ integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
+ dependencies:
+ "@babel/helper-module-imports" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ resolve "^1.8.1"
+ semver "^5.5.1"
+
"@babel/plugin-transform-shorthand-properties@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
@@ -519,6 +1077,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
+ integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-spread@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
@@ -526,6 +1091,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-spread@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
+ integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-sticky-regex@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
@@ -534,6 +1106,14 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/helper-regex" "^7.0.0"
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
+ integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/helper-regex" "^7.8.3"
+
"@babel/plugin-transform-template-literals@^7.4.4":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
@@ -542,6 +1122,14 @@
"@babel/helper-annotate-as-pure" "^7.0.0"
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-template-literals@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
+ integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-typeof-symbol@^7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
@@ -549,6 +1137,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+ version "7.8.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
+ integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/plugin-transform-unicode-regex@^7.6.2":
version "7.6.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698"
@@ -558,6 +1153,14 @@
"@babel/helper-regex" "^7.4.4"
regexpu-core "^4.6.0"
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+ version "7.8.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
+ integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+
"@babel/preset-env@^7.2.0":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
@@ -614,6 +1217,83 @@
js-levenshtein "^1.1.3"
semver "^5.5.0"
+"@babel/preset-env@^7.8.3":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
+ integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
+ dependencies:
+ "@babel/compat-data" "^7.9.6"
+ "@babel/helper-compilation-targets" "^7.9.6"
+ "@babel/helper-module-imports" "^7.8.3"
+ "@babel/helper-plugin-utils" "^7.8.3"
+ "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+ "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+ "@babel/plugin-proposal-json-strings" "^7.8.3"
+ "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+ "@babel/plugin-proposal-numeric-separator" "^7.8.3"
+ "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+ "@babel/plugin-proposal-optional-chaining" "^7.9.0"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+ "@babel/plugin-syntax-async-generators" "^7.8.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+ "@babel/plugin-syntax-json-strings" "^7.8.0"
+ "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+ "@babel/plugin-syntax-numeric-separator" "^7.8.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+ "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+ "@babel/plugin-syntax-top-level-await" "^7.8.3"
+ "@babel/plugin-transform-arrow-functions" "^7.8.3"
+ "@babel/plugin-transform-async-to-generator" "^7.8.3"
+ "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+ "@babel/plugin-transform-block-scoping" "^7.8.3"
+ "@babel/plugin-transform-classes" "^7.9.5"
+ "@babel/plugin-transform-computed-properties" "^7.8.3"
+ "@babel/plugin-transform-destructuring" "^7.9.5"
+ "@babel/plugin-transform-dotall-regex" "^7.8.3"
+ "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+ "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+ "@babel/plugin-transform-for-of" "^7.9.0"
+ "@babel/plugin-transform-function-name" "^7.8.3"
+ "@babel/plugin-transform-literals" "^7.8.3"
+ "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+ "@babel/plugin-transform-modules-amd" "^7.9.6"
+ "@babel/plugin-transform-modules-commonjs" "^7.9.6"
+ "@babel/plugin-transform-modules-systemjs" "^7.9.6"
+ "@babel/plugin-transform-modules-umd" "^7.9.0"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+ "@babel/plugin-transform-new-target" "^7.8.3"
+ "@babel/plugin-transform-object-super" "^7.8.3"
+ "@babel/plugin-transform-parameters" "^7.9.5"
+ "@babel/plugin-transform-property-literals" "^7.8.3"
+ "@babel/plugin-transform-regenerator" "^7.8.7"
+ "@babel/plugin-transform-reserved-words" "^7.8.3"
+ "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+ "@babel/plugin-transform-spread" "^7.8.3"
+ "@babel/plugin-transform-sticky-regex" "^7.8.3"
+ "@babel/plugin-transform-template-literals" "^7.8.3"
+ "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+ "@babel/plugin-transform-unicode-regex" "^7.8.3"
+ "@babel/preset-modules" "^0.1.3"
+ "@babel/types" "^7.9.6"
+ browserslist "^4.11.1"
+ core-js-compat "^3.6.2"
+ invariant "^2.2.2"
+ levenary "^1.1.1"
+ semver "^5.5.0"
+
+"@babel/preset-modules@^0.1.3":
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+ integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+ "@babel/plugin-transform-dotall-regex" "^7.4.4"
+ "@babel/types" "^7.4.4"
+ esutils "^2.0.2"
+
"@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"
@@ -621,6 +1301,13 @@
dependencies:
regenerator-runtime "^0.13.2"
+"@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
+ integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
+ dependencies:
+ regenerator-runtime "^0.13.4"
+
"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
@@ -630,6 +1317,15 @@
"@babel/parser" "^7.6.0"
"@babel/types" "^7.6.0"
+"@babel/template@^7.8.3", "@babel/template@^7.8.6":
+ version "7.8.6"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+ integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+ dependencies:
+ "@babel/code-frame" "^7.8.3"
+ "@babel/parser" "^7.8.6"
+ "@babel/types" "^7.8.6"
+
"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
@@ -645,6 +1341,21 @@
globals "^11.1.0"
lodash "^4.17.13"
+"@babel/traverse@^7.8.3", "@babel/traverse@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
+ integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
+ dependencies:
+ "@babel/code-frame" "^7.8.3"
+ "@babel/generator" "^7.9.6"
+ "@babel/helper-function-name" "^7.9.5"
+ "@babel/helper-split-export-declaration" "^7.8.3"
+ "@babel/parser" "^7.9.6"
+ "@babel/types" "^7.9.6"
+ debug "^4.1.0"
+ globals "^11.1.0"
+ lodash "^4.17.13"
+
"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.3":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
@@ -654,6 +1365,15 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
+"@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
+ integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.9.5"
+ lodash "^4.17.13"
+ to-fast-properties "^2.0.0"
+
"@evocateur/libnpmaccess@^3.1.2":
version "3.1.2"
resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
@@ -1551,25 +2271,6 @@
"@material/touch-target" "^5.1.0"
tslib "^1.9.3"
-"@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/data-table@^5.1.0":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@material/data-table/-/data-table-5.1.0.tgz#4c15a0a18f7ee6d8dba77e435d4fbe064fe1f009"
@@ -2136,6 +2837,16 @@
dependencies:
"@polymer/polymer" preview
+"@reduxjs/toolkit@^1.3.6":
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.3.6.tgz#306171fce2ab7423931736c34fa82190959dcd62"
+ integrity sha512-eNYURfoJa6mRNU5YtBVbmE5+nDoc4lpjZ181PBwRC6nIFYZdNR3GcoQ4uomFt8eHpXAUAdpCdxBlDsmwyXOt9Q==
+ dependencies:
+ immer "^6.0.1"
+ redux "^4.0.0"
+ redux-thunk "^2.3.0"
+ reselect "^4.0.0"
+
"@types/chart.js@^2.8.5":
version "2.8.9"
resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.8.9.tgz#1ea37b2ad54917a4da09d40f50c2d39a2af3004d"
@@ -2727,6 +3438,13 @@ babel-plugin-dynamic-import-node@^2.3.0:
dependencies:
object.assign "^4.1.0"
+babel-plugin-dynamic-import-node@^2.3.3:
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+ integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+ dependencies:
+ object.assign "^4.1.0"
+
balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -2913,6 +3631,16 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
+browserslist@^4.11.1, browserslist@^4.8.5:
+ version "4.12.0"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+ integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+ dependencies:
+ caniuse-lite "^1.0.30001043"
+ electron-to-chromium "^1.3.413"
+ node-releases "^1.1.53"
+ pkg-up "^2.0.0"
+
browserslist@^4.6.0, browserslist@^4.7.2:
version "4.7.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348"
@@ -3139,6 +3867,11 @@ caniuse-lite@^1.0.30001004:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001005.tgz#823054210be638c725521edcb869435dae46728d"
integrity sha512-g78miZm1Z5njjYR216a5812oPiLgV1ssndgGxITHWUopmjUrCswMisA0a2kSB7a0vZRox6JOKhM51+efmYN8Mg==
+caniuse-lite@^1.0.30001043:
+ version "1.0.30001061"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001061.tgz#80ca87ef14eb543a7458e7fd2b5e2face3458c9f"
+ integrity sha512-SMICCeiNvMZnyXpuoO+ot7FHpMVPlrsR+HmfByj6nY4xYDHXLqMTbgH7ecEkDNXWkH1vaip+ZS0D7VTXwM1KYQ==
+
cardinal@~0.4.2:
version "0.4.4"
resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.4.4.tgz#ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2"
@@ -3616,6 +4349,14 @@ core-js-compat@^3.1.1:
browserslist "^4.7.2"
semver "^6.3.0"
+core-js-compat@^3.6.2:
+ version "3.6.5"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+ integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+ dependencies:
+ browserslist "^4.8.5"
+ semver "7.0.0"
+
core-js@^3.0.1:
version "3.3.4"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.4.tgz#6b0a23392958317bfb46e40b090529a923add669"
@@ -4122,6 +4863,11 @@ electron-to-chromium@^1.3.295:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.296.tgz#a1d4322d742317945285d3ba88966561b67f3ac8"
integrity sha512-s5hv+TSJSVRsxH190De66YHb50pBGTweT9XGWYu/LMR20KX6TsjFzObo36CjVAzM+PUeeKSBRtm/mISlCzeojQ==
+electron-to-chromium@^1.3.413:
+ version "1.3.441"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz#094f71b992dca5bc96b798cfbaf37dc76302015a"
+ integrity sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==
+
elliptic@^6.0.0:
version "6.5.1"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"
@@ -5284,6 +6030,11 @@ humanize-ms@^1.2.1:
dependencies:
ms "^2.0.0"
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/i18next-sprintf-postprocessor/-/i18next-sprintf-postprocessor-0.2.2.tgz#2e409f1043579382698b6a2da70cdaa551d67ea4"
+ integrity sha1-LkCfEENXk4Jpi2otpwzapVHWfqQ=
+
i18next-xhr-backend@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-2.0.1.tgz#7af735ee1b0c6d4ce49fa5756591040a0fba6db7"
@@ -5342,6 +6093,11 @@ ignore@^4.0.3:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+immer@^6.0.1:
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/immer/-/immer-6.0.5.tgz#77187d13b71c6cee40dde3b8e87a50a7a636d630"
+ integrity sha512-Q2wd90qrgFieIpLzAO2q9NLEdmyp/sr76Ml4Vm5peUKgyTa2CQa3ey8zuzwSKOlKH7grCeGBGUcLLVCVW1aguA==
+
import-fresh@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -5481,7 +6237,7 @@ intl@^1.2.5:
resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
-invariant@^2.2.2:
+invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -5984,6 +6740,18 @@ lerna@^3.18.1:
import-local "^2.0.0"
npmlog "^4.1.2"
+leven@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+ integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levenary@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+ integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+ dependencies:
+ leven "^3.1.0"
+
linqts@^1.12.6:
version "1.12.6"
resolved "https://registry.yarnpkg.com/linqts/-/linqts-1.12.6.tgz#8556e7d013a23dd2cc7201d460117b1cdfa2b6be"
@@ -6859,6 +7627,11 @@ node-releases@^1.1.38:
dependencies:
semver "^6.3.0"
+node-releases@^1.1.53:
+ version "1.1.55"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz#8af23b7c561d8e2e6e36a46637bab84633b07cee"
+ integrity sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==
+
nodent-compiler@^3.2.10:
version "3.2.11"
resolved "https://registry.yarnpkg.com/nodent-compiler/-/nodent-compiler-3.2.11.tgz#8f4bc703d7d8d0e563f5e09ea22efdce04dbaf9b"
@@ -7503,6 +8276,13 @@ pkg-dir@^4.1.0:
dependencies:
find-up "^4.0.0"
+pkg-up@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+ integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+ dependencies:
+ find-up "^2.1.0"
+
platform@^1.3.5:
version "1.3.5"
resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
@@ -7597,7 +8377,7 @@ prismjs@^1.11.0:
optionalDependencies:
clipboard "^2.0.0"
-private@^0.1.6:
+private@^0.1.6, private@^0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -7984,6 +8764,13 @@ regenerate-unicode-properties@^8.1.0:
dependencies:
regenerate "^1.4.0"
+regenerate-unicode-properties@^8.2.0:
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+ integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+ dependencies:
+ regenerate "^1.4.0"
+
regenerate@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -7994,6 +8781,11 @@ regenerator-runtime@^0.13.2:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+regenerator-runtime@^0.13.4:
+ version "0.13.5"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+ integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
regenerator-transform@^0.14.0:
version "0.14.1"
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
@@ -8001,6 +8793,14 @@ regenerator-transform@^0.14.0:
dependencies:
private "^0.1.6"
+regenerator-transform@^0.14.2:
+ version "0.14.4"
+ resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
+ integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+ dependencies:
+ "@babel/runtime" "^7.8.4"
+ private "^0.1.8"
+
regex-not@^1.0.0, regex-not@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -8028,7 +8828,19 @@ regexpu-core@^4.6.0:
unicode-match-property-ecmascript "^1.0.4"
unicode-match-property-value-ecmascript "^1.1.0"
-regjsgen@^0.5.0:
+regexpu-core@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
+ integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+ dependencies:
+ regenerate "^1.4.0"
+ regenerate-unicode-properties "^8.2.0"
+ regjsgen "^0.5.1"
+ regjsparser "^0.6.4"
+ unicode-match-property-ecmascript "^1.0.4"
+ unicode-match-property-value-ecmascript "^1.2.0"
+
+regjsgen@^0.5.0, regjsgen@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
@@ -8040,6 +8852,13 @@ regjsparser@^0.6.0:
dependencies:
jsesc "~0.5.0"
+regjsparser@^0.6.4:
+ version "0.6.4"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
+ integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+ dependencies:
+ jsesc "~0.5.0"
+
version "0.2.7"
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -8327,6 +9146,11 @@ selfsigned@^1.10.7:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+ integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -8362,9 +9186,9 @@ serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
serialize-javascript@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
- integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+ integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
serve-index@^1.9.1:
version "1.9.1"
@@ -9284,6 +10108,11 @@ unicode-match-property-value-ecmascript@^1.1.0:
resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
+unicode-match-property-value-ecmascript@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+ integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
unicode-property-aliases-ecmascript@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"