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: migrated lit-element to new lit and added or-json-forms

Rich Turner61b12469acae
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index 61f876019..740250c21 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -396,5 +396,7 @@
"attributeName": "Attribute name",
"oldestDatapoint": "Oldest datapoint",
"latestDatapoint": "Latest datapoint",
- "arrayDimensions": "Array dimensions"
+ "arrayDimensions": "Array dimensions",
+ "addParameter": "Add parameter",
+ "addItem": "Add item"
}
diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java
index 2e10d3fc0..f02ebbbda 100644
--- a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java
+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java
@@ -22,6 +22,7 @@ package org.openremote.model.asset.agent;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.util.StdConverter;
import org.openremote.model.asset.Asset;
@@ -29,6 +30,7 @@ import org.openremote.model.asset.AssetDescriptor;
import org.openremote.model.protocol.ProtocolAssetDiscovery;
import org.openremote.model.protocol.ProtocolAssetImport;
import org.openremote.model.protocol.ProtocolInstanceDiscovery;
+import org.openremote.model.util.AssetModelUtil;
/**
* Special type of {@link AssetDescriptor} that describes an agent {@link Asset}.
@@ -82,6 +84,11 @@ public class AgentDescriptor<T extends Agent<T, U, V>, U extends Protocol<T>, V
return ProtocolAssetImport.class.isAssignableFrom(protocolClass);
}
+ @JsonProperty
+ public JsonNode getAgentLinkSchema() {
+ return AssetModelUtil.getSchema(agentLinkClass);
+ }
+
public Class<U> getProtocolClass() {
return protocolClass;
}
diff --git a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
index 3454b3862..031a7a2fd 100644
--- a/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
+++ b/model/src/main/java/org/openremote/model/util/AssetModelUtil.java
@@ -19,6 +19,11 @@
*/
package org.openremote.model.util;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.victools.jsonschema.generator.*;
+import com.github.victools.jsonschema.module.jackson.JacksonModule;
+import com.github.victools.jsonschema.module.jackson.JacksonOption;
+import com.github.victools.jsonschema.module.javax.validation.JavaxValidationModule;
import org.openremote.model.AssetModelProvider;
import org.openremote.model.ModelDescriptor;
import org.openremote.model.ModelDescriptors;
@@ -117,6 +122,7 @@ public final class AssetModelUtil {
protected static List<MetaItemDescriptor<?>> metaItemDescriptors;
protected static List<ValueDescriptor<?>> valueDescriptors;
protected static Validator validator;
+ protected static SchemaGenerator generator;
static {
// Find all service loader registered asset model providers
@@ -462,8 +468,8 @@ public final class AssetModelUtil {
}
/**
- * Validates the supplied object using standard JSR-380 bean validation; therefore any passed in here must follow
- * the JSR-380 annotation requirements.
+ * Validates the supplied object using standard JSR-380 bean validation; therefore any type passed in here must
+ * follow the JSR-380 annotation requirements.
*/
// TODO: Implement validation using javax bean validation JSR-380
public static <T> Set<ConstraintViolation<T>> validate(@NotNull T obj, Class<?>... groups) {
@@ -482,6 +488,26 @@ public final class AssetModelUtil {
return validator;
}
+ /**
+ * Returns the schema for the specified type
+ */
+ public static JsonNode getSchema(Class<?> clazz) {
+ if (generator == null) {
+ JacksonModule module = new JacksonModule(
+ JacksonOption.FLATTENED_ENUMS_FROM_JSONVALUE
+ );
+ JavaxValidationModule validationModule = new JavaxValidationModule();
+ SchemaGeneratorConfigBuilder configBuilder = new SchemaGeneratorConfigBuilder(Values.JSON, SchemaVersion.DRAFT_7, OptionPreset.PLAIN_JSON);
+ configBuilder.with(module);
+// .with(validationModule);
+ SchemaGeneratorConfig config = configBuilder.build();
+
+
+ generator = new SchemaGenerator(config);
+ }
+ return generator.generateSchema(clazz);
+ }
+
public static void initialiseAssetAttributes(Asset<?> asset) throws IllegalStateException {
AssetTypeInfo assetInfo = AssetModelUtil.getAssetInfo(asset.getType()).orElseThrow(() -> new IllegalStateException("Cannot get asset model info for requested asset type: " + asset.getType()));
asset.getAttributes().addOrReplace(
diff --git a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy
index 2bab514ec..dd17d2d3c 100644
--- a/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/model/AssetModelTest.groovy
@@ -99,8 +99,15 @@ class AssetModelTest extends Specification implements ManagerContainerTrait {
AssetModelUtil.getAssetDescriptor(ThingAsset.class) != null
AssetModelUtil.getAgentDescriptor(SimulatorAgent.class) != null
- and: "the test asset model provider should have registered test agents and assets"
- AssetModelUtil.getAgentDescriptor(HTTPServerTestAgent.DESCRIPTOR.name).isPresent()
+ when: "the http test server agent descriptor is retrieved (the test asset model provider should have registered test agents and assets)"
+ def testAgentDescriptor = AssetModelUtil.getAgentDescriptor(HTTPServerTestAgent.DESCRIPTOR.name).orElse(null)
+
+ then: "the descriptor should have been found"
+ assert testAgentDescriptor != null
+
+ and: "the descriptor should contain an agent link schema"
+ def schema = testAgentDescriptor.getAgentLinkSchema()
+ assert schema != null
}
def "Serialize/Deserialize asset model"() {
diff --git a/ui/app/console_loader/src/pages/page-mobile-geofences.ts b/ui/app/console_loader/src/pages/page-mobile-geofences.ts
index ed51f0547..04c9e7cf7 100644
--- a/ui/app/console_loader/src/pages/page-mobile-geofences.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-geofences.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property, PropertyValues} from "lit-element";
+import {css, html, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {AppStateKeyed} from "@openremote/or-app/dist/app";
import {Page, PageProvider} from "@openremote/or-app/dist/types";
import {NavigationControl} from "mapbox-gl";
diff --git a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts b/ui/app/console_loader/src/pages/page-mobile-onboarding.ts
index e3ac003eb..fbac595f2 100644
--- a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-onboarding.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property} from "lit-element";
+import {css, html} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {AppStateKeyed} from "@openremote/or-app/dist/app";
import {Page, PageProvider} from "@openremote/or-app/dist/types";
import {EnhancedStore} from "@reduxjs/toolkit";
diff --git a/ui/app/console_loader/src/pages/page-mobile-splash.ts b/ui/app/console_loader/src/pages/page-mobile-splash.ts
index 10e6388a9..4622a298e 100644
--- a/ui/app/console_loader/src/pages/page-mobile-splash.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-splash.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property} from "lit-element";
+import {css, html} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {AppStateKeyed} from "@openremote/or-app/dist/app";
import {Page, PageProvider} from "@openremote/or-app/dist/types";
import {EnhancedStore} from "@reduxjs/toolkit";
diff --git a/ui/app/manager/src/pages/page-account.ts b/ui/app/manager/src/pages/page-account.ts
index 5b3b44684..6c482c40b 100644
--- a/ui/app/manager/src/pages/page-account.ts
+++ b/ui/app/manager/src/pages/page-account.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, TemplateResult} from "lit-element";
+import {css, html, TemplateResult} from "lit";
+import {customElement} from "lit/decorators.js";
import manager from "@openremote/core";
import "@openremote/or-panel";
import "@openremote/or-translate";
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.ts
index fd8cc4e7d..c47b2421d 100644
--- a/ui/app/manager/src/pages/page-assets.ts
+++ b/ui/app/manager/src/pages/page-assets.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property, query, TemplateResult, unsafeCSS} from "lit-element";
+import {css, html, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import "@openremote/or-asset-tree";
import "@openremote/or-asset-viewer";
import {
@@ -6,9 +7,9 @@ import {
OrAssetViewerEditToggleEvent,
OrAssetViewerRequestEditToggleEvent,
OrAssetViewerSaveEvent,
- ViewerConfig,
saveAsset,
- SaveResult
+ SaveResult,
+ ViewerConfig
} from "@openremote/or-asset-viewer";
import {
AssetTreeConfig,
@@ -19,12 +20,12 @@ import {
OrAssetTreeSelectionEvent
} from "@openremote/or-asset-tree";
import {DefaultBoxShadow, Util} from "@openremote/core";
-import {Page, PageProvider, router} from "@openremote/or-app";
-import {AppStateKeyed} from "@openremote/or-app";
+import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";
import {EnhancedStore} from "@reduxjs/toolkit";
import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import i18next from "i18next";
import {AssetEventCause, WellknownAssets} from "@openremote/model";
+import "@openremote/or-json-forms";
export interface PageAssetsConfig {
viewer?: ViewerConfig;
@@ -81,32 +82,32 @@ class PageAssets<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)}
+ box-shadow: ${unsafeCSS(DefaultBoxShadow)}
}
-
+
.hideMobile {
display: flex;
}
-
+
or-asset-viewer,
or-asset-viewer.hideMobile {
display: initial;
diff --git a/ui/app/manager/src/pages/page-export.ts b/ui/app/manager/src/pages/page-export.ts
index 682398bdd..5956bead9 100644
--- a/ui/app/manager/src/pages/page-export.ts
+++ b/ui/app/manager/src/pages/page-export.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, unsafeCSS, TemplateResult, property} from "lit-element";
+import {css, html, unsafeCSS, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-rules";
import {EnhancedStore} from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.ts
index 0bdbe7e05..c06f64eba 100644
--- a/ui/app/manager/src/pages/page-gateway.ts
+++ b/ui/app/manager/src/pages/page-gateway.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";
+import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property} from "lit/decorators.js";
import i18next from "i18next";
import "@openremote/or-panel";
import {ConnectionStatus, GatewayConnection, GatewayConnectionStatusEvent} from "@openremote/model";
diff --git a/ui/app/manager/src/pages/page-insights.ts b/ui/app/manager/src/pages/page-insights.ts
index 5a51f5a4e..3e4599e66 100644
--- a/ui/app/manager/src/pages/page-insights.ts
+++ b/ui/app/manager/src/pages/page-insights.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property, TemplateResult} from "lit-element";
+import {css, html, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-data-viewer";
import {DataViewerConfig} from "@openremote/or-data-viewer";
import {Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/app/manager/src/pages/page-logs.ts b/ui/app/manager/src/pages/page-logs.ts
index add989b9d..52679beb9 100644
--- a/ui/app/manager/src/pages/page-logs.ts
+++ b/ui/app/manager/src/pages/page-logs.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property} from "lit-element";
+import {css, html} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-log-viewer";
import {ViewerConfig} from "@openremote/or-log-viewer";
import {Page, PageProvider} from "@openremote/or-app";
diff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.ts
index 1e566c122..11c09835c 100644
--- a/ui/app/manager/src/pages/page-map.ts
+++ b/ui/app/manager/src/pages/page-map.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property, query} from "lit-element";
+import {css, html} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {Action, createSlice, EnhancedStore, PayloadAction, ThunkAction} from "@reduxjs/toolkit";
import "@openremote/or-map";
import {
diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.ts
index 7c1bd2986..0a843abe3 100644
--- a/ui/app/manager/src/pages/page-realms.ts
+++ b/ui/app/manager/src/pages/page-realms.ts
@@ -1,12 +1,11 @@
import {
css,
- customElement,
html,
- property,
PropertyValues,
TemplateResult,
unsafeCSS,
-} from "lit-element";
+} from "lit";
+import {customElement, property} from "lit/decorators.js";
import manager, { OREvent, DefaultColor3 } from "@openremote/core";
import "@openremote/or-panel";
import "@openremote/or-translate";
diff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.ts
index 482055217..ae21f967a 100644
--- a/ui/app/manager/src/pages/page-roles.ts
+++ b/ui/app/manager/src/pages/page-roles.ts
@@ -1,12 +1,11 @@
import {
css,
- customElement,
html,
- property,
PropertyValues,
TemplateResult,
unsafeCSS,
-} from "lit-element";
+} from "lit";
+import {customElement, property} from "lit/decorators.js";
import manager, { OREvent, DefaultColor3 } from "@openremote/core";
import "@openremote/or-panel";
import "@openremote/or-translate";
diff --git a/ui/app/manager/src/pages/page-rules.ts b/ui/app/manager/src/pages/page-rules.ts
index 68bf1e186..420987e84 100644
--- a/ui/app/manager/src/pages/page-rules.ts
+++ b/ui/app/manager/src/pages/page-rules.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property} from "lit-element";
+import {css, html} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-rules";
import {ActionTargetType, RulesConfig} from "@openremote/or-rules";
import {NotificationTargetType, RulesetLang, WellknownAssets} from "@openremote/model";
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index b763b0f01..03c3e8b4c 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";
+import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property} from "lit/decorators.js";
import manager, {DefaultColor3, OREvent, Util} from "@openremote/core";
import "@openremote/or-panel";
import "@openremote/or-translate";
@@ -478,13 +479,11 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
if (repeatPasswordComponent.value !== passwordComponent.value) {
const error = i18next.t("passwordMismatch");
- repeatPasswordComponent.validationMessage = error;
repeatPasswordComponent.setCustomValidity(error);
- repeatPasswordComponent.helperText = error;
saveBtn.disabled = true;
user.password = "";
} else {
- repeatPasswordComponent.helperText = "";
+ repeatPasswordComponent.setCustomValidity(undefined);
user.password = passwordComponent.value;
saveBtn.disabled = false;
}
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 984380c2e..46d4555a4 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -664,7 +664,8 @@ export class Manager implements EventProviderFactory {
success = this.doRestApiInit();
}
- success = await this.doConsoleInit() && success;
+ // Don't let console registration error prevent loading
+ await this.doConsoleInit();
success = await this.doTranslateInit() && success;
if (success) {
diff --git a/ui/component/or-app/package.json b/ui/component/or-app/package.json
index 47eb08f86..70cc31d59 100644
--- a/ui/component/or-app/package.json
+++ b/ui/component/or-app/package.json
@@ -30,7 +30,7 @@
"@reduxjs/toolkit": "^1.5.0",
"@types/navigo": "^7.0.1",
"@webcomponents/webcomponentsjs": "^2.2.10",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0",
"navigo": "^7.1.3",
"pwa-helpers": "^0.9.0"
diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.ts
index 414e3bec7..59fe14465 100644
--- a/ui/component/or-app/src/index.ts
+++ b/ui/component/or-app/src/index.ts
@@ -1,15 +1,13 @@
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
-import {unsafeHTML} from "lit-html/directives/unsafe-html";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
+import {unsafeHTML} from "lit/directives/unsafe-html";
import {AppConfig, RealmAppConfig, router} from "./types";
import "@openremote/or-translate";
import "@openremote/or-mwc-components/or-mwc-menu";
@@ -382,7 +380,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
consoleStyles = html`<style>:host {--or-console-primary-color:${primary};--or-console-secondary-color:${secondary};}</style>`;
}
return html`
- ${this._config.styles ? typeof(this._config.styles) === "string" ? html`<style>${this._config.styles}</style>` : unsafeHTML(this._config.styles.strings) : ``}
+ ${this._config.styles ? typeof(this._config.styles) === "string" ? html`<style>${this._config.styles}</style>` : this._config.styles.strings : ``}
${consoleStyles}
${this._config.header ? html`
<or-header .logo="${this._config.logo}" .logoMobile="${this._config.logoMobile}" .config="${this._config.header}"></or-header>
diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.ts
index ea4a9a442..9918d1375 100644
--- a/ui/component/or-app/src/or-header.ts
+++ b/ui/component/or-app/src/or-header.ts
@@ -1,5 +1,6 @@
-import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult, unsafeCSS} from "lit-element";
-import {until} from "lit-html/directives/until";
+import {css, html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
+import {until} from "lit/directives/until";
import manager, {
Util,
DefaultBoxShadowBottom,
diff --git a/ui/component/or-app/src/types.ts b/ui/component/or-app/src/types.ts
index 110492304..812e2784d 100644
--- a/ui/component/or-app/src/types.ts
+++ b/ui/component/or-app/src/types.ts
@@ -1,6 +1,6 @@
import {HeaderConfig} from "./or-header";
import {AppStateKeyed} from "./app";
-import { TemplateResult, LitElement } from "lit-element";
+import { TemplateResult, LitElement } from "lit";
import i18next from "i18next";
import { translate } from "@openremote/or-translate";
import { EnhancedStore, AnyAction, Unsubscribe } from "@reduxjs/toolkit";
diff --git a/ui/component/or-asset-tree/package.json b/ui/component/or-asset-tree/package.json
index 14605c1f8..0a5e6c18f 100644
--- a/ui/component/or-asset-tree/package.json
+++ b/ui/component/or-asset-tree/package.json
@@ -18,7 +18,7 @@
"@openremote/or-icon": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/rest": "^1.0.3",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0"
},
"devDependencies": {
diff --git a/ui/component/or-asset-tree/src/index.ts b/ui/component/or-asset-tree/src/index.ts
index 3e918a9a2..806d83c7c 100644
--- a/ui/component/or-asset-tree/src/index.ts
+++ b/ui/component/or-asset-tree/src/index.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-mwc-components/or-mwc-input";
import "@openremote/or-icon";
import {
diff --git a/ui/component/or-asset-tree/src/or-add-asset-dialog.ts b/ui/component/or-asset-tree/src/or-add-asset-dialog.ts
index 8a02f81a9..5e4aaf830 100644
--- a/ui/component/or-asset-tree/src/or-add-asset-dialog.ts
+++ b/ui/component/or-asset-tree/src/or-add-asset-dialog.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, query, unsafeCSS} from "lit-element";
+import {css, html, LitElement, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {AgentDescriptor, Asset, AssetDescriptor, AttributeDescriptor} from "@openremote/model";
import "@openremote/or-mwc-components/or-mwc-input";
import {AssetTreeConfig, OrAssetTreeSelectionEvent} from "./index";
diff --git a/ui/component/or-asset-tree/src/style.ts b/ui/component/or-asset-tree/src/style.ts
index 6e0026245..c62a07e2d 100644
--- a/ui/component/or-asset-tree/src/style.ts
+++ b/ui/component/or-asset-tree/src/style.ts
@@ -1,5 +1,5 @@
-import {css, unsafeCSS} from "lit-element";
-import {DefaultBoxShadow, DefaultColor1, DefaultColor2, DefaultColor4, DefaultColor5} from "@openremote/core";
+import {css, unsafeCSS} from "lit";
+import {DefaultColor1, DefaultColor2, DefaultColor4, DefaultColor5} from "@openremote/core";
import {mdiChevronRight} from "@mdi/js";
import {mdiChevronDown} from "@mdi/js";
diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.json
index de183007e..6c275ecd2 100644
--- a/ui/component/or-asset-viewer/package.json
+++ b/ui/component/or-asset-viewer/package.json
@@ -17,6 +17,7 @@
"@openremote/model": "^1.0.3",
"@openremote/or-attribute-history": "^1.0.4",
"@openremote/or-attribute-input": "^1.0.4",
+ "@openremote/or-json-forms": "^1.0.4",
"@openremote/or-chart": "^1.0.4",
"@openremote/or-icon": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
@@ -26,7 +27,7 @@
"@openremote/or-table": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/rest": "^1.0.3",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 904a8651e..2da2b5047 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -1,7 +1,8 @@
// Declare require method which we'll use for importing webpack resources (using ES6 imports will confuse typescript parser)
declare function require(name: string): any;
-import {customElement, html, LitElement, property, PropertyValues, query, TemplateResult, unsafeCSS} from "lit-element";
+import {html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import "@openremote/or-icon";
import "@openremote/or-mwc-components/or-mwc-input";
import "@openremote/or-attribute-input";
@@ -35,8 +36,8 @@ import {
} from "@openremote/model";
import {panelStyles, style} from "./style";
import i18next, {TOptions, InitOptions} from "i18next";
-import {styleMap} from "lit-html/directives/style-map";
-import {classMap} from "lit-html/directives/class-map";
+import {styleMap} from "lit/directives/style-map";
+import {classMap} from "lit/directives/class-map";
import { GenericAxiosResponse } from "axios";
import {OrIcon} from "@openremote/or-icon";
import "./or-edit-asset-panel";
diff --git a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts b/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts
index 2da9183b6..4efae61c4 100644
--- a/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts
+++ b/ui/component/or-asset-viewer/src/or-add-attribute-panel.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, css, query, PropertyValues} from "lit-element";
+import {html, LitElement, css, PropertyValues} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {InputType, OrMwcInput, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";
import i18next from "i18next";
import {Asset, Attribute} from "@openremote/model";
diff --git a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts
index ae768d3e8..0830dbaab 100644
--- a/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts
+++ b/ui/component/or-asset-viewer/src/or-edit-asset-panel.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, TemplateResult, unsafeCSS} from "lit-element";
+import {css, html, LitElement, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {InputType, OrMwcInput, OrInputChangedEvent, getValueHolderInputTemplateProvider, ValueInputProviderOptions, OrInputChangedEventDetail} from "@openremote/or-mwc-components/or-mwc-input";
import i18next from "i18next";
import {Asset, Attribute, NameValueHolder} from "@openremote/model";
diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.ts
index c3addb885..701acb3a5 100644
--- a/ui/component/or-asset-viewer/src/style.ts
+++ b/ui/component/or-asset-viewer/src/style.ts
@@ -1,4 +1,4 @@
-import {css, unsafeCSS} from "lit-element";
+import {css, unsafeCSS} from "lit";
import {DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5, DefaultColor4, DefaultHeaderHeight} from "@openremote/core";
// language=CSS
diff --git a/ui/component/or-asset-viewer/tsconfig.json b/ui/component/or-asset-viewer/tsconfig.json
index 16a6812a2..356f2f58e 100644
--- a/ui/component/or-asset-viewer/tsconfig.json
+++ b/ui/component/or-asset-viewer/tsconfig.json
@@ -22,6 +22,7 @@
{ "path": "../or-survey-results" },
{ "path": "../or-attribute-input" },
{ "path": "../or-attribute-history" },
- { "path": "../or-mwc-components" }
+ { "path": "../or-mwc-components" },
+ { "path": "../or-json-forms" }
]
}
diff --git a/ui/component/or-attribute-card/package.json b/ui/component/or-attribute-card/package.json
index 6be6396b1..af0b64f6b 100644
--- a/ui/component/or-attribute-card/package.json
+++ b/ui/component/or-attribute-card/package.json
@@ -16,7 +16,7 @@
"@openremote/core": "^1.0.3",
"@openremote/or-chart": "^1.0.4",
"@openremote/or-mwc-components": "^1.0.3",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0"
},
"devDependencies": {
diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.ts
index 5d92b1e5c..e1fa5de52 100644
--- a/ui/component/or-attribute-card/src/index.ts
+++ b/ui/component/or-attribute-card/src/index.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, query, unsafeCSS} from "lit-element";
+import {css, html, LitElement, PropertyValues, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import i18next from "i18next";
import {
Asset,
diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.json
index bd3c8d587..848210d17 100644
--- a/ui/component/or-attribute-history/package.json
+++ b/ui/component/or-attribute-history/package.json
@@ -19,7 +19,7 @@
"@openremote/or-translate": "^1.0.3",
"@openremote/or-chart": "^1.0.4",
"jsonpath-plus": "^5.0.2",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"@types/chart.js": "^2.9.32",
diff --git a/ui/component/or-attribute-history/src/index.ts b/ui/component/or-attribute-history/src/index.ts
index bfff30075..8b316157a 100644
--- a/ui/component/or-attribute-history/src/index.ts
+++ b/ui/component/or-attribute-history/src/index.ts
@@ -3,15 +3,13 @@ declare function require(name: string): any;
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
import {Attribute, AttributeRef, DatapointInterval, ValueDatapoint, ValueDescriptor} from "@openremote/model";
@@ -26,7 +24,7 @@ import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-m
import {MDCDataTable} from "@material/data-table";
import {JSONPath} from "jsonpath-plus";
import moment from "moment";
-import {styleMap} from "lit-html/directives/style-map";
+import {styleMap} from "lit/directives/style-map";
export class OrAttributeHistoryEvent extends CustomEvent<OrAttributeHistoryEventDetail> {
diff --git a/ui/component/or-attribute-input/package.json b/ui/component/or-attribute-input/package.json
index 37678a0d0..7f880cb02 100644
--- a/ui/component/or-attribute-input/package.json
+++ b/ui/component/or-attribute-input/package.json
@@ -16,7 +16,7 @@
"@openremote/or-mwc-components": "^1.0.3",
"@openremote/or-map": "^1.0.4",
"@openremote/or-translate": "^1.0.3",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.ts
index 195a59521..0d8bd4bc8 100644
--- a/ui/component/or-attribute-input/src/index.ts
+++ b/ui/component/or-attribute-input/src/index.ts
@@ -1,15 +1,13 @@
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
-import {ifDefined} from "lit-html/directives/if-defined";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
+import {ifDefined} from "lit/directives/if-defined";
import {i18next, translate} from "@openremote/or-translate";
import {
Attribute,
diff --git a/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts b/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts
index 212f236cc..748d0178b 100644
--- a/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts
+++ b/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts
@@ -1,4 +1,5 @@
-import {LitElement, html, css, query, customElement, property} from "lit-element";
+import {LitElement, html, css} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import "./or-navigation-item";
import { FlattenedNodesObserver } from "@polymer/polymer/lib/utils/flattened-nodes-observer";
import {OrNavigationItem} from "./or-navigation-item";
diff --git a/ui/component/or-bottom-navigation/src/or-navigation-item.ts b/ui/component/or-bottom-navigation/src/or-navigation-item.ts
index fe19b4193..9fd5a7ff6 100644
--- a/ui/component/or-bottom-navigation/src/or-navigation-item.ts
+++ b/ui/component/or-bottom-navigation/src/or-navigation-item.ts
@@ -1,4 +1,5 @@
-import {customElement, LitElement, property} from "lit-element";
+import {LitElement} from "lit";
+import {customElement, property} from "lit/decorators.js";
@customElement("or-navigation-item")
export class OrNavigationItem extends LitElement {
diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.json
index 26f15a327..36eb4fcf5 100644
--- a/ui/component/or-chart/package.json
+++ b/ui/component/or-chart/package.json
@@ -20,12 +20,11 @@
"@openremote/or-mwc-components": "^1.0.3",
"@openremote/or-panel": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
- "@types/chartjs-plugin-annotation": "^0.5.1",
"chart.js": "^3.1.0",
"chartjs-adapter-moment": "^1.0.0",
- "chartjs-plugin-annotation": "next",
+ "chartjs-plugin-annotation": "^1.0.2",
"jsonpath-plus": "^5.0.2",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0"
},
"devDependencies": {
diff --git a/ui/component/or-chart/src/index.ts b/ui/component/or-chart/src/index.ts
index 7a7b49242..bd0640959 100644
--- a/ui/component/or-chart/src/index.ts
+++ b/ui/component/or-chart/src/index.ts
@@ -1,14 +1,12 @@
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
import {Asset, Attribute, AttributeRef, DatapointInterval, WellknownMetaItems, ReadAssetEvent, AssetEvent, ValueDatapoint, AssetQuery} from "@openremote/model";
@@ -507,8 +505,8 @@ export class OrChart extends translate(i18next)(LitElement) {
this._chart.options!.scales!.x!.max = this._endOfPeriod;
(this._chart.options!.scales!.x! as TimeScaleOptions).time!.unit = this._timeUnits!;
(this._chart.options!.scales!.x! as TimeScaleOptions).time!.stepSize = this._stepSize!;
- (this._chart.options!.plugins!.annotation!.annotations![0] as AnnotationOptions<"line">).xMin = now;
- (this._chart.options!.plugins!.annotation!.annotations![0] as AnnotationOptions<"line">).xMax = now;
+ (this._chart.options!.plugins!.annotation!.annotations! as AnnotationOptions<"line">[])[0].xMin = now;
+ (this._chart.options!.plugins!.annotation!.annotations! as AnnotationOptions<"line">[])[0].xMax = now;
this._chart.data.datasets = this._data;
this._chart.update();
}
diff --git a/ui/component/or-data-viewer/package.json b/ui/component/or-data-viewer/package.json
index 6df738cc0..4fed496e1 100644
--- a/ui/component/or-data-viewer/package.json
+++ b/ui/component/or-data-viewer/package.json
@@ -24,7 +24,7 @@
"@openremote/or-panel": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@openremote/rest": "^1.0.3",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-data-viewer/src/index.ts b/ui/component/or-data-viewer/src/index.ts
index 8d78bd6b5..056077e07 100644
--- a/ui/component/or-data-viewer/src/index.ts
+++ b/ui/component/or-data-viewer/src/index.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-chart";
import "@openremote/or-translate";
import {translate} from "@openremote/or-translate";
@@ -7,8 +8,8 @@ import {OrChartConfig, OrChartEvent} from "@openremote/or-chart";
import {Asset, Attribute} from "@openremote/model";
import {style} from "./style";
import i18next from "i18next";
-import {styleMap} from "lit-html/directives/style-map";
-import {classMap} from "lit-html/directives/class-map";
+import {styleMap} from "lit/directives/style-map";
+import {classMap} from "lit/directives/class-map";
import "@openremote/or-attribute-card";
export type PanelType = "chart" | "kpi";
diff --git a/ui/component/or-data-viewer/src/style.ts b/ui/component/or-data-viewer/src/style.ts
index f1793e76f..4bfef011f 100644
--- a/ui/component/or-data-viewer/src/style.ts
+++ b/ui/component/or-data-viewer/src/style.ts
@@ -1,4 +1,4 @@
-import {css, unsafeCSS} from "lit-element";
+import {css, unsafeCSS} from "lit";
import {DefaultBoxShadow, DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5} from "@openremote/core";
// language=CSS
diff --git a/ui/component/or-icon/package.json b/ui/component/or-icon/package.json
index d8995ee91..39297c5d9 100644
--- a/ui/component/or-icon/package.json
+++ b/ui/component/or-icon/package.json
@@ -13,7 +13,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"terser-webpack-plugin": "^5.1.1",
diff --git a/ui/component/or-icon/src/index.ts b/ui/component/or-icon/src/index.ts
index 623a06ab6..dbec3e7be 100644
--- a/ui/component/or-icon/src/index.ts
+++ b/ui/component/or-icon/src/index.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {AssetDescriptor, WellknownAssets} from "@openremote/model";
import {IconSetAddedEvent, ORIconSets, AssetModelUtil} from "@openremote/core";
diff --git a/ui/component/or-json-forms/.npmignore b/ui/component/or-json-forms/.npmignore
new file mode 100644
index 000000000..17e64b1ad
--- /dev/null
+++ b/ui/component/or-json-forms/.npmignore
@@ -0,0 +1,8 @@
+build/
+build.gradle
+test/
+src/
+webpack.config.js
+tsconfig.json
+dist/*.map
+.tsbuildinfo
\ No newline at end of file
diff --git a/ui/component/or-json-forms/README.md b/ui/component/or-json-forms/README.md
new file mode 100644
index 000000000..520e8fc9e
--- /dev/null
+++ b/ui/component/or-json-forms/README.md
@@ -0,0 +1,114 @@
+# @openremote/or-map \<or-map\>
+[![NPM Version][npm-image]][npm-url]
+[![Linux Build][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
+Web Component for displaying a Mapbox map; either raster or vector (default). This component requires an OpenRemote
+Manager to retrieve map settings and tiles.
+
+## Install
+```bash
+npm i @openremote/or-map
+yarn add @openremote/or-map
+```
+
+## Usage
+For a full list of properties, methods and options refer to the TypeDoc generated [documentation]().
+
+```$html
+<or-map center="5.454250, 51.445990" zoom="5" style="height: 500px; width: 100%;" />
+```
+
+For a raster map (raster tile serving in the OpenRemote Manager must be properly configured):
+
+```$html
+<or-map type="RASTER" center="5.454250, 51.445990" zoom="5" style="height: 500px; width: 100%;" />
+```
+
+The center and zoom are optional overrides for the defaults that will be defined in the `mapsettings` loaded from the
+OpenRemote Manager; each realm can have different `mapsettings` with a fallback to the default.
+
+Markers can be added via markup as children:
+
+```$html
+<or-map id="vectorMap" center="5.454250, 51.445990" zoom="5" style="height: 500px; width: 100%;">
+ <or-map-marker id="demo-marker" lng="5.454250" class="marker" icon="or:logo-plain"></or-map-marker>
+</or-map>
+```
+
+Or programmatically:
+
+```$typescript
+const vectorMap = docuemnt.getElementById("vectorMap");
+const assetMarker = document.createElement("or-map-marker-asset");
+assetMarker.setAttribute("asset", apartment1.id!);
+vectorMap.appendChild(assetMarker);
+```
+
+There are two types of built in markers:
+
+### \<or-map-marker\>
+This is a basic marker and the base class for any other markers and it has the following attributes:
+
+* lat*
+* lng*
+* visible (show/hide the marker)
+* icon (uses `or-icon` to render an icon inside the default marker)
+* interactive (sets pointer events for the marker)
+
+*required
+
+The visual content of the marker can be controlled by adding child content to the `or-map-marker` element; any child
+content is rendered inside a `div`. If no children are specified then the default marker will be used. Subclasses can
+override the `createMarkerContent()` method to control the look of the marker.
+
+### \<or-map-marker-asset\>
+This links the marker to an Asset in the OpenRemote Manager by using the `asset-mixin` and adds the following attribute:
+
+* asset* (ID of the Asset to link)
+
+*required
+
+The Asset must be valid, accessible and must have a valid `location` attribute otherwise no marker will be shown. By
+default the `AssetType` is used to set the icon of the marker but this can be controlled by setting the `assetTypeAsIcon`
+property.
+
+### Styling
+All styling is done through CSS, the following CSS variables can be used:
+
+```$css
+--or-map-marker-fill (default: #1D5632)
+--or-map-marker-stroke (default: none)
+--or-map-marker-width (default: 48px)
+--or-map-marker-height (default: 48px)
+--or-map-marker-transform (default: translate(-24px, -45px))
+
+--or-map-marker-icon-fill (default: #FFF)
+--or-map-marker-icon-stroke (default: none)
+--or-map-marker-icon-width (default: 24px)
+--or-map-marker-icon-height (default: 24px)
+--or-map-marker-icon-transform (default: translate(-50%, -19px))
+```
+
+### Events
+The following DOM events may be fired by the component and markers:
+
+* `click` - Standard click event is fired when the map itself is clicked
+* `OrMapMarkerEvent.CLICKED` - A map marker has been clicked; details contains the clicked `marker`
+* `OrMapMarkerEvent.CHANGED` - A map marker has been modified; details contains the changed `marker` and name of changed
+`property`
+
+## 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-map
+[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
\ No newline at end of file
diff --git a/ui/component/or-json-forms/build.gradle b/ui/component/or-json-forms/build.gradle
new file mode 100644
index 000000000..fe40d4a65
--- /dev/null
+++ b/ui/component/or-json-forms/build.gradle
@@ -0,0 +1,13 @@
+task clean() {
+ doLast {
+ delete "dist"
+ }
+}
+
+task prepareUi() {
+ dependsOn clean, npmPrepare
+}
+
+task publishUi() {
+ dependsOn clean, npmPublish
+}
\ No newline at end of file
diff --git a/ui/component/or-json-forms/package.json b/ui/component/or-json-forms/package.json
new file mode 100644
index 000000000..03a6f4a96
--- /dev/null
+++ b/ui/component/or-json-forms/package.json
@@ -0,0 +1,31 @@
+{
+ "name": "@openremote/or-json-forms",
+ "version": "1.0.4",
+ "description": "Renders a JSON schema and provides instance editing",
+ "main": "dist/umd/index.bundle.js",
+ "module": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "scripts": {
+ "build": "npx tsc -b",
+ "test": "echo \"No tests\" && exit 0",
+ "prepublishOnly": "npx tsc -b && npx webpack"
+ },
+ "author": "OpenRemote",
+ "license": "AGPL-3.0-or-later",
+ "dependencies": {
+ "@openremote/or-mwc-components": "^1.0.3",
+ "@polymer/polymer": "^3.3.1",
+ "lit": "^2.0.0-rc.2",
+ "haunted": "^4.8.1"
+ },
+ "devDependencies": {
+ "@jsonforms/core": "^3.0.0-alpha.0",
+ "tslint": ">=5.11.0",
+ "typescript": ">=4.1.3",
+ "webpack": "^5.16.0",
+ "webpack-cli": "^4.4.0"
+ },
+ "publishConfig": {
+ "access": "public"
+ }
+}
diff --git a/ui/component/or-json-forms/src/base-element.ts b/ui/component/or-json-forms/src/base-element.ts
new file mode 100644
index 000000000..304c6962b
--- /dev/null
+++ b/ui/component/or-json-forms/src/base-element.ts
@@ -0,0 +1,56 @@
+import {LitElement} from "lit";
+import {property} from "lit/decorators.js";
+import {
+ JsonFormsCellRendererRegistryEntry,
+ JsonFormsRendererRegistryEntry,
+ JsonFormsUISchemaRegistryEntry,
+ JsonSchema,
+ OwnPropsOfRenderer,
+ UISchemaElement
+} from '@jsonforms/core';
+import "./unknown-element";
+import {JsonFormsStateContext} from "./index";
+
+export abstract class BaseElement<T extends UISchemaElement, P extends OwnPropsOfRenderer> extends LitElement implements OwnPropsOfRenderer {
+
+ @property({type: Object})
+ public state!: JsonFormsStateContext;
+
+ @property({type: Object})
+ public uischema!: T;
+
+ @property({type: Object})
+ public schema!: JsonSchema;
+
+ @property({type: String, attribute: false})
+ public data: any;
+
+ @property({type: Array})
+ public renderers?: JsonFormsRendererRegistryEntry[];
+
+ @property({type: Array})
+ public cells?: JsonFormsCellRendererRegistryEntry[];
+
+ @property({type: String, attribute: false})
+ public config: any;
+
+ @property({type: Array})
+ public uischemas?: JsonFormsUISchemaRegistryEntry[];
+
+ @property({type: Boolean})
+ public enabled!: boolean;
+
+ @property({type: Boolean})
+ public visible!: boolean;
+
+ @property({type: String})
+ public path!: string;
+
+ @property({type: String})
+ public title!: string;
+
+ public set props(props: P) {
+ delete (props as any).id;
+ Object.assign(this, props);
+ }
+}
diff --git a/ui/component/or-json-forms/src/controls/control-array-element.ts b/ui/component/or-json-forms/src/controls/control-array-element.ts
new file mode 100644
index 000000000..110828d2a
--- /dev/null
+++ b/ui/component/or-json-forms/src/controls/control-array-element.ts
@@ -0,0 +1,446 @@
+import {
+ computeLabel,
+ ControlElement,
+ createDefaultValue,
+ JsonSchema,
+ mapDispatchToArrayControlProps,
+ Paths,
+ RendererProps,
+ Resolve,
+ update
+} from "@jsonforms/core";
+import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement} from "lit/decorators.js";
+import {AnyOfInfo, getAnyOfInfos, getTemplateFromProps} from "../util";
+import {InputType, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";
+import {i18next} from "@openremote/or-translate";
+import {showDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
+import "@openremote/or-mwc-components/or-mwc-list";
+import {baseStyle} from "../styles";
+import {ListItem, OrMwcListChangedEvent} from "@openremote/or-mwc-components/or-mwc-list";
+import {DefaultColor4, DefaultColor5} from "@openremote/core";
+import "../json-editor";
+import {JsonEditor} from "../json-editor";
+import {ControlBaseElement} from "./control-base-element";
+import {WithRequired} from "..";
+
+// language=CSS
+const style = css`
+ :host, .drag-wrapper {
+ position: relative;
+ border-color: var(--or-app-color5, ${unsafeCSS(DefaultColor5)});
+ border-radius: 4px;
+ border-width: 1px;
+ border-style: solid;
+ }
+
+ #expander {
+ --or-icon-width: 20px;
+ --or-icon-height: 20px;
+ cursor: pointer;
+ flex: 1 1 auto;
+ }
+
+ #expander > * {
+ pointer-events: none;
+ }
+
+ #expander > or-icon {
+ vertical-align: middle;
+ margin-right: 6px;
+ margin-left: -5px;
+ }
+
+ #header {
+ display: flex;
+ align-items: center;
+ height: 50px;
+ }
+
+ #content {
+ display: flex;
+ flex-direction: column;
+ }
+
+ #add-parameter {
+ margin: 10px 0 0 4px;
+ }
+
+ :host, .padded {
+ padding: 10px 16px;
+ }
+
+ .element-container {
+ flex: 1;
+ border-left-width: 1px;
+ border-left-style: solid;
+ border-left-color: var(--or-app-color5, ${unsafeCSS(DefaultColor5)});
+ }
+
+ .element-container > .item-container > or-json-forms-array-control, .element-container > .item-container > or-json-forms-vertical-layout {
+ border: none;
+ }
+
+ .element-container > .item-container {
+ margin: 0;
+ flex: 1;
+ }
+
+ .element-container > .item-container > .delete-container {
+ display: none;
+ }
+
+ .drag-wrapper {
+ flex: 1 1 auto;
+ display: flex;
+ }
+
+ .draggable.dragging {
+ opacity: 0.5;
+ }
+
+ .draggable.indicator-after {
+ border-bottom-width: 3px;
+ border-bottom-style: solid;
+ border-bottom-color: var(--or-app-color4, ${unsafeCSS(DefaultColor4)});
+ }
+
+ .draggable.indicator-before {
+ border-top-width: 3px;
+ border-top-style: solid;
+ border-top-color: var(--or-app-color4, ${unsafeCSS(DefaultColor4)});
+ }
+
+ .drag-handle {
+ margin: 3px;
+ cursor: grab;
+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3E%3Cg%3E%3Cellipse fill='%23cecece' cx='5' cy='5' rx='2.5' ry='2.5'/%3E%3C/g%3E%3C/svg%3E");
+ flex: 0 0 auto;
+ width: 20px;
+ }
+`;
+
+const controlWithoutLabel = (scope: string): ControlElement => ({
+ type: 'Control',
+ scope: scope,
+ label: false
+});
+
+@customElement("or-json-forms-array-control")
+export class ControlArrayElement extends ControlBaseElement {
+
+ protected resolvedSchema!: JsonSchema;
+ protected itemInfos: AnyOfInfo[] | undefined;
+ protected addItem!: (value: any) => void;
+ protected removeItem!: (index: number) => void;
+ protected moveItem!: (fromIndex: number, toIndex: number) => void;
+
+ public static get styles() {
+ return [
+ baseStyle,
+ style
+ ];
+ }
+
+ shouldUpdate(_changedProperties: PropertyValues): boolean {
+ if (_changedProperties.has("schema")) {
+ this.itemInfos = undefined;
+ this.resolvedSchema = Resolve.schema(this.schema, 'items', this.rootSchema);
+
+ if (Array.isArray(this.resolvedSchema.anyOf)) {
+ this.itemInfos = getAnyOfInfos(this.resolvedSchema.anyOf, this.rootSchema);
+ }
+ }
+
+ if (_changedProperties.has("state")) {
+ const dispatchMethods = mapDispatchToArrayControlProps(this.state.dispatch);
+ this.addItem = (value) => dispatchMethods.addItem(this.path, value)();
+ this.removeItem = (index) => {
+ dispatchMethods.removeItems!(this.path, [index])();
+ };
+ this.moveItem = (fromIndex, toIndex) => {
+ const move = (input: [], from: number, to: number) => {
+ let numberOfDeletedElm = 1;
+ const elm = input.splice(from, numberOfDeletedElm)[0];
+ numberOfDeletedElm = 0;
+ input.splice(to, numberOfDeletedElm, elm);
+ };
+
+ this.state.dispatch(
+ update(this.path, array => {
+ move(array, fromIndex, toIndex);
+ return array;
+ })
+ );
+ };
+ }
+
+ return super.shouldUpdate(_changedProperties);
+ }
+
+ render() {
+
+ const maxItems = this.schema.maxItems ?? Number.MAX_SAFE_INTEGER;
+ const itemCount = Array.isArray(this.data) ? (this.data as []).length : 0;
+
+ return html`
+ <div id="panel">
+ <div id="header">
+ <div id="expander"><or-icon icon="chevron-right"></or-icon><span>${this.title || this.label}</span></div>
+ <div id="header-buttons"><or-mwc-input .type="${InputType.BUTTON}" outlined .label="${i18next.t("json")}" icon="pencil" @click="${() => this._showJson()}"></or-mwc-input></div>
+ </div>
+ <div id="content" @dragover="${(ev: DragEvent) => this._onDragOver(ev)}">
+
+ ${!Array.isArray(this.data) ? `` : (this.data as any[]).map((item, index) => {
+
+ const childPath = Paths.compose(this.path, `${index}`);
+
+ const props: RendererProps & WithRequired = {
+ renderers: this.renderers,
+ uischema: controlWithoutLabel("#"),
+ enabled: this.enabled,
+ visible: this.visible,
+ path: childPath,
+ schema: this.resolvedSchema,
+ required: false
+ };
+
+ return this.getArrayItemWrapper(getTemplateFromProps(this.state, props), index);
+ })}
+
+ </div>
+
+ <div id="add-parameter">
+ <or-mwc-input .disabled="${itemCount && itemCount >= maxItems}" .type="${InputType.BUTTON}" .label="${i18next.t("addItem")}" icon="plus" @click="${() => this.doAddItem()}"></or-mwc-input>
+ </div>
+ </div>
+ `;
+ }
+
+ protected getArrayItemWrapper(elementTemplate: TemplateResult, index: number) {
+ return html`
+ <div class="item-container draggable" data-index="${index}" draggable="true" @dragstart="${(ev: DragEvent) => this._onDragStart(ev)}" @dragend="${(ev: DragEvent) => this._onDragEnd(ev)}">
+ <div class="drag-wrapper">
+ <div class="drag-handle"></div>
+ <div class="element-container">
+ ${elementTemplate}
+ </div>
+ </div>
+ <div class="delete-container">
+ <button class="button-clear" @click="${() => this.removeItem(index)}"><or-icon icon="close-circle"></or-icon></input>
+ </div>
+ </div>
+ `;
+ }
+
+ protected _onDragStart(ev: DragEvent) {
+ const dragging = ev.currentTarget as HTMLDivElement;
+ dragging.classList.add("dragging");
+ }
+
+ protected _onDragEnd(ev: DragEvent) {
+ const container = this.shadowRoot!.getElementById("content") as HTMLDivElement;
+ const draggables = [...(container.children as any)] as HTMLDivElement[];
+ const dragging = ev.currentTarget as HTMLDivElement;
+ dragging.classList.remove("dragging");
+ const index = Number(dragging.getAttribute("data-index"));
+ const afterIndex = dragging.getAttribute("data-after-index") !== null ? Number(dragging.getAttribute("data-after-index")) : (this.data as []).length - 1;
+
+ draggables.forEach(draggable => draggable.classList.remove("indicator-before", "indicator-after"));
+
+ if (index === afterIndex) {
+ return;
+ }
+
+ this.moveItem(index, afterIndex);
+ }
+
+ protected _onDragOver(ev: DragEvent) {
+ ev.preventDefault();
+
+ const container = ev.currentTarget as HTMLDivElement;
+ const draggables = [...((this.shadowRoot!.querySelectorAll(".draggable:not(.dragging)") as any) as HTMLDivElement[])];
+ const initial = {offset: Number.NEGATIVE_INFINITY, element: null} as {
+ offset: number,
+ element: HTMLDivElement | null
+ };
+
+ const afterItem = draggables.reduce((closest, child) => {
+ const box = child.getBoundingClientRect();
+ const offset = ev.clientY - box.top - box.height / 2;
+ if (offset < 0 && offset > closest.offset) {
+ return {offset: offset, element: child};
+ } else {
+ return closest;
+ }
+ }, initial).element;
+
+ const dragging = this.shadowRoot!.querySelector(".dragging") as HTMLDivElement;
+ draggables.forEach(draggable => draggable.classList.remove("indicator-before", "indicator-after"));
+
+ if (afterItem === null) {
+ draggables[draggables.length-1].classList.add("indicator-after");
+ dragging.removeAttribute("data-after-index");
+ } else {
+ const afterIndex = afterItem.getAttribute("data-index");
+ afterItem.classList.add("indicator-before");
+ if (afterIndex !== null) {
+ dragging.setAttribute("data-after-index", afterIndex);
+ } else {
+ dragging.removeAttribute("data-after-index");
+ }
+ }
+ }
+
+ protected _showJson() {
+ const dialog = showDialog(
+ {
+ content: html`
+ <or-json-forms-json-editor id="json-editor" .json="${this.data === undefined ? "" : JSON.stringify(this.data, null, 2)}"></or-json-forms-json-editor>
+ `,
+ actions: [
+ {
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ },
+ {
+ default: true,
+ actionName: "update",
+ action: () => {
+ const editor = dialog.shadowRoot!.getElementById("json-editor") as JsonEditor;
+ if (editor.validate()) {
+ const data = !!editor.getValue() ? JSON.parse(editor.getValue()!) : undefined;
+ this.state.dispatch(
+ update(this.path || "", (d) => {
+ return data;
+ })
+ )
+ }
+ },
+ content: html`<or-mwc-input id="add-btn" .type="${InputType.BUTTON}" .label="${i18next.t("update")}"></or-mwc-input>`
+ }
+ ],
+ title: this.title || this.schema.title,
+ dismissAction: null,
+ styles: html`
+ <style>
+ .mdc-dialog__surface {
+ width: 1024px;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+ }
+ #dialog-content {
+ border-color: var(--or-app-color5, ${unsafeCSS(DefaultColor5)});
+ border-top-width: 1px;
+ border-top-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ padding: 0;
+ overflow: visible;
+ height: 60vh;
+ }
+ </style>
+ `
+ }
+ )
+ }
+
+ protected doAddItem() {
+ if (!this.resolvedSchema) {
+ return;
+ }
+
+ if (this.itemInfos) {
+ this.showAddDialog();
+ } else {
+ this.addItem(createDefaultValue(this.resolvedSchema));
+ }
+ }
+
+ protected showAddDialog() {
+
+ let selectedItemInfo: AnyOfInfo | undefined;
+
+ const listItems: ListItem[] = this.itemInfos!.map((itemInfo, index) => {
+ const labelStr = itemInfo.title ? computeLabel(itemInfo.title, false, true) : "";
+ return {
+ text: labelStr,
+ value: labelStr,
+ data: itemInfo
+ }
+ });
+
+ const onParamChanged = (itemInfo: AnyOfInfo) => {
+ selectedItemInfo = itemInfo;
+ const descElem = dialog.shadowRoot!.getElementById("parameter-desc") as HTMLDivElement;
+ descElem.innerHTML = itemInfo.description || "";
+ (dialog.shadowRoot!.getElementById("add-btn") as OrMwcInput).disabled = false;
+ };
+
+ const dialog = showDialog({
+ content: html`
+ <div class="col">
+ <form id="mdc-dialog-form-add" class="row">
+ <div id="type-list" class="col">
+ <or-mwc-list @or-mwc-list-changed="${(evt: OrMwcListChangedEvent) => {if (evt.detail.length === 1) onParamChanged((evt.detail[0] as ListItem).data as AnyOfInfo); }}" .listItems="${listItems.sort((a,b) => a.text!.localeCompare(b.text!))}" id="parameter-list"></or-mwc-list>
+ </div>
+ <div id="parameter-desc" class="col"></div>
+ </form>
+ </div>
+ `,
+ styles: html`
+ <style>
+ .mdc-dialog__surface {
+ width: 800px;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+ }
+ #dialog-content {
+ border-color: var(--or-app-color5, ${unsafeCSS(DefaultColor5)});
+ border-top-width: 1px;
+ border-top-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ padding: 0;
+ overflow: visible;
+ }
+ form {
+ display: flex;
+ }
+ #type-list {
+ overflow: auto;
+ min-width: 150px;
+ max-width: 300px;
+ flex: 0 0 40%;
+ border-right: 1px solid var(--or-app-color5, #CCC);
+ }
+ #parameter-list {
+ display: flex;
+ }
+ #parameter-desc {
+ padding: 5px;
+ }
+ </style>
+ `,
+ title: i18next.t("addItem"),
+ actions: [
+ {
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ },
+ {
+ default: true,
+ actionName: "add",
+ action: () => {
+ if (selectedItemInfo) {
+ const value = selectedItemInfo.defaultValueCreator();
+ this.addItem(value);
+ }
+ },
+ content: html`<or-mwc-input id="add-btn" .type="${InputType.BUTTON}" disabled .label="${i18next.t("add")}"></or-mwc-input>`
+ }
+ ],
+ dismissAction: null
+ });
+ }
+}
diff --git a/ui/component/or-json-forms/src/controls/control-base-element.ts b/ui/component/or-json-forms/src/controls/control-base-element.ts
new file mode 100644
index 000000000..ae7e2e31d
--- /dev/null
+++ b/ui/component/or-json-forms/src/controls/control-base-element.ts
@@ -0,0 +1,71 @@
+import {
+ ControlElement,
+ ControlProps,
+ createId,
+ isControl,
+ JsonSchema,
+ Labels,
+ mapDispatchToControlProps,
+ OwnPropsOfControl,
+ removeId,
+ StatePropsOfControl
+} from "@jsonforms/core";
+import {PropertyValues} from "lit";
+import {property} from "lit/decorators.js";
+import {BaseElement} from "../base-element";
+
+export abstract class ControlBaseElement extends BaseElement<ControlElement, ControlProps> implements OwnPropsOfControl, ControlProps {
+
+ @property()
+ public label!: string | Labels;
+
+ @property()
+ public description?: string | undefined;
+
+ @property()
+ public required?: boolean | undefined;
+
+ @property()
+ public errors!: string;
+
+ @property()
+ public rootSchema!: JsonSchema;
+
+ public handleChange!: (path: string, data: any) => void;
+
+ constructor() {
+ super();
+ }
+
+ updated(_changedProperties: PropertyValues) {
+ super.updated(_changedProperties);
+
+ if (_changedProperties.has("state")) {
+ const { handleChange } = mapDispatchToControlProps(this.state.dispatch);
+ this.handleChange = handleChange;
+ }
+ }
+
+ public shouldUpdate(changedProperties: PropertyValues): boolean {
+
+ if (changedProperties.has("uischema")) {
+ if (isControl(this.uischema)) {
+ const oldSchemaValue = (changedProperties.get("uischema") as ControlElement);
+ if (oldSchemaValue?.scope !== this.uischema?.scope) {
+ if (this.id) {
+ removeId(this.id);
+ }
+ this.id = createId(this.uischema.scope);
+ }
+ }
+ }
+
+ return true;
+ }
+
+ public disconnectedCallback() {
+ if (isControl(this.uischema)) {
+ removeId(this.id);
+ }
+ }
+}
diff --git a/ui/component/or-json-forms/src/controls/control-input-element.ts b/ui/component/or-json-forms/src/controls/control-input-element.ts
new file mode 100644
index 000000000..ce8f35d5d
--- /dev/null
+++ b/ui/component/or-json-forms/src/controls/control-input-element.ts
@@ -0,0 +1,155 @@
+import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
+import {css, html, PropertyValues } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import {ControlBaseElement} from "./control-base-element";
+import {baseStyle} from "../styles";
+import { isBooleanControl,
+ isEnumControl, isIntegerControl, isNumberControl, isOneOfEnumControl, isRangeControl, isStringControl, JsonSchema, JsonSchema7 } from "@jsonforms/core";
+import {isEnumArray} from "../renderers";
+
+// language=CSS
+const style = css`
+ or-mwc-input {
+ width: 100%;
+ }
+`;
+
+@customElement("or-json-forms-input-control")
+export class ControlInputElement extends ControlBaseElement {
+
+ protected inputType!: InputType;
+
+ public static get styles() {
+ return [
+ baseStyle,
+ style
+ ];
+ }
+
+ render() {
+
+ const uischema = this.uischema;
+ const schema = this.schema;
+ const format = this.schema.format;
+
+ this.inputType = InputType.TEXT;
+ let step: number | undefined;
+ let min: number | undefined;
+ let minLength: number | undefined;
+ let max: number | undefined;
+ let maxLength: number | undefined;
+ let pattern: string | undefined;
+ let options: [string, string][] | undefined;
+ let multiple = false;
+ let value: any = this.data ?? schema.default;
+
+ if (isBooleanControl(uischema, schema)) {
+ this.inputType = InputType.CHECKBOX;
+ } else if (isNumberControl(uischema, schema) || isIntegerControl(uischema, schema)) {
+ step = isNumberControl(uischema, schema) ? 0.1 : 1;
+ this.inputType = InputType.NUMBER;
+ min = schema.minimum;
+ max = schema.maximum;
+
+ step = schema.multipleOf || step;
+
+ if (min !== undefined && max !== undefined && format === "or-range") {
+ // Limit to 200 graduations
+ if ((max-min)/step <= 200) {
+ this.inputType = InputType.RANGE;
+ }
+ }
+
+ } else if (
+ isEnumControl(uischema, schema)
+ || isOneOfEnumControl(uischema, schema)
+ || isEnumArray(uischema, schema)) {
+
+ this.inputType = InputType.SELECT;
+
+ if (isEnumControl(uischema, schema)) {
+ if (schema.const) {
+ // Don't show const
+ return html``;
+ }
+
+ options = schema.enum!.map(enm => {
+ return [JSON.stringify(enm), String(enm)];
+ });
+ } else if (isOneOfEnumControl(uischema, schema)) {
+ options = (schema.oneOf as JsonSchema[]).map(s => {
+ return [JSON.stringify(s.const), String(s.const)];
+ })
+ } else {
+
+ multiple = true;
+
+ if ((schema.items! as JsonSchema).oneOf!) {
+ options = (schema.items! as JsonSchema).oneOf!.map(s => {
+ return [JSON.stringify(s.const), String(s.const)];
+ })
+ } else {
+ options = (schema.items! as JsonSchema).enum!.map(enm => {
+ return [JSON.stringify(enm), String(enm)];
+ })
+ }
+ }
+
+ if (multiple) {
+ value = Array.isArray(value) ? value.map(v => JSON.stringify(v)) : value !== undefined ? [JSON.stringify(value)] : undefined;
+ } else {
+ value = value !== undefined ? JSON.stringify(value) : undefined;
+ }
+ } else if (isStringControl(uischema, schema)) {
+ minLength = schema.minLength;
+ maxLength = schema.maxLength;
+ pattern = schema.pattern;
+
+ if (format === "date-time") {
+ this.inputType = InputType.DATETIME;
+ } else if (format === "date") {
+ this.inputType = InputType.DATE;
+ } else if (format === "time") {
+ this.inputType = InputType.TIME;
+ } else if (format === "email") {
+ this.inputType = InputType.EMAIL;
+ } else if (format === "tel") {
+ this.inputType = InputType.TELEPHONE;
+ } else if (format === "or-multiline") {
+ this.inputType = InputType.TEXTAREA;
+ } else if (format === "or-password" || (schema as any).writeOnly) {
+ this.inputType = InputType.PASSWORD;
+ }
+ }
+
+ return html`<or-mwc-input
+ .label="${this.label}"
+ .type="${this.inputType}"
+ .disabled="${!this.enabled}"
+ .required="${!!this.required}"
+ .id="${this.id}"
+ .options="${options}"
+ .multiple="${multiple}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => this.onValueChanged(e)}"
+ .maxLength="${maxLength}"
+ .minLength="${minLength}"
+ .pattern="${pattern}"
+ .validationMessage="${this.errors}"
+ .step="${step}"
+ .max="${max}"
+ .min="${min}"
+ .value="${value}"></or-mwc-input>`;
+ }
+
+ protected onValueChanged(e: OrInputChangedEvent) {
+ if (this.inputType === InputType.SELECT) {
+ if (Array.isArray(e.detail.value)) {
+ this.handleChange(this.path!, (e.detail.value as []).map((v: string) => JSON.parse(v)));
+ } else {
+ this.handleChange(this.path!, JSON.parse((e.detail.value as string)));
+ }
+ } else {
+ this.handleChange(this.path!, e.detail.value);
+ }
+ }
+}
diff --git a/ui/component/or-json-forms/src/haunted-element.ts b/ui/component/or-json-forms/src/haunted-element.ts
new file mode 100644
index 000000000..1b09763d7
--- /dev/null
+++ b/ui/component/or-json-forms/src/haunted-element.ts
@@ -0,0 +1,34 @@
+/**
+ * This adds haunted (react style hooks) to lit element
+ */
+import { LitElement, PropertyValues } from "lit";
+import { State } from "haunted";
+
+const defer = Promise.resolve().then.bind(Promise.resolve());
+
+export class HauntedLitElement extends LitElement {
+
+ protected haunted: State;
+
+ constructor() {
+ super();
+ this.haunted = new State(() => this.requestUpdate(), this);
+ }
+
+ update(_changedProperties: PropertyValues) {
+ this.haunted.run(() => {
+ super.update(_changedProperties);
+ });
+ }
+
+ updated(_changedProperties: PropertyValues) {
+ super.updated(_changedProperties);
+ this.haunted.runLayoutEffects();
+ defer(() => this.haunted.runEffects());
+ }
+
+ disconnectedCallback() {
+ this.haunted.teardown();
+ super.disconnectedCallback();
+ }
+}
\ No newline at end of file
diff --git a/ui/component/or-json-forms/src/index.ts b/ui/component/or-json-forms/src/index.ts
new file mode 100644
index 000000000..c9e81cc05
--- /dev/null
+++ b/ui/component/or-json-forms/src/index.ts
@@ -0,0 +1,185 @@
+import {css, html} from "lit";
+import {customElement, property} from "lit/decorators.js";
+import {guard} from "lit/directives/guard";
+import {ErrorObject} from "ajv";
+import {HauntedLitElement} from "./haunted-element";
+import {
+ Actions,
+ configReducer,
+ CoreActions,
+ coreReducer,
+ createAjv,
+ Dispatch,
+ generateDefaultUISchema,
+ generateJsonSchema,
+ JsonFormsCellRendererRegistryEntry,
+ JsonFormsRendererRegistryEntry,
+ JsonFormsSubStates,
+ JsonFormsUISchemaRegistryEntry,
+ JsonSchema,
+ mapStateToJsonFormsRendererProps,
+ OwnPropsOfJsonFormsRenderer,
+ StatePropsOfJsonFormsRenderer,
+ UISchemaElement
+} from "@jsonforms/core";
+import {renderers} from "./renderers";
+import {getTemplateFromProps} from "./util";
+import {useEffect, useMemo, useReducer, useRef} from "haunted";
+import {baseStyle} from "./styles";
+
+declare global {
+ interface SymbolConstructor {
+ readonly observable: symbol;
+ }
+}
+
+export {ErrorObject};
+
+export interface JsonFormsStateContext extends JsonFormsSubStates {
+ dispatch: Dispatch<CoreActions>;
+}
+
+export interface WithTitle {
+ title?: string;
+}
+
+export interface WithRequired {
+ required?: boolean;
+}
+
+// language=CSS
+const styles = css`
+ .delete-container {
+ width: 0;
+ }
+
+ .item-container {
+ margin: 0; /* Remove inherited margin */
+ }
+`;
+
+/**
+ * Hook similar to `useEffect` with the difference that the effect
+ * is only executed from the second call onwards.
+ */
+const useEffectAfterFirstRender = (
+ effect: () => void,
+ dependencies: Array<any>
+) => {
+ const firstExecution = useRef(true);
+ useEffect(() => {
+ if (firstExecution.current) {
+ firstExecution.current = false;
+ return;
+ }
+ effect();
+ }, dependencies);
+};
+
+@customElement("or-json-forms")
+export class OrJSONForms extends HauntedLitElement implements OwnPropsOfJsonFormsRenderer {
+
+ @property({type: Object})
+ public uischema?: UISchemaElement;
+
+ @property({type: Object})
+ public schema?: JsonSchema;
+
+ @property({type: String, attribute: false})
+ public data: any;
+
+ @property({type: Array})
+ public renderers?: JsonFormsRendererRegistryEntry[] = renderers;
+
+ @property({type: Array})
+ public cells?: JsonFormsCellRendererRegistryEntry[];
+
+ @property({type: String, attribute: false})
+ public onChange?: (dataAndErrors: {errors: ErrorObject[] | undefined, data: any}) => void;
+
+ @property({type: String, attribute: false})
+ public config: any;
+
+ @property({type: Array})
+ public uischemas?: JsonFormsUISchemaRegistryEntry[];
+
+ @property({type: Boolean})
+ public readonly: boolean = false;
+
+ public static get styles() {
+ return [
+ baseStyle,
+ styles
+ ];
+ }
+
+ render() {
+
+ const schemaToUse = useMemo(
+ () => (this.schema !== undefined ? this.schema : generateJsonSchema(this.data)),
+ [this.schema, this.data]
+ );
+
+ const uischemaToUse = useMemo(
+ () => typeof this.uischema === "object" ? this.uischema : generateDefaultUISchema(schemaToUse),
+ [this.uischema, schemaToUse]
+ );
+
+ const [core, coreDispatch] = useReducer(
+ coreReducer,
+ undefined,
+ () => coreReducer(
+ {
+ ajv: createAjv({useDefaults: true}),
+ data: {},
+ schema: schemaToUse,
+ uischema: uischemaToUse
+ },
+ Actions.init(this.data, schemaToUse, uischemaToUse)
+ )
+ );
+
+ useEffect(() => {
+ coreDispatch(
+ Actions.updateCore(this.data, schemaToUse, uischemaToUse)
+ );
+ }, [this.data, schemaToUse, uischemaToUse]);
+
+ const [config, configDispatch] = useReducer(
+ configReducer,
+ undefined,
+ () => configReducer(undefined, Actions.setConfig(this.config))
+ );
+
+ useEffectAfterFirstRender(() => {
+ configDispatch(Actions.setConfig(this.config));
+ }, [this.config]);
+
+ // @ts-ignore
+ const contextValue: JsonFormsStateContext = useMemo(() => ({
+ core,
+ renderers: this.renderers,
+ cells: this.cells,
+ config: config,
+ uischemas: this.uischemas,
+ readonly: this.readonly,
+ // only core dispatch available
+ dispatch: coreDispatch
+ }), [core, this.renderers, this.cells, config, this.readonly]);
+
+ useEffect(() => {
+ if (this.onChange) {
+ this.onChange({data: core.data, errors: core.errors});
+ }
+ }, [core.data, core.errors]);
+
+ return html`${guard([contextValue], () => {
+ let props: StatePropsOfJsonFormsRenderer & WithTitle = mapStateToJsonFormsRendererProps({jsonforms: {...contextValue}}, this);
+ props = {
+ ...props,
+ title: this.title
+ }
+ return getTemplateFromProps(contextValue, props);
+ })}`;
+ }
+}
diff --git a/ui/component/or-json-forms/src/json-editor.ts b/ui/component/or-json-forms/src/json-editor.ts
new file mode 100644
index 000000000..b92c725c5
--- /dev/null
+++ b/ui/component/or-json-forms/src/json-editor.ts
@@ -0,0 +1,120 @@
+import {css, html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { customElement, property, query } from "lit/decorators.js";
+import ace, {Ace} from "ace-builds";
+import "ace-builds/src-noconflict/mode-javascript";
+import "ace-builds/src-noconflict/mode-json";
+import "ace-builds/src-noconflict/mode-groovy";
+import "ace-builds/webpack-resolver";
+
+// language=CSS
+const style = css`
+ :host {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ }
+
+ #ace-editor {
+ position: relative;
+ height: 100%;
+ width: 100%;
+ }
+
+ @media screen and (max-width: 1400px) {
+ :host > * {
+ flex-grow: 0;
+ }
+
+ :host {
+ flex-direction: column;
+ }
+ }
+`;
+
+@customElement("or-json-forms-json-editor")
+export class JsonEditor extends LitElement {
+
+ static get styles() {
+ return style;
+ }
+
+ @property({attribute: false})
+ public readonly?: boolean;
+
+ @property({type: String, attribute: false})
+ public json?: string;
+
+ @query("#ace-editor")
+ protected _aceElem?: HTMLElement;
+ protected _aceEditor?: Ace.Editor;
+ protected _changeTimer?: number;
+
+ disconnectedCallback(): void {
+ this.destroyEditor();
+ super.disconnectedCallback();
+ }
+
+ firstUpdated(_changedProperties: PropertyValues) {
+ super.firstUpdated(_changedProperties);
+ this.initEditor();
+ }
+
+ render(): TemplateResult | void {
+ return html`
+ <div id="ace-editor"></div>
+ `;
+ }
+
+ protected _onEditorChanged() {
+ if (this._changeTimer) {
+ window.clearTimeout(this._changeTimer);
+ }
+ this._changeTimer = window.setTimeout(() => this._onEdit(), 1000);
+ }
+
+ protected _onEdit() {
+ //this.dispatchEvent(new OrRulesRuleChangedEvent(this.validate()));
+ this._changeTimer = undefined;
+ }
+
+ public getValue(): string | undefined {
+ if (!this._aceEditor) {
+ return undefined;
+ }
+
+ return this._aceEditor.getValue();
+ }
+
+ public validate(): boolean {
+
+ if (!this._aceEditor) {
+ return false;
+ }
+
+ const annotations = this._aceEditor.getSession().getAnnotations();
+ return !annotations || annotations.length === 0;
+ }
+
+
+ protected destroyEditor() {
+ if (this._aceEditor) {
+ this._aceEditor.destroy();
+ this._aceEditor = undefined;
+ }
+ }
+
+ protected initEditor() {
+ if (this._aceElem) {
+ this._aceEditor = ace.edit(this._aceElem, {
+ mode: "ace/mode/json",
+ value: this.json,
+ useSoftTabs: true,
+ tabSize: 2,
+ readOnly: this.readonly,
+ showPrintMargin: false
+ });
+ this._aceEditor.on("change", () => this._onEditorChanged());
+ this._aceEditor.renderer.attachToShadowRoot();
+ }
+ }
+}
diff --git a/ui/component/or-json-forms/src/layouts/layout-base-element.ts b/ui/component/or-json-forms/src/layouts/layout-base-element.ts
new file mode 100644
index 000000000..5fcbb43f0
--- /dev/null
+++ b/ui/component/or-json-forms/src/layouts/layout-base-element.ts
@@ -0,0 +1,23 @@
+import {Layout, LayoutProps, OwnPropsOfLayout, OwnPropsOfRenderer, UISchemaElement} from "@jsonforms/core";
+import {property} from "lit/decorators.js";
+import {BaseElement} from "../base-element";
+
+export abstract class LayoutBaseElement<T extends Layout> extends BaseElement<T, LayoutProps> implements OwnPropsOfLayout {
+
+ @property({type: String})
+ public direction: 'row' | 'column' = "column";
+
+ protected getChildProps(): OwnPropsOfRenderer[] {
+ return (this.uischema && this.uischema.elements ? this.uischema.elements : []).map(
+ (el: UISchemaElement) => {
+ const props: OwnPropsOfRenderer = {
+ renderers: this.renderers,
+ uischema: el,
+ schema: this.schema,
+ path: this.path
+ }
+ return props;
+ }
+ );
+ }
+}
diff --git a/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts b/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts
new file mode 100644
index 000000000..fd070f9c1
--- /dev/null
+++ b/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts
@@ -0,0 +1,253 @@
+import {computeLabel, createDefaultValue, isControl, isPlainLabel, JsonFormsState, LayoutProps, mapStateToControlProps,
+ OwnPropsOfControl, OwnPropsOfRenderer, RankedTester, rankWith, StatePropsOfControl, uiTypeIs, update, VerticalLayout} from "@jsonforms/core";
+import {css, html, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement} from "lit/decorators.js";
+import {LayoutBaseElement} from "./layout-base-element";
+import {getTemplateFromProps} from "../util";
+import { InputType, OrMwcInput } from "@openremote/or-mwc-components/or-mwc-input";
+import { i18next } from "@openremote/or-translate";
+import { showDialog } from "@openremote/or-mwc-components/or-mwc-dialog";
+import "@openremote/or-mwc-components/or-mwc-list";
+import {baseStyle} from "../styles";
+import {ListItem, OrMwcListChangedEvent } from "@openremote/or-mwc-components/or-mwc-list";
+import { DefaultColor5 } from "@openremote/core";
+import "../json-editor";
+import {JsonEditor} from "../json-editor";
+
+// language=CSS
+const style = css`
+ :host {
+ border-color: rgba(0,0,0,0.12);
+ border-radius: 4px;
+ border-width: 1px;
+ border-style: solid;
+ }
+
+ #expander {
+ --or-icon-width: 20px;
+ --or-icon-height: 20px;
+ cursor: pointer;
+ flex: 1 1 auto;
+ }
+ #expander > * {
+ pointer-events: none;
+ }
+ #expander > or-icon {
+ vertical-align: middle;
+ margin-right: 6px;
+ margin-left: -5px;
+ }
+
+ #header {
+ display: flex;
+ align-items: center;
+ height: 50px;
+ }
+
+ #content {
+ display: flex;
+ flex-direction: column;
+ }
+
+ #add-parameter {
+ margin: 10px 0 0 4px;
+ }
+
+ :host, .padded {
+ padding: 10px 16px;
+ }
+`;
+
+@customElement("or-json-forms-vertical-layout")
+export class LayoutVerticalElement extends LayoutBaseElement<VerticalLayout> {
+
+ public static get styles() {
+ return [
+ baseStyle,
+ style
+ ];
+ }
+
+ render() {
+
+ const optionalProps: StatePropsOfControl[] = [];
+
+ return html`
+ <div id="panel">
+ <div id="header">
+ <div id="expander"><or-icon icon="chevron-right"></or-icon><span>${this.title || this.schema.title || ""}</span></div>
+ <div id="header-buttons"><or-mwc-input .type="${InputType.BUTTON}" outlined .label="${i18next.t("json")}" icon="pencil" @click="${() => this._showJson()}"></or-mwc-input></div>
+ </div>
+ <div id="content">
+
+
+ ${this.getChildProps().map((props) => {
+
+ if (isControl(props.uischema)) {
+ const controlProps = props as OwnPropsOfControl;
+ const stateControlProps = mapStateToControlProps({jsonforms: {...this.state}}, controlProps);
+ if (!stateControlProps.required && stateControlProps.data === undefined) {
+ // Optional property with no data so show this in the dialog
+ optionalProps.push(stateControlProps);
+ return html``;
+ }
+ }
+
+ return getTemplateFromProps(this.state, props);
+ })}
+ </div>
+
+ ${optionalProps.length === 0 ? html`` : html`
+ <div id="add-parameter">
+ <or-mwc-input .type="${InputType.BUTTON}" .label="${i18next.t("addParameter")}" icon="plus" @click="${() => this._addParameter(optionalProps)}"></or-mwc-input>
+ </div>
+ `}
+ </div>
+ `;
+ }
+
+ protected _showJson() {
+ const dialog = showDialog(
+ {
+ content: html`
+ <or-json-forms-json-editor id="json-editor" .json="${this.data === undefined ? "" : JSON.stringify(this.data, null, 2)}"></or-json-forms-json-editor>
+ `,
+ actions: [
+ {
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ },
+ {
+ default: true,
+ actionName: "update",
+ action: () => {
+ const editor = dialog.shadowRoot!.getElementById("json-editor") as JsonEditor;
+ if (editor.validate()) {
+ const data = !!editor.getValue() ? JSON.parse(editor.getValue()!) : undefined;
+ this.state.dispatch(
+ update(this.path || "", (d) => {
+ return data;
+ })
+ )
+ }
+ },
+ content: html`<or-mwc-input id="add-btn" .type="${InputType.BUTTON}" .label="${i18next.t("update")}"></or-mwc-input>`
+ }
+ ],
+ title: this.title || this.schema.title,
+ dismissAction: null,
+ styles: html`
+ <style>
+ .mdc-dialog__surface {
+ width: 1024px;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+ }
+ #dialog-content {
+ border-color: var(--or-app-color5, ${unsafeCSS(DefaultColor5)});
+ border-top-width: 1px;
+ border-top-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ padding: 0;
+ overflow: visible;
+ height: 60vh;
+ }
+ </style>
+ `
+ }
+ )
+ }
+
+ protected _addParameter(optionalProps: StatePropsOfControl[]) {
+
+ let selectedParameter: StatePropsOfControl | undefined;
+
+ const listItems: ListItem[] = optionalProps.map(props => {
+ const labelStr = isPlainLabel(props.label) ? computeLabel(props.label, !!props.required, false) : props.label.default;
+ return {
+ text: labelStr,
+ value: labelStr,
+ data: props
+ }
+ });
+
+ const onParamChanged = (selected: StatePropsOfControl) => {
+ selectedParameter = selected;
+ const descElem = dialog.shadowRoot!.getElementById("parameter-desc") as HTMLDivElement;
+ descElem.innerHTML = selected.description || "";
+ (dialog.shadowRoot!.getElementById("add-btn") as OrMwcInput).disabled = false;
+ };
+
+ const dialog = showDialog({
+ content: html`
+ <div class="col">
+ <form id="mdc-dialog-form-add" class="row">
+ <div id="type-list" class="col">
+ <or-mwc-list @or-mwc-list-changed="${(evt: OrMwcListChangedEvent) => {if (evt.detail.length === 1) onParamChanged((evt.detail[0] as ListItem).data as StatePropsOfControl); }}" .listItems="${listItems}" id="parameter-list"></or-mwc-list>
+ </div>
+ <div id="parameter-desc" class="col"></div>
+ </form>
+ </div>
+ `,
+ styles: html`
+ <style>
+ .mdc-dialog__surface {
+ width: 800px;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+ }
+ #dialog-content {
+ border-color: var(--or-app-color5, ${unsafeCSS(DefaultColor5)});
+ border-top-width: 1px;
+ border-top-style: solid;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ padding: 0;
+ overflow: visible;
+ }
+ form {
+ display: flex;
+ }
+ #type-list {
+ overflow: auto;
+ min-width: 150px;
+ max-width: 300px;
+ flex: 0 0 40%;
+ border-right: 1px solid var(--or-app-color5, #CCC);
+ }
+ #parameter-list {
+ display: flex;
+ }
+ #parameter-desc {
+ padding: 5px;
+ }
+ </style>
+ `,
+ title: i18next.t("addParameter"),
+ actions: [
+ {
+ actionName: "cancel",
+ content: i18next.t("cancel")
+ },
+ {
+ default: true,
+ actionName: "add",
+ action: () => {
+ if (selectedParameter) {
+ this.state.dispatch(
+ update(this.path || "", (data) => {
+ data = data || {};
+ data[selectedParameter!.path.split(".").pop()!] = createDefaultValue(selectedParameter!.schema);
+ return data;
+ })
+ )
+ }
+ },
+ content: html`<or-mwc-input id="add-btn" .type="${InputType.BUTTON}" disabled .label="${i18next.t("add")}"></or-mwc-input>`
+ }
+ ],
+ dismissAction: null
+ });
+ }
+}
diff --git a/ui/component/or-json-forms/src/renderers.ts b/ui/component/or-json-forms/src/renderers.ts
new file mode 100644
index 000000000..429109a17
--- /dev/null
+++ b/ui/component/or-json-forms/src/renderers.ts
@@ -0,0 +1,355 @@
+import {
+ and,
+ computeLabel,
+ ControlElement,
+ ControlProps,
+ createCombinatorRenderInfos,
+ DispatchPropsOfControl,
+ findUISchema,
+ hasType,
+ isAllOfControl,
+ isAnyOfControl,
+ isBooleanControl,
+ isDateControl,
+ isDateTimeControl,
+ isEnumControl,
+ isIntegerControl,
+ isNumberControl,
+ isObjectControl,
+ isOneOfEnumControl,
+ isPlainLabel,
+ isStringControl,
+ isTimeControl,
+ JsonFormsRendererRegistryEntry,
+ JsonSchema,
+ Layout,
+ mapDispatchToControlProps,
+ mapDispatchToMultiEnumProps,
+ mapStateToAllOfProps,
+ mapStateToAnyOfProps,
+ mapStateToControlProps,
+ mapStateToLayoutProps,
+ or,
+ OwnPropsOfRenderer,
+ Paths,
+ RankedTester,
+ rankWith,
+ RendererProps,
+ resolveSubSchemas,
+ schemaMatches,
+ schemaSubPathMatches,
+ Tester,
+ uiTypeIs
+} from "@jsonforms/core";
+import {html, TemplateResult} from "lit";
+import "@openremote/or-mwc-components/or-mwc-input";
+import {JsonFormsStateContext, WithRequired, WithTitle} from "./index";
+import {findSchemaTitleAndDescription, getTemplateFromProps, mapStateToCombinatorRendererProps, toControlDetailProps} from "./util";
+import "./layouts/layout-vertical-element";
+import "./controls/control-input-element";
+import "./controls/control-array-element";
+
+const hasOneOfItems = (schema: JsonSchema): boolean =>
+ schema.oneOf !== undefined &&
+ schema.oneOf.length > 0 &&
+ (schema.oneOf as JsonSchema[]).every((entry: JsonSchema) => {
+ return entry.const !== undefined;
+ });
+
+const hasEnumItems = (schema: JsonSchema): boolean =>
+ Array.isArray(schema.enum);
+
+export const isEnumArray: Tester = and(
+ uiTypeIs('Control'),
+ and(
+ schemaMatches(
+ schema =>
+ hasType(schema, 'array') &&
+ !Array.isArray(schema.items) &&
+ schema.uniqueItems === true
+ ),
+ schemaSubPathMatches('items', schema => {
+ return hasOneOfItems(schema) || hasEnumItems(schema);
+ })
+ )
+);
+
+export const verticalLayoutTester: RankedTester = rankWith(
+ 1,
+ uiTypeIs('VerticalLayout')
+);
+
+export const verticalLayoutRenderer = (state: JsonFormsStateContext, props: RendererProps & WithTitle & WithRequired) => {
+ const p: RendererProps & WithTitle & WithRequired & DispatchPropsOfControl = {
+ ...mapStateToLayoutProps({jsonforms: {...state}}, props),
+ ...mapDispatchToControlProps(state.dispatch),
+ title: props.title,
+ required: props.required
+ };
+
+ const template = html`<or-json-forms-vertical-layout data-title="${p.title || ""}" .state="${state}" .props="${p}"></or-json-forms-vertical-layout>`;
+ return getTemplateWrapper(template, state, p);
+};
+
+export const inputControlTester: RankedTester = rankWith(
+ 3,
+ or(
+ isStringControl,
+ isBooleanControl,
+ isNumberControl,
+ isIntegerControl,
+ isDateControl,
+ isTimeControl,
+ isDateTimeControl,
+ isEnumControl,
+ isOneOfEnumControl,
+ isEnumArray,
+ )
+);
+export const inputControlRenderer = (state: JsonFormsStateContext, props: ControlProps) => {
+ props = {
+ ...props,
+ ...mapStateToControlProps({jsonforms: {...state}}, props),
+ ...mapDispatchToControlProps(state.dispatch),
+ ...mapDispatchToMultiEnumProps(state.dispatch)
+ };
+
+ const template = html`<or-json-forms-input-control .state="${state}" .props="${props}"></or-json-forms-input-control>`;
+ return getTemplateWrapper(template, state, props);
+};
+
+export const objectControlTester: RankedTester = rankWith(
+ 2,
+ isObjectControl
+);
+export const objectControlRenderer = (state: JsonFormsStateContext, props: ControlProps) => {
+ const {
+ required,
+ renderers,
+ cells,
+ uischemas,
+ schema,
+ label,
+ path,
+ visible,
+ enabled,
+ uischema,
+ rootSchema
+ } = toControlDetailProps(state, props);
+
+ const detailUiSchema = findUISchema(
+ uischemas!,
+ schema,
+ uischema.scope,
+ path,
+ 'VerticalLayout',
+ uischema,
+ rootSchema
+ );
+
+ const labelStr = isPlainLabel(label) ? computeLabel(label, !!required, false) : label.default;
+ const contentProps: OwnPropsOfRenderer & WithTitle & WithRequired & DispatchPropsOfControl = {
+ title: labelStr,
+ visible: visible,
+ enabled: enabled,
+ schema: schema,
+ uischema: detailUiSchema,
+ path: path,
+ handleChange: props.handleChange,
+ renderers: renderers,
+ cells: cells,
+ required: required
+ };
+ return getTemplateFromProps(state, contentProps);
+}
+
+export const anyOfControlTester: RankedTester = rankWith(
+ 4,
+ isAnyOfControl
+);
+export const anyOfControlRenderer = (state: JsonFormsStateContext, props: ControlProps) => {
+
+ const {
+ required,
+ renderers,
+ cells,
+ uischemas,
+ schema,
+ label,
+ path,
+ visible,
+ enabled,
+ uischema,
+ rootSchema
+ } = toControlDetailProps(state, props);
+
+ // mapStateToAnyOfProps has issues with $ref in allOfs so resolve them before calling
+ const anyOfSchema = resolveSubSchemas(schema, rootSchema, "anyOf");
+
+ for(let i=0; i<anyOfSchema.anyOf!.length; i++) {
+ if (anyOfSchema.anyOf![i].allOf) {
+ anyOfSchema.anyOf![i] = resolveSubSchemas(anyOfSchema.anyOf![i], rootSchema, "allOf");
+ }
+ }
+
+ const anyOfProps = mapStateToCombinatorRendererProps({jsonforms: {...state}}, {
+ schema: anyOfSchema,
+ path: path,
+ visible: visible,
+ enabled: enabled,
+ uischema: uischema,
+ renderers: renderers,
+ cells: cells,
+ uischemas: uischemas
+ }, "anyOf");
+
+ if (anyOfProps.indexOfFittingSchema < 0) {
+ console.warn("Cannot match anyOf schema to instance data");
+ return html`<or-json-forms-unknown class="item-container"></or-json-forms-unknown>`;
+ }
+
+ const anyOfRenderInfos = createCombinatorRenderInfos(
+ anyOfSchema.anyOf!,
+ rootSchema,
+ "anyOf",
+ anyOfProps.uischema || uischema,
+ path,
+ anyOfProps.uischemas
+ );
+
+ // Return template for the anyOf schema that matches the data
+ const matchedSchema = anyOfRenderInfos[anyOfProps.indexOfFittingSchema].schema;
+ let matchedUischema = anyOfRenderInfos[anyOfProps.indexOfFittingSchema].uischema;
+
+ if (matchedSchema.allOf) {
+ // Force the uischema to be a simple control so that the allOf renderer gets used
+ matchedUischema = {
+ type: 'Control',
+ scope: "#",
+ label: false
+ } as ControlElement;
+ }
+
+ return getTemplateFromProps(state, {
+ schema: matchedSchema,
+ uischema: matchedUischema,
+ path: path,
+ renderers: renderers,
+ cells: cells
+ } as OwnPropsOfRenderer);
+}
+
+export const allOfControlTester: RankedTester = rankWith(
+ 4,
+ isAllOfControl
+);
+export const allOfControlRenderer = (state: JsonFormsStateContext, props: ControlProps) => {
+
+ const {
+ required,
+ renderers,
+ cells,
+ uischemas,
+ schema,
+ label,
+ path,
+ visible,
+ enabled,
+ uischema,
+ rootSchema
+ } = toControlDetailProps(state, props);
+
+ const allOfSchema = resolveSubSchemas(schema, rootSchema, 'allOf');
+
+ const allOfProps = mapStateToAllOfProps({jsonforms: {...state}}, {
+ schema: allOfSchema,
+ path: path,
+ visible: visible,
+ enabled: enabled,
+ uischema: uischema,
+ renderers: renderers,
+ cells: cells,
+ uischemas: uischemas
+ });
+
+ const allOfRenderInfos = createCombinatorRenderInfos(
+ allOfSchema.allOf!,
+ rootSchema,
+ "allOf",
+ allOfProps.uischema || uischema,
+ path,
+ allOfProps.uischemas
+ );
+
+ if (allOfRenderInfos.every(renderInfo => renderInfo.uischema.type === "VerticalLayout")) {
+ const titleAndDescription = findSchemaTitleAndDescription(allOfSchema, rootSchema);
+
+ // Combine into a single layout
+ (allOfRenderInfos[0].uischema as Layout).elements = allOfRenderInfos.map(renderInfo => (renderInfo.uischema as Layout).elements).flat();
+ allOfRenderInfos[0].schema.title = titleAndDescription[0];
+ allOfRenderInfos[0].schema.description = titleAndDescription[1];
+
+ return getTemplateFromProps(state, {
+ schema: allOfRenderInfos[0].schema,
+ uischema: allOfRenderInfos[0].uischema,
+ path: path,
+ renderers: renderers,
+ cells: cells
+ } as OwnPropsOfRenderer);
+ }
+
+ return allOfRenderInfos.map(renderInfo => getTemplateFromProps(state, {
+ schema: renderInfo.schema,
+ uischema: renderInfo.uischema,
+ path: path,
+ renderers: renderers,
+ cells: cells
+ } as OwnPropsOfRenderer));
+}
+
+
+export const arrayControlTester: RankedTester = rankWith(
+ 2,
+ schemaMatches(
+ schema => hasType(schema, 'array') && !Array.isArray(schema.items) // we don't care about tuples
+ )
+);
+export const arrayControlRenderer = (state: JsonFormsStateContext, props: ControlProps & WithTitle) => {
+ props = {
+ ...props,
+ ...mapStateToControlProps({jsonforms: {...state}}, props),
+ ...mapDispatchToControlProps(state.dispatch)
+ };
+
+ const template = html`<or-json-forms-array-control .state="${state}" .props="${props}"></or-json-forms-array-control>`;
+ return getTemplateWrapper(template, state, props);
+};
+
+
+export function getTemplateWrapper(elementTemplate: TemplateResult, state: JsonFormsStateContext, props: RendererProps & WithRequired): TemplateResult {
+
+ const { handleChange } = mapDispatchToControlProps(state.dispatch);
+
+ const deleteTemplate = props.required || !props.path ? `` : html`
+ <button class="button-clear" @click="${() => handleChange(props.path, undefined)}"><or-icon icon="close-circle"></or-icon></input>
+ `;
+ return html`
+ <div class="item-container">
+ ${elementTemplate}
+ <div class="delete-container">
+ ${deleteTemplate}
+ </div>
+ </div>
+ `;
+}
+
+
+export const renderers: JsonFormsRendererRegistryEntry[] = [
+
+ {tester: verticalLayoutTester, renderer: verticalLayoutRenderer},
+ {tester: inputControlTester, renderer: inputControlRenderer},
+ {tester: objectControlTester, renderer: objectControlRenderer},
+ {tester: arrayControlTester, renderer: arrayControlRenderer},
+ {tester: anyOfControlTester, renderer: anyOfControlRenderer},
+ {tester: allOfControlTester, renderer: allOfControlRenderer}
+];
diff --git a/ui/component/or-json-forms/src/styles.ts b/ui/component/or-json-forms/src/styles.ts
new file mode 100644
index 000000000..468f0b396
--- /dev/null
+++ b/ui/component/or-json-forms/src/styles.ts
@@ -0,0 +1,43 @@
+import {DefaultColor4, DefaultColor5 } from "@openremote/core";
+import { css, unsafeCSS } from "lit";
+
+// language=CSS
+export const baseStyle = css`
+ :host {
+ flex: 1;
+ }
+
+ .item-container {
+ display: flex;
+ margin: 10px 0 10px 10px;
+ }
+
+ .delete-container {
+ width: 30px;
+ display: flex;
+ }
+
+ .item-container:hover .button-clear {
+ visibility: visible;
+ }
+
+ .button-clear {
+ background: none;
+ color: ${unsafeCSS(DefaultColor5)};
+ --or-icon-fill: ${unsafeCSS(DefaultColor5)};
+ visibility: hidden;
+ display: inline-block;
+ border: none;
+ padding: 0 0 0 5px;
+ cursor: pointer;
+ }
+ .button-clear:hover {
+ --or-icon-fill: ${unsafeCSS(DefaultColor4)};
+ }
+ .button-clear:focus {
+ outline: 0;
+ }
+ .button-clear.hidden {
+ visibility: hidden;
+ }
+`;
diff --git a/ui/component/or-json-forms/src/unknown-element.ts b/ui/component/or-json-forms/src/unknown-element.ts
new file mode 100644
index 000000000..8bd5350a3
--- /dev/null
+++ b/ui/component/or-json-forms/src/unknown-element.ts
@@ -0,0 +1,10 @@
+import {html, LitElement } from "lit";
+import {customElement} from "lit/decorators.js";
+
+@customElement("or-json-forms-unknown")
+export class UnknownElement extends LitElement {
+
+ public render() {
+ return html`<span>No applicable renderer found!</span>`;
+ }
+}
diff --git a/ui/component/or-json-forms/src/util.ts b/ui/component/or-json-forms/src/util.ts
new file mode 100644
index 000000000..acaddfa28
--- /dev/null
+++ b/ui/component/or-json-forms/src/util.ts
@@ -0,0 +1,219 @@
+import {
+ CombinatorKeyword,
+ composeWithUi,
+ createDefaultValue,
+ deriveTypes,
+ getAjv,
+ getData,
+ getRenderers,
+ getSchema,
+ hasShowRule,
+ isVisible,
+ JsonFormsRendererRegistryEntry,
+ JsonFormsState,
+ JsonSchema,
+ mapStateToControlProps,
+ mapStateToControlWithDetailProps,
+ OwnPropsOfControl,
+ OwnPropsOfRenderer,
+ Resolve,
+ resolveSubSchemas,
+ StatePropsOfCombinator,
+ StatePropsOfControl,
+ StatePropsOfControlWithDetail,
+} from "@jsonforms/core";
+import { ErrorObject } from "ajv";
+import {html, TemplateResult} from "lit";
+import {JsonFormsStateContext} from "./index";
+
+export function getTemplateFromProps<T extends OwnPropsOfRenderer>(state: JsonFormsStateContext | undefined, props: T | undefined): TemplateResult {
+ if (!state || !props) {
+ return html``;
+ }
+
+ const renderers = props.renderers || getRenderers({jsonforms: {...state}});
+ const schema = props.schema;
+ const uischema = props.uischema;
+
+ let template: TemplateResult | undefined;
+
+ if (renderers && schema && uischema) {
+ const orderedRenderers: [JsonFormsRendererRegistryEntry, number][] = renderers.map(r => [r, r.tester(uischema, schema)] as [JsonFormsRendererRegistryEntry, number]).sort((a,b) => b[1] - a[1]);
+ const renderer = orderedRenderers && orderedRenderers.length > 0 ? orderedRenderers[0] : undefined;
+ if (renderer && renderer[1] !== -1) {
+ template = renderer[0].renderer(state, props) as TemplateResult;
+ } else {
+ template = html`<or-json-forms-unknown class="item-container"></or-json-forms-unknown>`;
+ }
+ }
+
+ return template || html``;
+}
+
+export function toControlDetailProps(context: JsonFormsStateContext, props: OwnPropsOfControl): StatePropsOfControlWithDetail {
+ return mapStateToControlWithDetailProps({ jsonforms: { ...context } }, props);
+}
+
+export function toControlProps(context: JsonFormsStateContext, props: OwnPropsOfControl): StatePropsOfControl {
+ return mapStateToControlProps({ jsonforms: { ...context } }, props)
+}
+
+export interface AnyOfInfo {
+ title: string;
+ description: string;
+ defaultValueCreator: () => any;
+}
+
+/**
+ * For a given anyOf schema array this will try and extract a common const property which can be used as a discriminator
+ * when creating instances
+ */
+export function getAnyOfInfos(anyOfSchemas: JsonSchema[], rootSchema: JsonSchema): AnyOfInfo[] {
+ // Find const properties of first schema
+
+ return anyOfSchemas.map(schema => {
+ const titleAndDescription = findSchemaTitleAndDescription(schema, rootSchema);
+ let creator: () => any;
+
+ if (schema.$ref) {
+ schema = Resolve.schema(rootSchema, schema.$ref);
+ }
+
+ if (Array.isArray(schema.allOf)) {
+ schema = resolveSubSchemas(schema, rootSchema, "allOf");
+ }
+
+ if (deriveTypes(schema).every(type => type === "object")) {
+ const props = getSchemaObjectProperties(schema);
+ const constProp = props.find(([propName, propSchema]) => propSchema.const !== undefined);
+ if (constProp) {
+ creator = () => {
+ const obj: any = {};
+ obj[constProp[0]] = constProp[1].const;
+ return obj;
+ }
+ } else {
+ creator = () => createDefaultValue(schema);
+ }
+ } else {
+ // Assume a primitive type that can be instantiated with default value creator
+ creator = () => createDefaultValue(schema);
+ }
+
+ return {
+ title: titleAndDescription[0],
+ description: titleAndDescription[1],
+ defaultValueCreator: creator
+ } as AnyOfInfo;
+ });
+}
+
+export function findSchemaTitleAndDescription(schema: JsonSchema, rootSchema: JsonSchema): [string | undefined, string | undefined] {
+ let refTitle: string | undefined;
+
+ if (schema.$ref) {
+ refTitle = schema.$ref.substr(schema.$ref.lastIndexOf("/")+1);
+ schema = Resolve.schema(rootSchema, schema.$ref);
+ }
+
+ if (schema.title) {
+ return [schema.title, schema.description];
+ }
+
+ if (schema.allOf) {
+ const resolvedSchema = resolveSubSchemas(schema, rootSchema, "allOf");
+ const titledSchema = (resolvedSchema.allOf! as JsonSchema[]).find((allOfSchema) => {
+ return !!allOfSchema.title;
+ });
+ if (titledSchema) {
+ return [titledSchema.title, titledSchema.description];
+ }
+ }
+
+ return [refTitle, undefined];
+}
+
+function getSchemaObjectProperties(schema: JsonSchema): [string, JsonSchema][] {
+ let props: [string, JsonSchema][] = [];
+
+ if (schema.allOf) {
+ props = schema.allOf.map(schema => schema.properties ? Object.entries(schema.properties) : []).flat();
+ } else if (schema.properties) {
+ props = Object.entries(schema.properties);
+ }
+
+ return props;
+}
+
+/**
+ * Copied from eclipse source code as there is a bug (https://github.com/eclipsesource/jsonforms/issues/1787)
+ * which means indexOfFittingSchema always returns 0 if there is only a const error
+ */
+export function mapStateToCombinatorRendererProps(
+ state: JsonFormsState,
+ ownProps: OwnPropsOfControl,
+ keyword: CombinatorKeyword
+): StatePropsOfCombinator {
+ const { uischema } = ownProps;
+ const path = composeWithUi(uischema!, ownProps.path!);
+ const rootSchema = getSchema(state);
+ const resolvedSchema = Resolve.schema(
+ ownProps.schema || rootSchema,
+ uischema!.scope,
+ rootSchema
+ );
+ const visible: boolean =
+ ownProps.visible === undefined || hasShowRule(uischema!)
+ ? isVisible(uischema!, getData(state), ownProps.path!, getAjv(state))
+ : ownProps.visible;
+ const id = ownProps.id!;
+
+ const data = Resolve.data(getData(state), path);
+
+ const ajv = state.jsonforms.core!.ajv!;
+ const schema = resolvedSchema || rootSchema;
+ const _schema = resolveSubSchemas(schema, rootSchema, keyword);
+ const structuralKeywords = [
+ 'required',
+ 'additionalProperties',
+ 'type',
+ 'enum',
+ 'const'
+ ];
+ const dataIsValid = (errors: ErrorObject[]): boolean => {
+ return (
+ !errors ||
+ errors.length === 0 ||
+ !errors.find(e => structuralKeywords.indexOf(e.keyword) !== -1)
+ );
+ };
+ let indexOfFittingSchema: number = -1;
+ // TODO instead of compiling the combinator subschemas we can compile the original schema
+ // without the combinator alternatives and then revalidate and check the errors for the
+ // element
+ for (let i = 0; i < _schema[keyword]!.length; i++) {
+ try {
+ const valFn = ajv.compile(_schema[keyword]![i]);
+ valFn(data);
+ if (dataIsValid(valFn.errors!)) {
+ indexOfFittingSchema = i;
+ break;
+ }
+ } catch (error) {
+ console.debug("Combinator subschema is not self contained, can't hand it over to AJV");
+ }
+ }
+
+ return {
+ data,
+ path,
+ schema,
+ rootSchema,
+ visible,
+ id,
+ indexOfFittingSchema,
+ uischemas: state.jsonforms.uischemas!,
+ uischema
+ };
+}
+
diff --git a/ui/component/or-json-forms/tsconfig.json b/ui/component/or-json-forms/tsconfig.json
new file mode 100644
index 000000000..682436851
--- /dev/null
+++ b/ui/component/or-json-forms/tsconfig.json
@@ -0,0 +1,19 @@
+{
+ "extends": "../../tsconfig",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "tsBuildInfoFile": "./dist/.tsbuildinfo",
+ "rootDir": "src"
+ },
+ "include": [
+ "./src"
+ ],
+ "references": [
+ { "path": "../core" },
+ { "path": "../rest" },
+ { "path": "../model" },
+ { "path": "../or-translate" },
+ { "path": "../or-mwc-components" },
+ { "path": "../or-icon" }
+ ]
+}
diff --git a/ui/component/or-json-forms/webpack.config.js b/ui/component/or-json-forms/webpack.config.js
new file mode 100644
index 000000000..59ee22935
--- /dev/null
+++ b/ui/component/or-json-forms/webpack.config.js
@@ -0,0 +1,18 @@
+const util = require("@openremote/util");
+
+bundles = {
+ "index": {
+ vendor: {
+ "mapbox-gl": "mapboxgl",
+ "mapbox.js": "L.mapbox",
+ "moment": "moment"
+ },
+ excludeOr: true
+ },
+ "index.bundle": {
+ excludeOr: true,
+ },
+ "index.orbundle": undefined
+};
+
+module.exports = util.generateExports(__dirname);
diff --git a/ui/component/or-log-viewer/package.json b/ui/component/or-log-viewer/package.json
index d7b3989c1..0dd749a5c 100644
--- a/ui/component/or-log-viewer/package.json
+++ b/ui/component/or-log-viewer/package.json
@@ -15,7 +15,7 @@
"@material/data-table": "^9.0.0",
"@openremote/core": "^1.0.3",
"@openremote/or-mwc-components": "^1.0.3",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0",
"parse-link-header": "^1.0.1"
},
diff --git a/ui/component/or-log-viewer/src/index.ts b/ui/component/or-log-viewer/src/index.ts
index 45ed8fe08..314039202 100644
--- a/ui/component/or-log-viewer/src/index.ts
+++ b/ui/component/or-log-viewer/src/index.ts
@@ -1,14 +1,12 @@
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
import * as Model from "@openremote/model";
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.json
index 2ac667fb2..acb7d4173 100644
--- a/ui/component/or-map/package.json
+++ b/ui/component/or-map/package.json
@@ -22,7 +22,7 @@
"@polymer/polymer": "^3.3.1",
"@types/mapbox": "^1.6.41",
"@types/mapbox-gl": "^2.0.2",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"mapbox-gl": "^1.13.0",
"mapbox.js": "^3.2.0"
},
diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.ts
index de74f6f7b..eb2d00333 100644
--- a/ui/component/or-map/src/index.ts
+++ b/ui/component/or-map/src/index.ts
@@ -1,6 +1,7 @@
import manager, {EventCallback, MapType, OREvent} from "@openremote/core";
import {FlattenedNodesObserver} from "@polymer/polymer/lib/utils/flattened-nodes-observer.js";
-import {CSSResult, customElement, html, LitElement, property, PropertyValues, query} from "lit-element";
+import {CSSResult, html, LitElement, PropertyValues} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {Control, IControl, LngLat, LngLatBoundsLike, LngLatLike, Map as MapGL} from "mapbox-gl";
import {MapWidget} from "./mapwidget";
import {style} from "./style";
diff --git a/ui/component/or-map/src/markers/or-map-marker-asset.ts b/ui/component/or-map/src/markers/or-map-marker-asset.ts
index d91a48d1a..94059eba4 100644
--- a/ui/component/or-map/src/markers/or-map-marker-asset.ts
+++ b/ui/component/or-map/src/markers/or-map-marker-asset.ts
@@ -1,4 +1,5 @@
-import {customElement, property, PropertyValues} from "lit-element";
+import {PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {OrMapMarker} from "./or-map-marker";
import {AttributeEvent, GeoJSONPoint, AssetEvent, AssetEventCause, Asset, SharedEvent, AssetDescriptor, WellknownAttributes} from "@openremote/model";
import {subscribe} from "@openremote/core";
diff --git a/ui/component/or-map/src/markers/or-map-marker.ts b/ui/component/or-map/src/markers/or-map-marker.ts
index 27379df07..e9aff507e 100644
--- a/ui/component/or-map/src/markers/or-map-marker.ts
+++ b/ui/component/or-map/src/markers/or-map-marker.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, PropertyValues, query} from "lit-element";
+import {html, LitElement, PropertyValues} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {markerActiveColorVar, markerColorVar} from "../style";
export class OrMapMarkerChangedEvent extends CustomEvent<OrMapMarkerChangedEventDetail> {
diff --git a/ui/component/or-map/src/or-map-asset-card.ts b/ui/component/or-map/src/or-map-asset-card.ts
index 5efba1d47..807b50cc9 100644
--- a/ui/component/or-map/src/or-map-asset-card.ts
+++ b/ui/component/or-map/src/or-map-asset-card.ts
@@ -1,13 +1,13 @@
import {
CSSResult,
CSSResultArray,
- customElement,
+ CSSResultGroup,
html,
LitElement,
- property,
PropertyValues,
TemplateResult
-} from "lit-element";
+} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {
Asset,
AssetEvent,
@@ -76,7 +76,7 @@ export class OrMapAssetCard extends subscribe(manager)(LitElement) {
@property({type: Boolean, attribute: true})
public useAssetColor: boolean = true;
- static get styles(): CSSResultArray | CSSResult {
+ static get styles(): CSSResultGroup {
return mapAssetCardStyle;
}
diff --git a/ui/component/or-map/src/style.ts b/ui/component/or-map/src/style.ts
index 19d0dd07c..daefaf01f 100644
--- a/ui/component/or-map/src/style.ts
+++ b/ui/component/or-map/src/style.ts
@@ -1,4 +1,4 @@
-import {css, unsafeCSS} from "lit-element";
+import {css, unsafeCSS} from "lit";
import { DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor4, DefaultColor5, DefaultHeaderHeight, DefaultBoxShadow} from "@openremote/core";
export const markerColorVar = "--internal-or-map-marker-color";
diff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.json
index a84636eb0..8eafb8867 100644
--- a/ui/component/or-mwc-components/package.json
+++ b/ui/component/or-mwc-components/package.json
@@ -35,7 +35,7 @@
"@openremote/core": "^1.0.3",
"@openremote/or-icon": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
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 2b59f0956..5a9100eee 100644
--- a/ui/component/or-mwc-components/src/or-mwc-dialog.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, query, TemplateResult, unsafeCSS, PropertyValues} from "lit-element";
+import {css, html, LitElement, TemplateResult, unsafeCSS, PropertyValues} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {MDCDialog} from "@material/dialog";
import "@openremote/or-translate";
import "./or-mwc-input";
diff --git a/ui/component/or-mwc-components/src/or-mwc-drawer.ts b/ui/component/or-mwc-components/src/or-mwc-drawer.ts
index 1da5612fb..a0ffad58d 100644
--- a/ui/component/or-mwc-components/src/or-mwc-drawer.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-drawer.ts
@@ -1,6 +1,7 @@
-import { css, customElement, html, LitElement, property, TemplateResult, unsafeCSS, query } from "lit-element";
+import { css, html, LitElement, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import { MDCDrawer } from "@material/drawer";
-import { classMap } from "lit-html/directives/class-map";
+import { classMap } from "lit/directives/class-map";
const drawerStyle = require("@material/drawer/dist/mdc.drawer.css");
diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.ts
index b92e65e82..9add22cc6 100644
--- a/ui/component/or-mwc-components/src/or-mwc-input.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts
@@ -1,6 +1,7 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";
-import {classMap} from "lit-html/directives/class-map";
-import {ifDefined} from "lit-html/directives/if-defined";
+import {css, html, LitElement, PropertyValues, TemplateResult, unsafeCSS} from "lit";
+import {customElement, property, state} from "lit/decorators.js";
+import {classMap} from "lit/directives/class-map";
+import {ifDefined} from "lit/directives/if-defined";
import {MDCTextField} from "@material/textfield";
import {MDCComponent} from "@material/base";
import {MDCRipple} from "@material/ripple";
@@ -45,6 +46,7 @@ import {
} from "@openremote/model";
import {getItemTemplate, getListTemplate, ListItem, ListType} from "./or-mwc-list";
import { i18next } from "@openremote/or-translate";
+import { MDCMenu } from "@material/menu";
// TODO: Add webpack/rollup to build so consumers aren't forced to use the same tooling
const buttonStyle = require("@material/button/dist/mdc.button.css");
@@ -684,7 +686,10 @@ export class OrMwcInput extends LitElement {
public helperPersistent: boolean = false;
@property({type: String})
- public validationMessage = "";
+ public validationMessage?: string;
+
+ @property({type: Boolean})
+ public autoValidate = false;
@property({type: Boolean})
public charCounter: boolean = false;
@@ -705,6 +710,8 @@ export class OrMwcInput extends LitElement {
protected _mdcComponent2?: MDCComponent<any>;
protected _selectedIndex = -1;
protected _tempValue: any;
+ @state()
+ protected isUiValid = true;
disconnectedCallback(): void {
super.disconnectedCallback();
@@ -762,17 +769,6 @@ export class OrMwcInput extends LitElement {
}
}
- public setCustomValidity(msg?: string) {
- const elem = this.shadowRoot!.getElementById("elem") as HTMLElement;
- if (!elem || !(elem as any).setCustomValidity) {
- return;
- }
- (elem as any).setCustomValidity(msg);
- if (this._mdcComponent && (this._mdcComponent as any).valid) {
- (this._mdcComponent as any).valid = (elem as any).checkValidity();
- }
- }
-
protected render() {
if (this.type) {
@@ -780,7 +776,7 @@ export class OrMwcInput extends LitElement {
const showLabel = !this.fullWidth && this.label;
let outlined = !this.fullWidth && this.outlined;
let hasHelper = !!this.helperText;
- const showValidationMessage = this.validationMessage;
+ const showValidationMessage = !this.isUiValid && !!this.validationMessage;
const helperClasses = {
"mdc-text-field-helper-text--persistent": this.helperPersistent,
"mdc-text-field-helper-text--validation-msg": showValidationMessage,
@@ -854,10 +850,8 @@ export class OrMwcInput extends LitElement {
if (this.multiple) {
ev.stopPropagation();
- let inputValue = this._tempValue || this.value;
- if (!Array.isArray(inputValue)) {
- inputValue = inputValue ? [this.value] : [];
- }
+ const inputValue = this._tempValue ?? (Array.isArray(this.value) ? [...this.value] : this.value !== undefined ? [this.value] : []);
+
const index = inputValue.findIndex((v: any) => v === value);
if (index >= 0) {
inputValue.splice(index, 1);
@@ -874,7 +868,7 @@ export class OrMwcInput extends LitElement {
const menuCloseHandler = () => {
- const v = (this._tempValue || this.value);
+ const v = (this._tempValue ?? this.value);
window.setTimeout(() => {
if (this._mdcComponent) {
// Hack to stop label moving down when there is a value set
@@ -901,7 +895,7 @@ export class OrMwcInput extends LitElement {
<span class="mdc-select__ripple"></span>
${outlined ? this.renderOutlined(labelTemplate) : labelTemplate}
<span class="mdc-select__selected-text-container">
- <span id="selected-text" class="mdc-select__selected-text">${this.getSelectedTextValue(opts)}</span>
+ <span id="selected-text" class="mdc-select__selected-text"></span>
</span>
<span class="mdc-select__dropdown-icon">
<svg
@@ -945,7 +939,7 @@ export class OrMwcInput extends LitElement {
)}
</div>
- ${hasHelper ? html`
+ ${hasHelper || showValidationMessage ? html`
<p id="component-helper-text" class="mdc-select-helper-text ${classMap(helperClasses)}" aria-hidden="true">
${showValidationMessage ? this.validationMessage : this.helperText}
</p>` : ``}
@@ -1030,7 +1024,7 @@ export class OrMwcInput extends LitElement {
<input type="checkbox"
id="elem"
?checked="${this.value}"
- ?required="${!this.required}"
+ ?required="${this.required}"
?disabled="${this.disabled || this.readonly}"
@change="${(e: Event) => this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).checked)}"
class="mdc-checkbox__native-control" id="elem"/>
@@ -1151,7 +1145,7 @@ export class OrMwcInput extends LitElement {
if ((e.code === "Enter" || e.code === "NumpadEnter")) {
this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).value, true);
}}}"
- @input="${(e: Event) => this.clearValidation(e)}"
+ @blur="${(e: Event) => this.reportValidity()}"
@change="${(e: Event) => this.onValueChange((e.target as HTMLInputElement), (e.target as HTMLInputElement).value)}" />`;
inputElem = html`
@@ -1163,7 +1157,7 @@ export class OrMwcInput extends LitElement {
<span class="mdc-line-ripple"></span>
${this.iconTrailing ? html`<or-icon class="mdc-text-field__icon mdc-text-field__icon--trailing" aria-hidden="true" icon="${this.iconTrailing}"></or-icon>` : ``}
</label>
- ${hasHelper ? html`
+ ${hasHelper || showValidationMessage ? html`
<div class="mdc-text-field-helper-line">
<div class="mdc-text-field-helper-text ${classMap(helperClasses)}">${showValidationMessage ? this.validationMessage : this.helperText}</div>
${this.charCounter && !this.readonly ? html`<div class="mdc-text-field-character-counter"></div>` : ``}
@@ -1222,9 +1216,32 @@ export class OrMwcInput extends LitElement {
}
}
+ update(_changedProperties: PropertyValues) {
+ if (_changedProperties.has('autoValidate') && this._mdcComponent) {
+ const comp = this._mdcComponent as any;
+ if (comp.foundation && comp.foundation.setValidateOnValueChange) {
+ comp.foundation.setValidateOnValueChange(this.autoValidate);
+ }
+ }
+
+ super.update(_changedProperties);
+ }
+
+ firstUpdated(_changedProperties: PropertyValues) {
+ super.firstUpdated(_changedProperties);
+
+ if (this.autoValidate) {
+ this.reportValidity();
+ }
+ }
+
protected updated(_changedProperties: PropertyValues): void {
super.updated(_changedProperties);
+ if (this.autoValidate) {
+ this.reportValidity();
+ }
+
if (_changedProperties.has("type")) {
const component = this.shadowRoot!.getElementById("component");
if (this._mdcComponent) {
@@ -1251,6 +1268,22 @@ export class OrMwcInput extends LitElement {
mdcSelect.selectedIndex = -1; // Without this first option will be shown as selected
}
+ if (this.multiple) {
+ // To make multiple select work then override the adapter getSelectedIndex
+ (this._mdcComponent as any).foundation.adapter.getSelectedIndex = () => {
+ // Return first item index
+ if (!Array.isArray(this.value) || (this.value as []).length === 0) {
+ return -1;
+ }
+ const firstSelected = (this.value as any[])[0];
+ const items = (this._mdcComponent as any).foundation.adapter.getMenuItemValues();
+ return items.indexOf(firstSelected);
+ };
+ }
+
+ mdcSelect.useDefaultValidation = !this.multiple;
+ mdcSelect.valid = (!this.multiple && mdcSelect.valid) || (this.multiple && this.required && Array.isArray(this.value) && (this.value as []).length > 0);
+
const selectedText = this.getSelectedTextValue();
(this._mdcComponent as any).foundation.adapter.setSelectedText(selectedText);
(this._mdcComponent as any).foundation.adapter.floatLabel(!!selectedText);
@@ -1318,6 +1351,8 @@ export class OrMwcInput extends LitElement {
if (_changedProperties.has("options")) {
(this._mdcComponent as MDCSelect).layoutOptions();
}
+ (this._mdcComponent as MDCSelect).useDefaultValidation = !this.multiple;
+ (this._mdcComponent as MDCSelect).valid = (!this.multiple && (this._mdcComponent as MDCSelect).valid) || (this.multiple && this.required && Array.isArray(this.value) && (this.value as []).length > 0);
const selectedText = this.getSelectedTextValue();
(this._mdcComponent as any).foundation.adapter.setSelectedText(selectedText);
(this._mdcComponent as any).foundation.adapter.floatLabel(!!selectedText);
@@ -1335,6 +1370,8 @@ export class OrMwcInput extends LitElement {
checkbox.checked = !!this.value;
checkbox.disabled = this.disabled || this.readonly;
}
+
+ (this._mdcComponent as any).required = this.required;
}
}
@@ -1352,24 +1389,39 @@ export class OrMwcInput extends LitElement {
`;
}
- protected clearValidation(e:Event){
- const input = e.target as HTMLInputElement
- if(input) input.setCustomValidity("");
+ public setCustomValidity(msg: string | undefined) {
+ this.validationMessage = msg;
+ const elem = this.shadowRoot!.getElementById("elem") as HTMLElement;
+ if (elem && (elem as any).setCustomValidity) {
+ (elem as any).setCustomValidity(msg ?? "");
+ }
+ this.reportValidity();
}
- protected onValueChange(elem: HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement | undefined, newValue: any | undefined, enterPressed?: boolean) {
- let valid = true;
+ public checkValidity(): boolean {
+ const elem = this.shadowRoot!.getElementById("elem") as any;
+ if (elem && elem.validity) {
+ const nativeValidity = elem.validity as ValidityState;
+ return nativeValidity.valid;
+ }
+ return true;
+ }
- if (elem && this._mdcComponent) {
+ public reportValidity(): boolean {
+ const isValid = this.checkValidity();
+ this.isUiValid = isValid;
- // trigger validation
- valid = elem.checkValidity();
- if (this._mdcComponent instanceof MDCTextField) {
- this._mdcComponent.valid = valid;
- }
- if (!valid && this.type !== InputType.CHECKBOX) return;
+ if (this._mdcComponent) {
+ (this._mdcComponent as any).valid = isValid;
}
+ return isValid;
+ }
+
+ protected onValueChange(elem: HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement | undefined, newValue: any | undefined, enterPressed?: boolean) {
+
+ this.reportValidity();
+
let previousValue = this.value;
if (previousValue === undefined) {
diff --git a/ui/component/or-mwc-components/src/or-mwc-list.ts b/ui/component/or-mwc-components/src/or-mwc-list.ts
index 3b93dc3bb..d5bf861ff 100644
--- a/ui/component/or-mwc-components/src/or-mwc-list.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-list.ts
@@ -1,16 +1,14 @@
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
-import {styleMap} from "lit-html/directives/style-map";
-import {ifDefined} from "lit-html/directives/if-defined";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
+import {styleMap} from "lit/directives/style-map";
+import {ifDefined} from "lit/directives/if-defined";
import {MDCList, MDCListActionEvent} from "@material/list";
import { DefaultColor8, DefaultColor4, Util } from "@openremote/core";
import "@openremote/or-translate";
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 365851335..102b96073 100644
--- a/ui/component/or-mwc-components/src/or-mwc-menu.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-menu.ts
@@ -1,14 +1,12 @@
import {
css,
- customElement,
html,
LitElement,
- property,
PropertyValues,
- query,
TemplateResult,
unsafeCSS
-} from "lit-element";
+} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {MDCMenu} from "@material/menu";
import {DefaultColor4, DefaultColor8} from "@openremote/core";
diff --git a/ui/component/or-mwc-components/src/or-mwc-snackbar.ts b/ui/component/or-mwc-components/src/or-mwc-snackbar.ts
index da4b5f052..65d172b43 100644
--- a/ui/component/or-mwc-components/src/or-mwc-snackbar.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-snackbar.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, query, unsafeCSS} from "lit-element";
+import {css, html, LitElement, PropertyValues, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {MDCSnackbar, MDCSnackbarCloseEvent} from "@material/snackbar";
const drawerStyle = require("@material/snackbar/dist/mdc.snackbar.css");
diff --git a/ui/component/or-panel/package.json b/ui/component/or-panel/package.json
index b3ebd0136..5df5b0ba9 100644
--- a/ui/component/or-panel/package.json
+++ b/ui/component/or-panel/package.json
@@ -13,11 +13,10 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@material/elevation": "^9.0.0",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"simplebar": "^5.0.7"
},
"devDependencies": {
- "@types/simplebar": "^5.1.1",
"tslint": ">=5.11.0",
"typescript": ">=4.1.3",
"webpack": "^5.16.0",
diff --git a/ui/component/or-panel/src/index.ts b/ui/component/or-panel/src/index.ts
index 9193681b6..9cbcd9d28 100644
--- a/ui/component/or-panel/src/index.ts
+++ b/ui/component/or-panel/src/index.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, PropertyValues, query, unsafeCSS, property} from "lit-element";
+import {css, html, LitElement, PropertyValues, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import SimpleBar from "simplebar";
import {DefaultColor2} from "@openremote/core";
diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.json
index 622de06eb..d9f9e2527 100644
--- a/ui/component/or-rules/package.json
+++ b/ui/component/or-rules/package.json
@@ -22,7 +22,7 @@
"@openremote/rest": "^1.0.3",
"ace-builds": "^1.4.7",
"linqts": "^1.12.6",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0",
"resize-observer": "^1.0.0",
"rrule": "^2.6.4",
diff --git a/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts b/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts
index 24b6de0e8..b4ff221ec 100644
--- a/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/confirmation-dialog.ts
@@ -1,4 +1,5 @@
-import { LitElement, html, customElement, css, property } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { i18next, translate } from "@openremote/or-translate";
@customElement("confirmation-dialog")
diff --git a/ui/component/or-rules/src/flow-viewer/components/connection-container.ts b/ui/component/or-rules/src/flow-viewer/components/connection-container.ts
index 769454eab..0033766aa 100644
--- a/ui/component/or-rules/src/flow-viewer/components/connection-container.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/connection-container.ts
@@ -1,5 +1,6 @@
-import { LitElement, html, customElement, property } from "lit-element";
-import { repeat } from "lit-html/directives/repeat";
+import { LitElement, html } from "lit";
+import {customElement, property} from "lit/decorators.js";
+import { repeat } from "lit/directives/repeat";
import { EditorWorkspace } from "./editor-workspace";
import { project } from "./flow-editor";
diff --git a/ui/component/or-rules/src/flow-viewer/components/connection-line.ts b/ui/component/or-rules/src/flow-viewer/components/connection-line.ts
index 8a8918285..4bf4d9594 100644
--- a/ui/component/or-rules/src/flow-viewer/components/connection-line.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/connection-line.ts
@@ -1,4 +1,5 @@
-import { html, customElement, css, property } from "lit-element";
+import { html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { NodeConnection } from "@openremote/model";
import { IdentityDomLink, IdentityAssigner, NodeUtilities } from "../node-structure";
import { FlowNodeSocket } from "./flow-node-socket";
diff --git a/ui/component/or-rules/src/flow-viewer/components/context-menu.ts b/ui/component/or-rules/src/flow-viewer/components/context-menu.ts
index b047628f8..324fc2407 100644
--- a/ui/component/or-rules/src/flow-viewer/components/context-menu.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/context-menu.ts
@@ -1,4 +1,5 @@
-import { LitElement, property, customElement, html, css } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { ContextMenuEntry, ContextMenuButton } from "../models/context-menu-button";
import { translate, i18next } from "@openremote/or-translate";
diff --git a/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts b/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts
index 3513bf84c..41698bfc9 100644
--- a/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/editor-workspace.ts
@@ -1,5 +1,6 @@
-import { LitElement, html, customElement, property } from "lit-element";
-import { repeat } from "lit-html/directives/repeat";
+import { LitElement, html } from "lit";
+import {customElement, property} from "lit/decorators.js";
+import { repeat } from "lit/directives/repeat";
import { Node, NodeSocket, NodeType } from "@openremote/model";
import { IdentityDomLink, CopyMachine } from "../node-structure";
import { List } from "linqts";
diff --git a/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts b/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts
index 5114f11ba..43d170c7c 100644
--- a/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/flow-editor.ts
@@ -1,4 +1,5 @@
-import { LitElement, html, customElement, css, query, property } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import { Integration } from "../services/integration";
import { CopyPasteManager } from "../services/copy-paste-manager";
import { Project } from "../services/project";
diff --git a/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts b/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts
index 44a8f871e..b0657a90a 100644
--- a/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/flow-node-socket.ts
@@ -1,4 +1,5 @@
-import { LitElement, customElement, property, html, css, query } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import { NodeSocket } from "@openremote/model";
import { IdentityDomLink } from "../node-structure";
import { Utilities } from "../utils";
diff --git a/ui/component/or-rules/src/flow-viewer/components/flow-node.ts b/ui/component/or-rules/src/flow-viewer/components/flow-node.ts
index a29586e4f..bec8a80b9 100644
--- a/ui/component/or-rules/src/flow-viewer/components/flow-node.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/flow-node.ts
@@ -1,4 +1,5 @@
-import { html, customElement, css, property } from "lit-element";
+import { html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { Node, NodeSocket } from "@openremote/model";
import { IdentityDomLink } from "../node-structure";
import { FlowNodeStyle } from "../styles/flow-node-style";
diff --git a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts b/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts
index 448b08267..7b1728f9d 100644
--- a/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/internal-picker.ts
@@ -1,4 +1,5 @@
-import { LitElement, property, customElement, html, css, TemplateResult } from "lit-element";
+import { LitElement, html, css, TemplateResult } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { Node, PickerType, AttributeInternalValue, AssetState, WellknownMetaItems, Asset, NodeDataType } from "@openremote/model";
import { nodeConverter } from "../converters/node-converter";
import { OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
diff --git a/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts b/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts
index 31b78c79d..928ce7a36 100644
--- a/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/node-menu-item.ts
@@ -1,4 +1,5 @@
-import { LitElement, html, customElement, css, property } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { Node, NodeType } from "@openremote/model";
import { EditorWorkspace } from "./editor-workspace";
import { Utilities } from "../utils";
diff --git a/ui/component/or-rules/src/flow-viewer/components/node-panel.ts b/ui/component/or-rules/src/flow-viewer/components/node-panel.ts
index 465d1c93a..e004972f9 100644
--- a/ui/component/or-rules/src/flow-viewer/components/node-panel.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/node-panel.ts
@@ -1,4 +1,5 @@
-import { LitElement, html, customElement, css, property, query } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import { NodeType, Node } from "@openremote/model";
import { i18next, translate } from "@openremote/or-translate";
import { OrMwcDrawer } from "@openremote/or-mwc-components/or-mwc-drawer";
diff --git a/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts b/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts
index 931cf892c..c717af287 100644
--- a/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/notification-dialog.ts
@@ -1,4 +1,5 @@
-import { LitElement, html, customElement, css, property } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { i18next, translate } from "@openremote/or-translate";
@customElement("notification-dialog")
diff --git a/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts b/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts
index 38581db94..034af74b0 100644
--- a/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/popup-modal.ts
@@ -1,4 +1,5 @@
-import { customElement, LitElement, css, html, property, TemplateResult } from "lit-element";
+import { LitElement, css, html, TemplateResult } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { modal } from "./flow-editor";
import { translate, i18next } from "@openremote/or-translate";
diff --git a/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts b/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts
index 3fc4005f8..135b25f0d 100644
--- a/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/rule-browser.ts
@@ -1,4 +1,5 @@
-import { LitElement, customElement, css, property, html } from "lit-element";
+import { LitElement, css, html } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { GlobalRuleset } from "@openremote/model";
import rest from "@openremote/rest";
import { i18next, translate } from "@openremote/or-translate";
diff --git a/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts b/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts
index e4e0e74e6..fa024365d 100644
--- a/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/selectable-element.ts
@@ -1,4 +1,5 @@
-import { LitElement, property } from "lit-element";
+import { LitElement } from "lit";
+import {property} from "lit/decorators.js";
import { input } from "./flow-editor";
import { i18next, translate } from "@openremote/or-translate";
diff --git a/ui/component/or-rules/src/flow-viewer/components/selection-box.ts b/ui/component/or-rules/src/flow-viewer/components/selection-box.ts
index e9fd727dd..11daec4cf 100644
--- a/ui/component/or-rules/src/flow-viewer/components/selection-box.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/selection-box.ts
@@ -1,4 +1,5 @@
-import { LitElement, customElement, property, html, css } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { Utilities } from "../utils";
import { EditorWorkspace } from "./editor-workspace";
import { input } from "./flow-editor";
diff --git a/ui/component/or-rules/src/flow-viewer/components/top-bar.ts b/ui/component/or-rules/src/flow-viewer/components/top-bar.ts
index cd1a1877d..81d32ed03 100644
--- a/ui/component/or-rules/src/flow-viewer/components/top-bar.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/top-bar.ts
@@ -1,4 +1,5 @@
-import { LitElement, html, customElement, css, property } from "lit-element";
+import { LitElement, html, css } from "lit";
+import {customElement, property} from "lit/decorators.js";
import { IdentityDomLink } from "../node-structure";
import { OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
import { Utilities } from "../utils";
diff --git a/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts b/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts
index 46a77a79a..612e61876 100644
--- a/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/workspace-contextmenu-options.ts
@@ -8,7 +8,7 @@ import i18next from "i18next";
import { Utilities } from "../utils";
import { CopyMachine } from "../node-structure";
import { ContextMenu } from "./context-menu";
-import { html } from "lit-element";
+import { html } from "lit";
export const createContextMenuButtons = (workspace: EditorWorkspace, e: MouseEvent) => {
const selectedNodes = input.selected.filter((s) => s instanceof FlowNode && s.selected) as FlowNode[];
diff --git a/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts b/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts
index 645f01880..152ad8e00 100644
--- a/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts
+++ b/ui/component/or-rules/src/flow-viewer/components/writable-dropdown.ts
@@ -1,4 +1,5 @@
-import { LitElement, customElement, property, html, query, PropertyValues } from "lit-element";
+import { LitElement, html, PropertyValues } from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import { PickerStyle } from "../styles/picker-styles";
@customElement("writable-dropdown")
diff --git a/ui/component/or-rules/src/flow-viewer/converters/node-converter.ts b/ui/component/or-rules/src/flow-viewer/converters/node-converter.ts
index 9d110b74d..43752bf65 100644
--- a/ui/component/or-rules/src/flow-viewer/converters/node-converter.ts
+++ b/ui/component/or-rules/src/flow-viewer/converters/node-converter.ts
@@ -1,4 +1,4 @@
-import { ComplexAttributeConverter } from "lit-element";
+import { ComplexAttributeConverter } from "lit";
import { Node } from "@openremote/model";
import { project } from "../components/flow-editor";
diff --git a/ui/component/or-rules/src/flow-viewer/services/modal.ts b/ui/component/or-rules/src/flow-viewer/services/modal.ts
index ba4f6d159..f052c4e6d 100644
--- a/ui/component/or-rules/src/flow-viewer/services/modal.ts
+++ b/ui/component/or-rules/src/flow-viewer/services/modal.ts
@@ -1,5 +1,5 @@
import { PopupModal } from "../components/popup-modal";
-import { html, TemplateResult } from "lit-element";
+import { html, TemplateResult } from "lit";
import { i18next } from "@openremote/or-translate";
export class ModalService {
diff --git a/ui/component/or-rules/src/flow-viewer/styles/editor-workspace-style.ts b/ui/component/or-rules/src/flow-viewer/styles/editor-workspace-style.ts
index 0ea439ed9..ac87c0930 100644
--- a/ui/component/or-rules/src/flow-viewer/styles/editor-workspace-style.ts
+++ b/ui/component/or-rules/src/flow-viewer/styles/editor-workspace-style.ts
@@ -1,4 +1,4 @@
-import { css } from "lit-element";
+import { css } from "lit";
export const EditorWorkspaceStyle = css`
:host{
diff --git a/ui/component/or-rules/src/flow-viewer/styles/flow-node-style.ts b/ui/component/or-rules/src/flow-viewer/styles/flow-node-style.ts
index 414ef10fd..f4c69a272 100644
--- a/ui/component/or-rules/src/flow-viewer/styles/flow-node-style.ts
+++ b/ui/component/or-rules/src/flow-viewer/styles/flow-node-style.ts
@@ -1,4 +1,4 @@
-import { css } from "lit-element";
+import { css } from "lit";
export const FlowNodeStyle = css`
:host{
diff --git a/ui/component/or-rules/src/flow-viewer/styles/picker-styles.ts b/ui/component/or-rules/src/flow-viewer/styles/picker-styles.ts
index a791456de..66e9850fc 100644
--- a/ui/component/or-rules/src/flow-viewer/styles/picker-styles.ts
+++ b/ui/component/or-rules/src/flow-viewer/styles/picker-styles.ts
@@ -1,4 +1,4 @@
-import { css } from "lit-element";
+import { css } from "lit";
export const PickerStyle = css`
input{
diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.ts
index 4f36257ce..b2926a652 100644
--- a/ui/component/or-rules/src/index.ts
+++ b/ui/component/or-rules/src/index.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, query, unsafeCSS} from "lit-element";
+import {css, html, LitElement, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import manager, {
AssetModelUtil,
DefaultBoxShadow,
diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts
index 32a95c486..133e3ccc5 100644
--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts
+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-email-message.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, css, property} from "lit-element";
+import {html, LitElement, css} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-mwc-components/or-mwc-input";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
diff --git a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts
index e4ea43e28..591a0f5f2 100644
--- a/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts
+++ b/ui/component/or-rules/src/json-viewer/forms/or-rule-form-push-notification.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, css, property} from "lit-element";
+import {html, LitElement, css} from "lit";
+import {customElement, property} from "lit/decorators.js";
import "@openremote/or-mwc-components/or-mwc-input";
import i18next from "i18next";
import {translate} from "@openremote/or-translate";
diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts
index 8460026ab..d8cf5fbf7 100644
--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts
+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-notification-modal.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, PropertyValues} from "lit-element";
+import {html, LitElement, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {
RuleActionNotification,
AssetQuery,
diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts
index 39266d8d4..f7da270ed 100644
--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts
+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-radial-modal.ts
@@ -1,4 +1,5 @@
-import { customElement, html, LitElement, property} from "lit-element";
+import { html, LitElement } from "lit";
+import {customElement, property} from "lit/decorators.js";
import {
AssetDescriptor,
AttributePredicate,
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts
index a856f23bc..4f83ab983 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-attribute.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {getAssetIdsFromQuery, getAssetTypeFromQuery, RulesConfig} from "../index";
import {
Asset,
@@ -16,7 +17,7 @@ import i18next from "i18next";
import {OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";
import {translate} from "@openremote/or-translate";
import {OrAttributeInputChangedEvent} from "@openremote/or-attribute-input";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
// language=CSS
const style = css`
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
index da5b2e790..66cfd0419 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
@@ -1,5 +1,6 @@
-import {css, customElement, html, LitElement, property, TemplateResult} from "lit-element";
-import {until} from "lit-html/directives/until";
+import {css, html, LitElement, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
+import {until} from "lit/directives/until";
import {ActionTargetType, ActionType, OrRulesRuleUnsupportedEvent, RulesConfig} from "../index";
import {
AssetQuery,
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts
index ac18d4ba1..f019a1eec 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues} from "lit-element";
+import {css, html, LitElement, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {
Asset,
AssetDescriptor,
@@ -28,7 +29,7 @@ import {OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";
import {translate} from "@openremote/or-translate";
import {OrAttributeInputChangedEvent} from "@openremote/or-attribute-input";
import "./modals/or-rule-radial-modal";
-import { ifDefined } from "lit-html/directives/if-defined";
+import { ifDefined } from "lit/directives/if-defined";
// language=CSS
const style = css`
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts
index e32673a69..6d9e7e8f6 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-condition.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-condition.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, query, TemplateResult} from "lit-element";
+import {css, html, LitElement, TemplateResult} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {AssetTypeInfo, RuleCondition, WellknownAssets} from "@openremote/model";
import {ConditionType, getAssetTypeFromQuery, RulesConfig} from "../index";
import "./or-rule-asset-query";
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
index 132502e02..67b9bb636 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-json-viewer.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {
getAssetInfos,
getAssetTypeFromQuery,
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts
index 726379429..c3880b389 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-then-otherwise.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, TemplateResult} from "lit-element";
+import {css, html, LitElement, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {buttonStyle} from "../style";
import "./or-rule-asset-query";
import {ActionType, getAssetTypeFromQuery, RulesConfig} from "../index";
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-when.ts b/ui/component/or-rules/src/json-viewer/or-rule-when.ts
index 5b541d70c..ec79ec44a 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-when.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-when.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {AssetDescriptor, JsonRule, LogicGroup, LogicGroupOperator, RuleCondition, WellknownAssets, AssetTypeInfo} from "@openremote/model";
import {OrRulesRuleUnsupportedEvent, RulesConfig} from "../index";
import {buttonStyle} from "../style";
diff --git a/ui/component/or-rules/src/or-rule-list.ts b/ui/component/or-rules/src/or-rule-list.ts
index 1bf918613..bc71553d3 100644
--- a/ui/component/or-rules/src/or-rule-list.ts
+++ b/ui/component/or-rules/src/or-rule-list.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {CalendarEvent, ClientRole, RulesetLang, RulesetUnion, TenantRuleset, WellknownMetaItems, WellknownRulesetMetaItems} from "@openremote/model";
import "@openremote/or-translate";
import manager, {OREvent, Util} from "@openremote/core";
diff --git a/ui/component/or-rules/src/or-rule-text-viewer.ts b/ui/component/or-rules/src/or-rule-text-viewer.ts
index 48493ea6f..c83371dbc 100644
--- a/ui/component/or-rules/src/or-rule-text-viewer.ts
+++ b/ui/component/or-rules/src/or-rule-text-viewer.ts
@@ -1,5 +1,6 @@
import {OrRulesRuleChangedEvent, RulesConfig, RuleView} from "./index";
-import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {RulesetLang, RulesetUnion} from "@openremote/model";
import ace, {Ace} from "ace-builds";
import "ace-builds/src-noconflict/mode-javascript";
@@ -7,6 +8,7 @@ import "ace-builds/src-noconflict/mode-json";
import "ace-builds/src-noconflict/mode-groovy";
import "ace-builds/webpack-resolver";
+// language=CSS
const style = css`
:host {
display: flex;
@@ -87,11 +89,11 @@ export class OrRuleTextViewer extends LitElement implements RuleView {
}
protected refresh() {
- this.destoryEditor()
+ this.destroyEditor()
this.initEditor();
}
- protected destoryEditor() {
+ protected destroyEditor() {
if (this._aceEditor) {
this._aceEditor.destroy();
this._aceEditor = undefined;
@@ -119,7 +121,7 @@ export class OrRuleTextViewer extends LitElement implements RuleView {
}
if (!this._aceElem) {
- this.destoryEditor();
+ this.destroyEditor();
} else {
if (!this._aceEditor) {
this.initEditor();
diff --git a/ui/component/or-rules/src/or-rule-validity.ts b/ui/component/or-rules/src/or-rule-validity.ts
index 71c768d20..faedc22f1 100644
--- a/ui/component/or-rules/src/or-rule-validity.ts
+++ b/ui/component/or-rules/src/or-rule-validity.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {CalendarEvent, RulesetUnion, WellknownRulesetMetaItems} from "@openremote/model";
import {OrRulesRuleChangedEvent} from "./index";
import "@openremote/or-mwc-components/or-mwc-input";
diff --git a/ui/component/or-rules/src/or-rule-viewer.ts b/ui/component/or-rules/src/or-rule-viewer.ts
index bfffbdd61..dbecc4118 100644
--- a/ui/component/or-rules/src/or-rule-viewer.ts
+++ b/ui/component/or-rules/src/or-rule-viewer.ts
@@ -1,4 +1,5 @@
-import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";
+import {css, html, LitElement, PropertyValues, TemplateResult} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
import {
OrRulesRuleChangedEvent,
OrRulesRuleUnsupportedEvent,
diff --git a/ui/component/or-rules/src/style.ts b/ui/component/or-rules/src/style.ts
index bed56c92c..00e6ce7d4 100644
--- a/ui/component/or-rules/src/style.ts
+++ b/ui/component/or-rules/src/style.ts
@@ -1,5 +1,5 @@
import {DefaultColor5} from "@openremote/core";
-import {css, unsafeCSS} from "lit-element";
+import {css, unsafeCSS} from "lit";
// language=CSS
export const invalidStyle = css`
diff --git a/ui/component/or-smart-notify/package.json b/ui/component/or-smart-notify/package.json
index d4a1ded38..58122dd09 100644
--- a/ui/component/or-smart-notify/package.json
+++ b/ui/component/or-smart-notify/package.json
@@ -18,7 +18,7 @@
"@openremote/core": "^1.0.3",
"@openremote/model": "^1.0.3",
"@openremote/rest": "^1.0.3",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0"
},
"devDependencies": {
diff --git a/ui/component/or-smart-notify/src/index.ts b/ui/component/or-smart-notify/src/index.ts
index d91a98b6f..dcbe97a4f 100644
--- a/ui/component/or-smart-notify/src/index.ts
+++ b/ui/component/or-smart-notify/src/index.ts
@@ -1,4 +1,5 @@
-import {html, LitElement, property, customElement, PropertyValues} from "lit-element";
+import {html, LitElement, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import moment from "moment";
diff --git a/ui/component/or-survey-results/package.json b/ui/component/or-survey-results/package.json
index f07a3837e..428328d68 100644
--- a/ui/component/or-survey-results/package.json
+++ b/ui/component/or-survey-results/package.json
@@ -14,7 +14,7 @@
"dependencies": {
"@openremote/core": "^1.0.3",
"@openremote/model": "^1.0.3",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-survey-results/src/index.ts b/ui/component/or-survey-results/src/index.ts
index e7bc8230e..6e75bc6bc 100644
--- a/ui/component/or-survey-results/src/index.ts
+++ b/ui/component/or-survey-results/src/index.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, PropertyValues} from "lit-element";
+import {html, LitElement, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {Asset, AssetQuery} from "@openremote/model";
import {surveyResultStyle} from "./style";
import manager, { OREvent, EventCallback } from "@openremote/core";
diff --git a/ui/component/or-survey-results/src/style.ts b/ui/component/or-survey-results/src/style.ts
index d2c447dc4..2960b60e1 100644
--- a/ui/component/or-survey-results/src/style.ts
+++ b/ui/component/or-survey-results/src/style.ts
@@ -1,4 +1,4 @@
-import { html } from "lit-element";
+import { html } from "lit";
export const surveyResultStyle = html`
<style>
diff --git a/ui/component/or-survey/package.json b/ui/component/or-survey/package.json
index 48b6bcdb9..ebe9fe310 100644
--- a/ui/component/or-survey/package.json
+++ b/ui/component/or-survey/package.json
@@ -16,7 +16,7 @@
"@openremote/model": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"@types/lodash-es": "^4.17.3",
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"lodash-es": "^4.17.15",
"moment": "2.29.1"
},
diff --git a/ui/component/or-survey/src/index.ts b/ui/component/or-survey/src/index.ts
index da9804202..2f1fd54ac 100644
--- a/ui/component/or-survey/src/index.ts
+++ b/ui/component/or-survey/src/index.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, PropertyValues} from "lit-element";
+import {html, LitElement, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import {Asset, AssetQuery} from "@openremote/model";
import {surveyLayoutStyle, surveySectionStyle} from "./style";
import set from "lodash-es/set";
diff --git a/ui/component/or-survey/src/style.ts b/ui/component/or-survey/src/style.ts
index 6a6531734..59b4f932e 100644
--- a/ui/component/or-survey/src/style.ts
+++ b/ui/component/or-survey/src/style.ts
@@ -1,4 +1,4 @@
-import { html, unsafeCSS } from "lit-element";
+import { html, unsafeCSS } from "lit";
import {DefaultColor1, DefaultColor2,DefaultColor3, DefaultColor4, DefaultColor5, DefaultColor6, DefaultColor7} from "@openremote/core";
export const surveySectionStyle = html`
diff --git a/ui/component/or-table/package.json b/ui/component/or-table/package.json
index 7d563d49f..83855d9b3 100644
--- a/ui/component/or-table/package.json
+++ b/ui/component/or-table/package.json
@@ -14,7 +14,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@material/data-table": "^9.0.0",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-table/src/index.ts b/ui/component/or-table/src/index.ts
index 8a4315698..9e8f4b87d 100644
--- a/ui/component/or-table/src/index.ts
+++ b/ui/component/or-table/src/index.ts
@@ -1,6 +1,7 @@
-import {css, customElement, html, LitElement, property, PropertyValues, TemplateResult, unsafeCSS, query} from "lit-element";
-import {classMap} from "lit-html/directives/class-map";
-import {ifDefined} from "lit-html/directives/if-defined";
+import {css, html, LitElement, unsafeCSS} from "lit";
+import {customElement, property, query} from "lit/decorators.js";
+import {classMap} from "lit/directives/class-map";
+import {ifDefined} from "lit/directives/if-defined";
import {MDCDataTable} from "@material/data-table";
import {DefaultColor1, DefaultColor4, DefaultColor8} from "@openremote/core";
diff --git a/ui/component/or-thermostat/package.json b/ui/component/or-thermostat/package.json
index 8f9dbe247..7482899fd 100644
--- a/ui/component/or-thermostat/package.json
+++ b/ui/component/or-thermostat/package.json
@@ -12,7 +12,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-thermostat/src/index.ts b/ui/component/or-thermostat/src/index.ts
index f52b458a7..82645ab13 100644
--- a/ui/component/or-thermostat/src/index.ts
+++ b/ui/component/or-thermostat/src/index.ts
@@ -1,4 +1,5 @@
-import {css, html, LitElement, property, customElement} from "lit-element";
+import {css, html, LitElement} from "lit";
+import {customElement, property} from "lit/decorators.js";
import manager from "@openremote/core";
import {AttributeEvent} from "@openremote/model";
diff --git a/ui/component/or-timeline/package.json b/ui/component/or-timeline/package.json
index 478e480b4..882b641ff 100644
--- a/ui/component/or-timeline/package.json
+++ b/ui/component/or-timeline/package.json
@@ -12,7 +12,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "lit-element": "^2.4.0",
+ "lit": "^2.0.0-rc.2",
"moment": "^2.24.0"
},
"devDependencies": {
diff --git a/ui/component/or-timeline/src/index.ts b/ui/component/or-timeline/src/index.ts
index 2de94b379..b5face2fe 100644
--- a/ui/component/or-timeline/src/index.ts
+++ b/ui/component/or-timeline/src/index.ts
@@ -1,4 +1,5 @@
-import {html, LitElement, property, customElement} from "lit-element";
+import {html, LitElement} from "lit";
+import {customElement, property} from "lit/decorators.js";
import moment from "moment";
@customElement("or-timeline")
diff --git a/ui/component/or-translate/package.json b/ui/component/or-translate/package.json
index 3d1d468dd..030893235 100644
--- a/ui/component/or-translate/package.json
+++ b/ui/component/or-translate/package.json
@@ -12,7 +12,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"i18next": "^19.9.2",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"tslint": ">=5.11.0",
diff --git a/ui/component/or-translate/src/index.ts b/ui/component/or-translate/src/index.ts
index ab2ec00f8..485c6250d 100644
--- a/ui/component/or-translate/src/index.ts
+++ b/ui/component/or-translate/src/index.ts
@@ -1,6 +1,7 @@
import {translate} from "./translate-mixin";
import i18next, {InitOptions, TOptions } from "i18next";
-import {LitElement, customElement, property, html, css} from "lit-element";
+import {LitElement, html, css} from "lit";
+import {customElement, property} from "lit/decorators.js";
export {i18next};
diff --git a/ui/component/or-translate/src/translate-mixin.ts b/ui/component/or-translate/src/translate-mixin.ts
index 3d8256cda..dc9d06c88 100644
--- a/ui/component/or-translate/src/translate-mixin.ts
+++ b/ui/component/or-translate/src/translate-mixin.ts
@@ -1,4 +1,4 @@
-import {PropertyValues} from "lit-element";
+import {PropertyValues} from "lit";
import { InitOptions, i18n } from "i18next";
declare type Constructor<T> = new (...args: any[]) => T;
diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.json
index 8f93ac48e..76d6d2c76 100644
--- a/ui/demo/demo-core/package.json
+++ b/ui/demo/demo-core/package.json
@@ -19,7 +19,7 @@
"@openremote/or-icon": "^1.0.3",
"@openremote/or-translate": "^1.0.3",
"i18next": "^19.9.2",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"@openremote/util": "^1.0.4",
diff --git a/ui/demo/demo-core/src/index.ts b/ui/demo/demo-core/src/index.ts
index 7cb848786..c959ab4b0 100644
--- a/ui/demo/demo-core/src/index.ts
+++ b/ui/demo/demo-core/src/index.ts
@@ -1,4 +1,5 @@
-import {customElement, html, LitElement, property, TemplateResult, PropertyValues} from "lit-element";
+import {html, LitElement, TemplateResult, PropertyValues} from "lit";
+import {customElement, property} from "lit/decorators.js";
import manager, {AssetModelUtil, Auth, Manager, OREvent, subscribe, Util} from "@openremote/core";
import "@openremote/or-icon";
import "@openremote/or-translate";
diff --git a/ui/demo/demo-or-asset-tree/src/index.ts b/ui/demo/demo-or-asset-tree/src/index.ts
index 31939b0ae..58c4e386e 100644
--- a/ui/demo/demo-or-asset-tree/src/index.ts
+++ b/ui/demo/demo-or-asset-tree/src/index.ts
@@ -2,7 +2,8 @@ import "@polymer/iron-demo-helpers/demo-pages-shared-styles";
import "@polymer/iron-demo-helpers/demo-snippet";
import "@openremote/or-asset-tree";
import manager, {Auth} from "@openremote/core";
-import {customElement, html, LitElement, property, TemplateResult, css} from "lit-element";
+import {html, LitElement, TemplateResult, css} from "lit";
+import {customElement, property} from "lit/decorators.js";
@customElement("or-demo-app")
class App extends LitElement {
diff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.json
index 43286d248..5d5fafdf9 100644
--- a/ui/demo/demo-rest/package.json
+++ b/ui/demo/demo-rest/package.json
@@ -16,7 +16,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/rest": "^1.0.3",
- "lit-element": "^2.4.0"
+ "lit": "^2.0.0-rc.2"
},
"devDependencies": {
"@openremote/util": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index a0996bb32..35cc81006 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,97 +2,97 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
- integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+ integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
dependencies:
- "@babel/highlight" "^7.12.13"
+ "@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6"
- integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
+ integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
"@babel/core@^7.2.2":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559"
- integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/generator" "^7.13.9"
- "@babel/helper-compilation-targets" "^7.13.10"
- "@babel/helper-module-transforms" "^7.13.0"
- "@babel/helpers" "^7.13.10"
- "@babel/parser" "^7.13.10"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
+ integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
+ dependencies:
+ "@babel/code-frame" "^7.14.5"
+ "@babel/generator" "^7.14.5"
+ "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helpers" "^7.14.6"
+ "@babel/parser" "^7.14.6"
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
json5 "^2.1.2"
- lodash "^4.17.19"
semver "^6.3.0"
source-map "^0.5.0"
-"@babel/generator@^7.13.0", "@babel/generator@^7.13.9":
- version "7.13.9"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
- integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+"@babel/generator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785"
+ integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==
dependencies:
- "@babel/types" "^7.13.0"
+ "@babel/types" "^7.14.5"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
- integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
+"@babel/helper-annotate-as-pure@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
+ integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
dependencies:
- "@babel/types" "^7.12.13"
+ "@babel/types" "^7.14.5"
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
- integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
+ integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.12.13"
- "@babel/types" "^7.12.13"
+ "@babel/helper-explode-assignable-expression" "^7.14.5"
+ "@babel/types" "^7.14.5"
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
- integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
+ integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
dependencies:
- "@babel/compat-data" "^7.13.8"
- "@babel/helper-validator-option" "^7.12.17"
- browserslist "^4.14.5"
+ "@babel/compat-data" "^7.14.5"
+ "@babel/helper-validator-option" "^7.14.5"
+ browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.13.0":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.10.tgz#073b2bbb925a097643c6fc5770e5f13394e887c9"
- integrity sha512-YV7r2YxdTUaw84EwNkyrRke/TJHR/UXGiyvACRqvdVJ2/syV2rQuJNnaRLSuYiop8cMRXOgseTGoJCWX0q2fFg==
+"@babel/helper-create-class-features-plugin@^7.14.5":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542"
+ integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==
dependencies:
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-member-expression-to-functions" "^7.13.0"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/helper-replace-supers" "^7.13.0"
- "@babel/helper-split-export-declaration" "^7.12.13"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-member-expression-to-functions" "^7.14.5"
+ "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
-"@babel/helper-create-regexp-features-plugin@^7.12.13":
- version "7.12.17"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
- integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+ integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
regexpu-core "^4.7.1"
-"@babel/helper-define-polyfill-provider@^0.1.5":
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
- integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
+"@babel/helper-define-polyfill-provider@^0.2.2":
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+ integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
dependencies:
"@babel/helper-compilation-targets" "^7.13.0"
"@babel/helper-module-imports" "^7.12.13"
@@ -103,269 +103,295 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.12.13":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
- integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
+"@babel/helper-explode-assignable-expression@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
+ integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
dependencies:
- "@babel/types" "^7.13.0"
-
-"@babel/helper-function-name@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
- integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
- dependencies:
- "@babel/helper-get-function-arity" "^7.12.13"
- "@babel/template" "^7.12.13"
- "@babel/types" "^7.12.13"
-
-"@babel/helper-get-function-arity@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
- integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-function-name@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
+ integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
dependencies:
- "@babel/types" "^7.12.13"
+ "@babel/helper-get-function-arity" "^7.14.5"
+ "@babel/template" "^7.14.5"
+ "@babel/types" "^7.14.5"
-"@babel/helper-hoist-variables@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"
- integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==
- dependencies:
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
-
-"@babel/helper-member-expression-to-functions@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
- integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
- dependencies:
- "@babel/types" "^7.13.0"
-
-"@babel/helper-module-imports@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
- integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-module-transforms@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
- integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
- dependencies:
- "@babel/helper-module-imports" "^7.12.13"
- "@babel/helper-replace-supers" "^7.13.0"
- "@babel/helper-simple-access" "^7.12.13"
- "@babel/helper-split-export-declaration" "^7.12.13"
- "@babel/helper-validator-identifier" "^7.12.11"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
- lodash "^4.17.19"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
- integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+"@babel/helper-get-function-arity@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
+ integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
dependencies:
- "@babel/types" "^7.12.13"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-hoist-variables@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
+ integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
- integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-remap-async-to-generator@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
- integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
- "@babel/helper-wrap-function" "^7.13.0"
- "@babel/types" "^7.13.0"
-
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
- integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
- dependencies:
- "@babel/helper-member-expression-to-functions" "^7.13.0"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
-
-"@babel/helper-simple-access@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
- integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
- integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
- dependencies:
- "@babel/types" "^7.12.1"
-
-"@babel/helper-split-export-declaration@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
- integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-validator-identifier@^7.12.11":
- version "7.12.11"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
- integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+"@babel/helper-member-expression-to-functions@^7.14.5":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
+ integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
+ integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-module-transforms@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e"
+ integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==
+ dependencies:
+ "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-simple-access" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-optimise-call-expression@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
+ integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+ integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-remap-async-to-generator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
+ integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-wrap-function" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-replace-supers@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
+ integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+ dependencies:
+ "@babel/helper-member-expression-to-functions" "^7.14.5"
+ "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-simple-access@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"
+ integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
+ integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-split-export-declaration@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
+ integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-validator-identifier@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
+ integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
+
+"@babel/helper-validator-option@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+ integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helper-wrap-function@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
+ integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+ dependencies:
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helpers@^7.14.6":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635"
+ integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==
+ dependencies:
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/highlight@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+ integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.14.5"
+ chalk "^2.0.0"
+ js-tokens "^4.0.0"
-"@babel/helper-validator-option@^7.12.17":
- version "7.12.17"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
- integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+"@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595"
+ integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==
-"@babel/helper-wrap-function@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
- integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
+ integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
dependencies:
- "@babel/helper-function-name" "^7.12.13"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/helpers@^7.13.10":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
- integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+"@babel/plugin-proposal-async-generator-functions@^7.14.7":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace"
+ integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==
dependencies:
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.14.5"
+ "@babel/plugin-syntax-async-generators" "^7.8.4"
-"@babel/highlight@^7.12.13":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
- integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+"@babel/plugin-proposal-class-properties@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+ integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
dependencies:
- "@babel/helper-validator-identifier" "^7.12.11"
- chalk "^2.0.0"
- js-tokens "^4.0.0"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.10.tgz#8f8f9bf7b3afa3eabd061f7a5bcdf4fec3c48409"
- integrity sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==
-
-"@babel/plugin-proposal-async-generator-functions@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"
- integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==
+"@babel/plugin-proposal-class-static-block@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
+ integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-remap-async-to-generator" "^7.13.0"
- "@babel/plugin-syntax-async-generators" "^7.8.4"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
-"@babel/plugin-proposal-class-properties@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
- integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+"@babel/plugin-proposal-dynamic-import@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
+ integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
- integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
-"@babel/plugin-proposal-export-namespace-from@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
- integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
+"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
+ integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-"@babel/plugin-proposal-json-strings@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
- integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
+"@babel/plugin-proposal-json-strings@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
+ integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-json-strings" "^7.8.3"
-"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
- integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
+"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
+ integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
- integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+ integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-"@babel/plugin-proposal-numeric-separator@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
- integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
+"@babel/plugin-proposal-numeric-separator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
+ integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
- integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
+ integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
dependencies:
- "@babel/compat-data" "^7.13.8"
- "@babel/helper-compilation-targets" "^7.13.8"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/compat-data" "^7.14.7"
+ "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.13.0"
+ "@babel/plugin-transform-parameters" "^7.14.5"
-"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
- integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+ integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-"@babel/plugin-proposal-optional-chaining@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756"
- integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==
+"@babel/plugin-proposal-optional-chaining@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+ integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
-"@babel/plugin-proposal-private-methods@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
- integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+"@babel/plugin-proposal-private-methods@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
+ integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
- integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+"@babel/plugin-proposal-private-property-in-object@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
+ integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
+ integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
@@ -381,6 +407,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.12.13"
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+ integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.14.5"
+
"@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"
@@ -444,297 +477,308 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-top-level-await@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
- integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+ integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-arrow-functions@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
- integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+ integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-async-to-generator@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
- integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+"@babel/plugin-transform-arrow-functions@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+ integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
dependencies:
- "@babel/helper-module-imports" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-remap-async-to-generator" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoped-functions@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
- integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+"@babel/plugin-transform-async-to-generator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+ integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
- integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
+"@babel/plugin-transform-block-scoped-functions@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+ integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
- integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
+"@babel/plugin-transform-block-scoping@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
+ integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-replace-supers" "^7.13.0"
- "@babel/helper-split-export-declaration" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf"
+ integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
globals "^11.1.0"
-"@babel/plugin-transform-computed-properties@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
- integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+"@babel/plugin-transform-computed-properties@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+ integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-destructuring@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963"
- integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==
+"@babel/plugin-transform-destructuring@^7.14.7":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
+ integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
- integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
+ integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-duplicate-keys@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
- integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+"@babel/plugin-transform-duplicate-keys@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
+ integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-exponentiation-operator@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
- integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+"@babel/plugin-transform-exponentiation-operator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+ integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-for-of@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
- integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+"@babel/plugin-transform-for-of@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
+ integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-function-name@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
- integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+"@babel/plugin-transform-function-name@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+ integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
dependencies:
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-literals@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
- integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+"@babel/plugin-transform-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+ integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-member-expression-literals@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
- integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+"@babel/plugin-transform-member-expression-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+ integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-modules-amd@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
- integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
+"@babel/plugin-transform-modules-amd@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
+ integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
dependencies:
- "@babel/helper-module-transforms" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
- integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
+"@babel/plugin-transform-modules-commonjs@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
+ integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==
dependencies:
- "@babel/helper-module-transforms" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-simple-access" "^7.12.13"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-simple-access" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
- integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+"@babel/plugin-transform-modules-systemjs@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
+ integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
dependencies:
- "@babel/helper-hoist-variables" "^7.13.0"
- "@babel/helper-module-transforms" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-validator-identifier" "^7.12.11"
+ "@babel/helper-hoist-variables" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-umd@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
- integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
+"@babel/plugin-transform-modules-umd@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
+ integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
dependencies:
- "@babel/helper-module-transforms" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
- integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e"
+ integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
-"@babel/plugin-transform-new-target@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
- integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+"@babel/plugin-transform-new-target@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
+ integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-object-super@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
- integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+"@babel/plugin-transform-object-super@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+ integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
- "@babel/helper-replace-supers" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
- integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
+"@babel/plugin-transform-parameters@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
+ integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-property-literals@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
- integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+"@babel/plugin-transform-property-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+ integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5"
- integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==
+"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+ integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
dependencies:
regenerator-transform "^0.14.2"
-"@babel/plugin-transform-reserved-words@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
- integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+"@babel/plugin-transform-reserved-words@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
+ integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-runtime@^7.8.3":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz#a1e40d22e2bf570c591c9c7e5ab42d6bf1e419e1"
- integrity sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==
- dependencies:
- "@babel/helper-module-imports" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.13.0"
- babel-plugin-polyfill-corejs2 "^0.1.4"
- babel-plugin-polyfill-corejs3 "^0.1.3"
- babel-plugin-polyfill-regenerator "^0.1.2"
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523"
+ integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==
+ dependencies:
+ "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ babel-plugin-polyfill-corejs2 "^0.2.2"
+ babel-plugin-polyfill-corejs3 "^0.2.2"
+ babel-plugin-polyfill-regenerator "^0.2.2"
semver "^6.3.0"
-"@babel/plugin-transform-shorthand-properties@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
- integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+"@babel/plugin-transform-shorthand-properties@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+ integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-spread@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
- integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+"@babel/plugin-transform-spread@^7.14.6":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
+ integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
-"@babel/plugin-transform-sticky-regex@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
- integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+"@babel/plugin-transform-sticky-regex@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+ integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-template-literals@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
- integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+"@babel/plugin-transform-template-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+ integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-typeof-symbol@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
- integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+"@babel/plugin-transform-typeof-symbol@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
+ integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-unicode-escapes@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
- integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
+"@babel/plugin-transform-unicode-escapes@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
+ integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-unicode-regex@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
- integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+"@babel/plugin-transform-unicode-regex@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+ integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/preset-env@^7.8.3":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252"
- integrity sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ==
- dependencies:
- "@babel/compat-data" "^7.13.8"
- "@babel/helper-compilation-targets" "^7.13.10"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-validator-option" "^7.12.17"
- "@babel/plugin-proposal-async-generator-functions" "^7.13.8"
- "@babel/plugin-proposal-class-properties" "^7.13.0"
- "@babel/plugin-proposal-dynamic-import" "^7.13.8"
- "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
- "@babel/plugin-proposal-json-strings" "^7.13.8"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
- "@babel/plugin-proposal-numeric-separator" "^7.12.13"
- "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
- "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
- "@babel/plugin-proposal-optional-chaining" "^7.13.8"
- "@babel/plugin-proposal-private-methods" "^7.13.0"
- "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.7.tgz#5c70b22d4c2d893b03d8c886a5c17422502b932a"
+ integrity sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==
+ dependencies:
+ "@babel/compat-data" "^7.14.7"
+ "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-validator-option" "^7.14.5"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
+ "@babel/plugin-proposal-async-generator-functions" "^7.14.7"
+ "@babel/plugin-proposal-class-properties" "^7.14.5"
+ "@babel/plugin-proposal-class-static-block" "^7.14.5"
+ "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+ "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+ "@babel/plugin-proposal-json-strings" "^7.14.5"
+ "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+ "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+ "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+ "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+ "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+ "@babel/plugin-proposal-private-methods" "^7.14.5"
+ "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
"@babel/plugin-syntax-json-strings" "^7.8.3"
@@ -744,45 +788,46 @@
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
- "@babel/plugin-syntax-top-level-await" "^7.12.13"
- "@babel/plugin-transform-arrow-functions" "^7.13.0"
- "@babel/plugin-transform-async-to-generator" "^7.13.0"
- "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
- "@babel/plugin-transform-block-scoping" "^7.12.13"
- "@babel/plugin-transform-classes" "^7.13.0"
- "@babel/plugin-transform-computed-properties" "^7.13.0"
- "@babel/plugin-transform-destructuring" "^7.13.0"
- "@babel/plugin-transform-dotall-regex" "^7.12.13"
- "@babel/plugin-transform-duplicate-keys" "^7.12.13"
- "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
- "@babel/plugin-transform-for-of" "^7.13.0"
- "@babel/plugin-transform-function-name" "^7.12.13"
- "@babel/plugin-transform-literals" "^7.12.13"
- "@babel/plugin-transform-member-expression-literals" "^7.12.13"
- "@babel/plugin-transform-modules-amd" "^7.13.0"
- "@babel/plugin-transform-modules-commonjs" "^7.13.8"
- "@babel/plugin-transform-modules-systemjs" "^7.13.8"
- "@babel/plugin-transform-modules-umd" "^7.13.0"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
- "@babel/plugin-transform-new-target" "^7.12.13"
- "@babel/plugin-transform-object-super" "^7.12.13"
- "@babel/plugin-transform-parameters" "^7.13.0"
- "@babel/plugin-transform-property-literals" "^7.12.13"
- "@babel/plugin-transform-regenerator" "^7.12.13"
- "@babel/plugin-transform-reserved-words" "^7.12.13"
- "@babel/plugin-transform-shorthand-properties" "^7.12.13"
- "@babel/plugin-transform-spread" "^7.13.0"
- "@babel/plugin-transform-sticky-regex" "^7.12.13"
- "@babel/plugin-transform-template-literals" "^7.13.0"
- "@babel/plugin-transform-typeof-symbol" "^7.12.13"
- "@babel/plugin-transform-unicode-escapes" "^7.12.13"
- "@babel/plugin-transform-unicode-regex" "^7.12.13"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+ "@babel/plugin-syntax-top-level-await" "^7.14.5"
+ "@babel/plugin-transform-arrow-functions" "^7.14.5"
+ "@babel/plugin-transform-async-to-generator" "^7.14.5"
+ "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+ "@babel/plugin-transform-block-scoping" "^7.14.5"
+ "@babel/plugin-transform-classes" "^7.14.5"
+ "@babel/plugin-transform-computed-properties" "^7.14.5"
+ "@babel/plugin-transform-destructuring" "^7.14.7"
+ "@babel/plugin-transform-dotall-regex" "^7.14.5"
+ "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+ "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+ "@babel/plugin-transform-for-of" "^7.14.5"
+ "@babel/plugin-transform-function-name" "^7.14.5"
+ "@babel/plugin-transform-literals" "^7.14.5"
+ "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+ "@babel/plugin-transform-modules-amd" "^7.14.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.14.5"
+ "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+ "@babel/plugin-transform-modules-umd" "^7.14.5"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7"
+ "@babel/plugin-transform-new-target" "^7.14.5"
+ "@babel/plugin-transform-object-super" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-property-literals" "^7.14.5"
+ "@babel/plugin-transform-regenerator" "^7.14.5"
+ "@babel/plugin-transform-reserved-words" "^7.14.5"
+ "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+ "@babel/plugin-transform-spread" "^7.14.6"
+ "@babel/plugin-transform-sticky-regex" "^7.14.5"
+ "@babel/plugin-transform-template-literals" "^7.14.5"
+ "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+ "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+ "@babel/plugin-transform-unicode-regex" "^7.14.5"
"@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.13.0"
- babel-plugin-polyfill-corejs2 "^0.1.4"
- babel-plugin-polyfill-corejs3 "^0.1.3"
- babel-plugin-polyfill-regenerator "^0.1.2"
- core-js-compat "^3.9.0"
+ "@babel/types" "^7.14.5"
+ babel-plugin-polyfill-corejs2 "^0.2.2"
+ babel-plugin-polyfill-corejs3 "^0.2.2"
+ babel-plugin-polyfill-regenerator "^0.2.2"
+ core-js-compat "^3.15.0"
semver "^6.3.0"
"@babel/preset-modules@^0.1.4":
@@ -796,50 +841,49 @@
"@babel/types" "^7.4.4"
esutils "^2.0.2"
-"@babel/runtime@^7.12.0", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
- version "7.13.10"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
- integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+"@babel/runtime@^7.12.0", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
+ integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
- integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/parser" "^7.12.13"
- "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
- integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/generator" "^7.13.0"
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-split-export-declaration" "^7.12.13"
- "@babel/parser" "^7.13.0"
- "@babel/types" "^7.13.0"
+"@babel/template@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
+ integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+ dependencies:
+ "@babel/code-frame" "^7.14.5"
+ "@babel/parser" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5":
+ version "7.14.7"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753"
+ integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==
+ dependencies:
+ "@babel/code-frame" "^7.14.5"
+ "@babel/generator" "^7.14.5"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-hoist-variables" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/parser" "^7.14.7"
+ "@babel/types" "^7.14.5"
debug "^4.1.0"
globals "^11.1.0"
- lodash "^4.17.19"
-"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.4.4":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
- integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
+"@babel/types@^7.14.5", "@babel/types@^7.4.4":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff"
+ integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==
dependencies:
- "@babel/helper-validator-identifier" "^7.12.11"
- lodash "^4.17.19"
+ "@babel/helper-validator-identifier" "^7.14.5"
to-fast-properties "^2.0.0"
"@discoveryjs/json-ext@^0.5.0":
- version "0.5.2"
- resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
- integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d"
+ integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==
"@evocateur/libnpmaccess@^3.1.2":
version "3.1.2"
@@ -915,31 +959,45 @@
unique-filename "^1.1.1"
which "^1.3.1"
-"@fortawesome/fontawesome-common-types@^0.2.34":
- version "0.2.34"
- resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915"
- integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==
+"@fortawesome/fontawesome-common-types@^0.2.35":
+ version "0.2.35"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz#01dd3d054da07a00b764d78748df20daf2b317e9"
+ integrity sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==
"@fortawesome/fontawesome-svg-core@^1.2.12":
- version "1.2.34"
- resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.34.tgz#1d1a7c92537cbc2b8a83eef6b6d824b4b5b46b26"
- integrity sha512-0KNN0nc5eIzaJxlv43QcDmTkDY1CqeN6J7OCGSs+fwGPdtv0yOQqRjieopBCmw+yd7uD3N2HeNL3Zm5isDleLg==
+ version "1.2.35"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz#85aea8c25645fcec88d35f2eb1045c38d3e65cff"
+ integrity sha512-uLEXifXIL7hnh2sNZQrIJWNol7cTVIzwI+4qcBIq9QWaZqUblm0IDrtSqbNg+3SQf8SMGHkiSigD++rHmCHjBg==
dependencies:
- "@fortawesome/fontawesome-common-types" "^0.2.34"
+ "@fortawesome/fontawesome-common-types" "^0.2.35"
"@fortawesome/free-regular-svg-icons@^5.6.3":
- version "5.15.2"
- resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.2.tgz#61eeb8c206e792c530eaa58279cc32c55332fe8f"
- integrity sha512-Uv5NQCYjyisNVTu/1Xjs+z8vwQjbfT6hiqYvQNfF0n8qdgfWLM581bAfVMQ3BCs1SPy+eEUKNcGkK4n0FihFHg==
+ version "5.15.3"
+ resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.3.tgz#1ec4f2410ff638db549c5c5484fc60b66407dbe6"
+ integrity sha512-q4/p8Xehy9qiVTdDWHL4Z+o5PCLRChePGZRTXkl+/Z7erDVL8VcZUuqzJjs6gUz6czss4VIPBRdCz6wP37/zMQ==
dependencies:
- "@fortawesome/fontawesome-common-types" "^0.2.34"
+ "@fortawesome/fontawesome-common-types" "^0.2.35"
"@fortawesome/free-solid-svg-icons@^5.6.3":
- version "5.15.2"
- resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.2.tgz#25bb035de57cf85aee8072965732368ccc8e8943"
- integrity sha512-ZfCU+QjaFsdNZmOGmfqEWhzI3JOe37x5dF4kz9GeXvKn/sTxhqMtZ7mh3lBf76SvcYY5/GKFuyG7p1r4iWMQqw==
+ version "5.15.3"
+ resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz#52eebe354f60dc77e0bde934ffc5c75ffd04f9d8"
+ integrity sha512-XPeeu1IlGYqz4VWGRAT5ukNMd4VHUEEJ7ysZ7pSSgaEtNvSo+FLurybGJVmiqkQdK50OkSja2bfZXOeyMGRD8Q==
+ dependencies:
+ "@fortawesome/fontawesome-common-types" "^0.2.35"
+
+"@jsonforms/core@^3.0.0-alpha.0":
+ version "3.0.0-alpha.0"
+ resolved "https://registry.yarnpkg.com/@jsonforms/core/-/core-3.0.0-alpha.0.tgz#c960e37ebf47c17c4ef2839b3410ee140e3909be"
+ integrity sha512-CIUh7uDlhH8a5/zk6YF5LXAbmu299eYBTJXLzjZSnCL1lyZtckCnEGvWzF8Y7A9cgAg18URRyjyloxfT0ARaRQ==
dependencies:
- "@fortawesome/fontawesome-common-types" "^0.2.34"
+ "@types/json-schema" "^7.0.3"
+ ajv "^6.10.2"
+ lodash "^4.17.15"
+
+"@juggle/resize-observer@^3.3.1":
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.3.1.tgz#b50a781709c81e10701004214340f25475a171a0"
+ integrity sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==
version "3.21.0"
@@ -1626,17 +1684,22 @@
npmlog "^4.1.2"
write-file-atomic "^2.3.0"
+"@lit/reactive-element@^1.0.0-rc.2":
+ version "1.0.0-rc.2"
+ resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.0.0-rc.2.tgz#f24dba16ea571a08dca70f1783bd2ca5ec8de3ee"
+ integrity sha512-cujeIl5Ei8FC7UHf4/4Q3bRJOtdTe1vpJV/JEBYCggedmQ+2P8A2oz7eE+Vxi6OJ4nc0X+KZxXnBoH4QrEbmEQ==
+
"@mapbox/[email protected]":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@mapbox/corslite/-/corslite-0.0.7.tgz#29f5b6a188ba946e514bdf0b6401ed4fbe13a39e"
integrity sha1-KfW2oYi6lG5RS98LZAHtT74To54=
"@mapbox/geojson-rewind@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.0.tgz#91f0ad56008c120caa19414b644d741249f4f560"
- integrity sha512-73l/qJQgj/T/zO1JXVfuVvvKDgikD/7D/rHAD28S9BG1OTstgmftrmqfCx4U+zQAmtsB6HcDA3a7ymdnJZAQgg==
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz#adbe16dc683eb40e90934c51a5e28c7bbf44f4e1"
+ integrity sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==
dependencies:
- concat-stream "~2.0.0"
+ get-stream "^6.0.1"
minimist "^1.2.5"
"@mapbox/geojson-types@^1.0.2":
@@ -2127,18 +2190,18 @@
call-me-maybe "^1.0.1"
glob-to-regexp "^0.3.0"
-"@nodelib/[email protected]":
- version "2.1.4"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
- integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+"@nodelib/[email protected]":
+ version "2.1.5"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+ integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
dependencies:
- "@nodelib/fs.stat" "2.0.4"
+ "@nodelib/fs.stat" "2.0.5"
run-parallel "^1.1.9"
-"@nodelib/[email protected]", "@nodelib/fs.stat@^2.0.2":
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
- integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+"@nodelib/[email protected]", "@nodelib/fs.stat@^2.0.2":
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
"@nodelib/fs.stat@^1.1.2":
version "1.1.3"
@@ -2146,11 +2209,11 @@
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
"@nodelib/fs.walk@^1.2.3":
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
- integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2"
+ integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==
dependencies:
- "@nodelib/fs.scandir" "2.1.4"
+ "@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
"@octokit/auth-token@^2.4.0":
@@ -2161,18 +2224,18 @@
"@octokit/types" "^6.0.3"
"@octokit/endpoint@^6.0.1":
- version "6.0.11"
- resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.11.tgz#082adc2aebca6dcefa1fb383f5efb3ed081949d1"
- integrity sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==
+ version "6.0.12"
+ resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
+ integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
dependencies:
"@octokit/types" "^6.0.3"
is-plain-object "^5.0.0"
universal-user-agent "^6.0.0"
-"@octokit/openapi-types@^5.3.2":
- version "5.3.2"
- resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-5.3.2.tgz#b8ac43c5c3d00aef61a34cf744e315110c78deb4"
- integrity sha512-NxF1yfYOUO92rCx3dwvA2onF30Vdlg7YUkMVXkeptqpzA3tRLplThhFleV/UKWFgh7rpKu1yYRbvNDUtzSopKA==
+"@octokit/openapi-types@^8.2.1":
+ version "8.2.1"
+ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-8.2.1.tgz#102e752a7378ff8d21057c70fd16f1c83856d8c5"
+ integrity sha512-BJz6kWuL3n+y+qM8Pv+UGbSxH6wxKf/SBs5yzGufMHwDefsa+Iq7ZGy1BINMD2z9SkXlIzk1qiu988rMuGXEMg==
"@octokit/plugin-enterprise-rest@^6.0.1":
version "6.0.1"
@@ -2187,9 +2250,9 @@
"@octokit/types" "^2.0.1"
"@octokit/plugin-request-log@^1.0.0":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz#70a62be213e1edc04bb8897ee48c311482f9700d"
- integrity sha512-4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+ integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
"@octokit/[email protected]":
version "2.4.0"
@@ -2208,27 +2271,25 @@
deprecation "^2.0.0"
once "^1.4.0"
-"@octokit/request-error@^2.0.0":
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.5.tgz#72cc91edc870281ad583a42619256b380c600143"
- integrity sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==
+"@octokit/request-error@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
+ integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
dependencies:
"@octokit/types" "^6.0.3"
deprecation "^2.0.0"
once "^1.4.0"
"@octokit/request@^5.2.0":
- version "5.4.14"
- resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.14.tgz#ec5f96f78333bb2af390afa5ff66f114b063bc96"
- integrity sha512-VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA==
+ version "5.6.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz#6084861b6e4fa21dc40c8e2a739ec5eff597e672"
+ integrity sha512-4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA==
dependencies:
"@octokit/endpoint" "^6.0.1"
- "@octokit/request-error" "^2.0.0"
- "@octokit/types" "^6.7.1"
- deprecation "^2.0.0"
+ "@octokit/request-error" "^2.1.0"
+ "@octokit/types" "^6.16.1"
is-plain-object "^5.0.0"
node-fetch "^2.6.1"
- once "^1.4.0"
universal-user-agent "^6.0.0"
"@octokit/rest@^16.28.4":
@@ -2260,12 +2321,12 @@
dependencies:
"@types/node" ">= 8"
-"@octokit/types@^6.0.3", "@octokit/types@^6.7.1":
- version "6.12.2"
- resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.12.2.tgz#5b44add079a478b8eb27d78cf384cc47e4411362"
- integrity sha512-kCkiN8scbCmSq+gwdJV0iLgHc0O/GTPY1/cffo9kECu1MvatLPh9E+qFhfRIktKfHEA6ZYvv6S1B4Wnv3bi3pA==
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1":
+ version "6.18.1"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.18.1.tgz#a6db178536e649fd5d67a7b747754bcc43940be4"
+ integrity sha512-5YsddjO1U+xC8ZYKV8yZYebW55PCc7qiEEeZ+wZRr6qyclynzfyD65KZ5FdtIeP0/cANyFaD7hV69qElf1nMsQ==
dependencies:
- "@octokit/openapi-types" "^5.3.2"
+ "@octokit/openapi-types" "^8.2.1"
"@polymer/polymer@^3.3.1":
version "3.4.1"
@@ -2275,35 +2336,20 @@
"@webcomponents/shadycss" "^1.9.1"
"@reduxjs/toolkit@^1.5.0":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.5.0.tgz#1025c1ccb224d1fc06d8d98a61f6717d57e6d477"
- integrity sha512-E/FUraRx+8guw9Hlg/Ja8jI/hwCrmIKed8Annt9YsZw3BQp+F24t5I5b2OWR6pkEHY4hn1BgP08FrTZFRKsdaQ==
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.6.0.tgz#0a17c6941c57341f8b31e982352b495ab69d5add"
+ integrity sha512-eGL50G+Vj5AG5uD0lineb6rRtbs96M8+hxbcwkHpZ8LQcmt0Bm33WyBSnj5AweLkjQ7ZP+KFRDHiLMznljRQ3A==
dependencies:
- immer "^8.0.0"
- redux "^4.0.0"
+ immer "^9.0.1"
+ redux "^4.1.0"
redux-thunk "^2.3.0"
reselect "^4.0.0"
-"@types/chart.js@*":
- version "2.9.31"
- resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.31.tgz#e8ebc7ed18eb0e5114c69bd46ef8e0037c89d39d"
- integrity sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==
- dependencies:
- moment "^2.10.2"
-
"@types/chart.js@^2.9.32":
- version "2.9.32"
- resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.32.tgz#b17d9a8c41ad348183a2ce041ebdeef892998251"
- integrity sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==
- dependencies:
- moment "^2.10.2"
-
-"@types/chartjs-plugin-annotation@^0.5.1":
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/@types/chartjs-plugin-annotation/-/chartjs-plugin-annotation-0.5.1.tgz#f560fc9e2dc15aa595b6b6043c7f7789dc890a90"
- integrity sha512-ruMXTjRVQwwbOtuNfFBHbqbhj497+D/VRmMPZiHv/GCupGwUf2l1TL7S1BTRYlP1Hengx798UwaOpAO+3+Sczw==
+ version "2.9.33"
+ resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.33.tgz#59c6de80b8134379156f4ba7b96c0928a721c1ab"
+ integrity sha512-vB6ZFx1cA91aiCoVpreLQwCQHS/Cj+9YtjBTwFlTjKXyY0douXV2KV4+fluxdI+grDZ6hTCQeg2HY/aQ9NeLHA==
dependencies:
- "@types/chart.js" "*"
moment "^2.10.2"
"@types/eslint-scope@^3.7.0":
@@ -2315,17 +2361,22 @@
"@types/estree" "*"
"@types/eslint@*":
- version "7.2.7"
- resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.7.tgz#f7ef1cf0dceab0ae6f9a976a0a9af14ab1baca26"
- integrity sha512-EHXbc1z2GoQRqHaAT7+grxlTJ3WE2YNeD6jlpPoRc83cCoThRY+NUWjCUZaYmk51OICkPXn2hhphcWcWXgNW0Q==
+ version "7.2.13"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.13.tgz#e0ca7219ba5ded402062ad6f926d491ebb29dd53"
+ integrity sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*", "@types/estree@^0.0.46":
- version "0.0.46"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
- integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
+"@types/estree@*":
+ version "0.0.49"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.49.tgz#3facb98ebcd4114a4ecef74e0de2175b56fd4464"
+ integrity sha512-K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw==
+
+"@types/estree@^0.0.48":
+ version "0.0.48"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.48.tgz#18dc8091b285df90db2f25aa7d906cfc394b7f74"
+ integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==
"@types/geojson@*":
version "7946.0.7"
@@ -2345,7 +2396,7 @@
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
+"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7":
version "7.0.7"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
@@ -2365,14 +2416,14 @@
"@types/lodash" "*"
"@types/lodash@*":
- version "4.14.168"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
- integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
+ version "4.14.170"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6"
+ integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==
"@types/mapbox-gl@^2.0.2":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.1.0.tgz#73c58b7fd719895e8d58f592dc5139cde4d505f3"
- integrity sha512-OaLf0MQud7TyEgRYd/JB+ovJjMXJSgeOTFUJspMeJVI/SBEI/2khH7IBM66RiV5x9tpzAnAy68/CkRBLa2NZlw==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.3.1.tgz#159f125835cebafa19f3fb521a5fba323623a390"
+ integrity sha512-lmCexZBhrQSYAdz2FqIfPsjGPLJVRqoGuaXvRyYFOV2GXvC3ubWm6ktUQImVzKv0nykArpMn1nU18Qsgdhq0cA==
dependencies:
"@types/geojson" "*"
@@ -2384,9 +2435,9 @@
"@types/leaflet" "^0"
"@types/minimatch@*":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
- integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
+ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
"@types/minimist@^1.2.0":
version "1.2.1"
@@ -2399,9 +2450,9 @@
integrity sha512-auXcoS/pc39onGyf6fr2V3J3BEHUqH0a1Sa1psuGrVkCat+2D592DA7hdXY73lwCUyhGPzkf0lrcE5jH0OFeJg==
"@types/node@*", "@types/node@>= 8":
- version "14.14.32"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448"
- integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg==
+ version "16.0.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.0.tgz#067a6c49dc7a5c2412a505628e26902ae967bf6f"
+ integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -2418,10 +2469,10 @@
resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b"
integrity sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=
-"@types/simplebar@^5.1.1":
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/@types/simplebar/-/simplebar-5.1.1.tgz#9e9a69bf86fc5225141141031d8954acdd1eae0d"
- integrity sha512-nC9iBQ4dfvvzJ3iAbL1qCfwjUyaF8EO56l/ApcRXUFK2zLOb8GDXC55V08JZvpzkUxGHtWVunp17KKH/3/KFJA==
+"@types/trusted-types@^1.0.1":
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-1.0.6.tgz#569b8a08121d3203398290d602d84d73c8dcf5da"
+ integrity sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==
"@webassemblyjs/[email protected]":
version "1.11.0"
@@ -2554,22 +2605,22 @@
resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.5.0.tgz#61b27785a6ad5bfd68fa018201fe418b118cb38d"
integrity sha512-C0l51MWQZ9kLzcxOZtniOMohpIFdCLZum7/TEHv3XWFc1Fvt5HCpbSX84x8ltka/JuNKcuiDnxXFkiB2gaePcg==
-"@webpack-cli/configtest@^1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.1.tgz#241aecfbdc715eee96bed447ed402e12ec171935"
- integrity sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ==
+"@webpack-cli/configtest@^1.0.4":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa"
+ integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==
-"@webpack-cli/info@^1.2.2":
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.2.tgz#ef3c0cd947a1fa083e174a59cb74e0b6195c236c"
- integrity sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ==
+"@webpack-cli/info@^1.3.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b"
+ integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==
dependencies:
envinfo "^7.7.3"
-"@webpack-cli/serve@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.0.tgz#2730c770f5f1f132767c63dcaaa4ec28f8c56a6c"
- integrity sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==
+"@webpack-cli/serve@^1.5.1":
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278"
+ integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@@ -2631,10 +2682,10 @@ acorn-es7-plugin@^1.1.7:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-acorn@^8.0.4:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
- integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
+acorn@^8.4.1:
+ version "8.4.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
+ integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
agent-base@4, agent-base@^4.3.0:
version "4.3.0"
@@ -2667,7 +2718,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.5.2:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-ajv@^6.1.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2682,11 +2733,6 @@ ansi-colors@^3.0.0:
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-ansi-colors@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
- integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
ansi-escapes@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -2912,34 +2958,34 @@ babel-plugin-dynamic-import-node@^2.3.3:
dependencies:
object.assign "^4.1.0"
-babel-plugin-polyfill-corejs2@^0.1.4:
- version "0.1.10"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz#a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1"
- integrity sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==
+babel-plugin-polyfill-corejs2@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+ integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
dependencies:
- "@babel/compat-data" "^7.13.0"
- "@babel/helper-define-polyfill-provider" "^0.1.5"
+ "@babel/compat-data" "^7.13.11"
+ "@babel/helper-define-polyfill-provider" "^0.2.2"
semver "^6.1.1"
-babel-plugin-polyfill-corejs3@^0.1.3:
- version "0.1.7"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
- integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
+babel-plugin-polyfill-corejs3@^0.2.2:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b"
+ integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.1.5"
- core-js-compat "^3.8.1"
+ "@babel/helper-define-polyfill-provider" "^0.2.2"
+ core-js-compat "^3.14.0"
-babel-plugin-polyfill-regenerator@^0.1.2:
- version "0.1.6"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz#0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f"
- integrity sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==
+babel-plugin-polyfill-regenerator@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+ integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.1.5"
+ "@babel/helper-define-polyfill-provider" "^0.2.2"
balanced-match@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
- integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+ integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
base@^0.11.1:
version "0.11.2"
@@ -2967,9 +3013,9 @@ bcrypt-pbkdf@^1.0.0:
tweetnacl "^0.14.3"
before-after-hook@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.0.tgz#09c40d92e936c64777aa385c4e9b904f8147eaf0"
- integrity sha512-jH6rKQIfroBbhEXVmI7XmXe3ix5S/PgJqpzdDPnR8JGLHWNYLsYZ6tK5iWOF/Ra3oqEX0NobXGlzbiylIzVphQ==
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
+ integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
big.js@^5.2.2:
version "5.2.2"
@@ -3021,7 +3067,7 @@ bonjour@^3.5.0:
multicast-dns "^6.0.1"
multicast-dns-service-types "^1.1.0"
-boolbase@^1.0.0, boolbase@~1.0.0:
+boolbase@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -3057,16 +3103,16 @@ braces@^3.0.1:
dependencies:
fill-range "^7.0.1"
-browserslist@^4.14.5, browserslist@^4.16.3:
- version "4.16.3"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
- integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
+browserslist@^4.14.5, browserslist@^4.16.6:
+ version "4.16.6"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+ integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
dependencies:
- caniuse-lite "^1.0.30001181"
- colorette "^1.2.1"
- electron-to-chromium "^1.3.649"
+ caniuse-lite "^1.0.30001219"
+ colorette "^1.2.2"
+ electron-to-chromium "^1.3.723"
escalade "^3.1.1"
- node-releases "^1.1.70"
+ node-releases "^1.1.71"
btoa-lite@^1.0.0:
version "1.0.0"
@@ -3230,20 +3276,15 @@ camelcase@^5.0.0, camelcase@^5.3.1:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-camelcase@^6.2.0:
- version "6.2.0"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
- integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
-
can-use-dom@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
-caniuse-lite@^1.0.30001181:
- version "1.0.30001197"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001197.tgz#47ad15b977d2f32b3ec2fe2b087e0c50443771db"
- integrity sha512-8aE+sqBqtXz4G8g35Eg/XEaFr2N7rd/VQ6eABGBmNtcB8cN6qNJhMi6oSFy4UWWZgqgL3filHT8Nha4meu3tsw==
+caniuse-lite@^1.0.30001219:
+ version "1.0.30001242"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz#04201627abcd60dc89211f22cbe2347306cda46b"
+ integrity sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug==
caseless@~0.12.0:
version "0.12.0"
@@ -3265,19 +3306,19 @@ chardet@^0.7.0:
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
chart.js@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.1.0.tgz#b99cfe712fa0059134a4ad3a3515135fbb20bcea"
- integrity sha512-bKJi2VbC4fqZXlLbK7LKVvmG9crjoG9anfp96utZLyIGPuCx+YN+5/HDXy98QGt3lf74T8gKUPISUZL222tDJQ==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.4.1.tgz#ff3b2b2a04a37b83618b4a6399a5f87ccc0f1e8a"
+ integrity sha512-0R4mL7WiBcYoazIhrzSYnWcOw6RmrRn7Q4nKZNsBQZCBrlkZKodQbfeojCCo8eETPRCs1ZNTsAcZhIfyhyP61g==
chartjs-adapter-moment@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/chartjs-adapter-moment/-/chartjs-adapter-moment-1.0.0.tgz#9174b1093c68bcfe285aff24f7388ad60d44e8f7"
integrity sha512-PqlerEvQcc5hZLQ/NQWgBxgVQ4TRdvkW3c/t+SUEQSj78ia3hgLkf2VZ2yGJtltNbEEFyYGm+cA6XXevodYvWA==
-chartjs-plugin-annotation@next:
- version "1.0.0-rc"
- resolved "https://registry.yarnpkg.com/chartjs-plugin-annotation/-/chartjs-plugin-annotation-1.0.0-rc.tgz#8eb16169de4f9bf69e6bbae41caf03476dca60ad"
- integrity sha512-ielNXFh3DSRu2FkM4fgQvFwKP8EAzfUYBb8ZuQoobSK89HMUyDfoCcDlw/uCFoaL3uuhA9YBrbEdfi6ZNZUc7g==
+chartjs-plugin-annotation@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/chartjs-plugin-annotation/-/chartjs-plugin-annotation-1.0.2.tgz#59ea0971b52b91c78690a5ba328e4ed38940f864"
+ integrity sha512-asqP2/B+9tv105e3rwkzqoIgzhDBQRMzFRh/0ZTKqormxDXMP68uzxI5t3Fx8bxZSMNeEph0sY+0GIXXU0PeBQ==
chokidar@^2.1.8:
version "2.1.8"
@@ -3304,11 +3345,9 @@ chownr@^1.1.1, chownr@^1.1.2:
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
chrome-trace-event@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
- integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
- dependencies:
- tslib "^1.9.0"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+ integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
ci-info@^2.0.0:
version "2.0.0"
@@ -3423,9 +3462,9 @@ commander@^4.1.1:
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
commander@^7.0.0:
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
- integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+ integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
commondir@^1.0.1:
version "1.0.1"
@@ -3480,7 +3519,7 @@ concat-stream@^1.5.0:
readable-stream "^2.2.2"
typedarray "^0.0.6"
-concat-stream@^2.0.0, concat-stream@~2.0.0:
+concat-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
@@ -3491,9 +3530,9 @@ concat-stream@^2.0.0, concat-stream@~2.0.0:
typedarray "^0.0.6"
config-chain@^1.1.11:
- version "1.1.12"
- resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
- integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+ version "1.1.13"
+ resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+ integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
dependencies:
ini "^1.3.4"
proto-list "~1.2.1"
@@ -3604,9 +3643,9 @@ conventional-recommended-bump@^5.0.0:
q "^1.5.1"
convert-source-map@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
- integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+ integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
dependencies:
safe-buffer "~5.1.1"
@@ -3651,18 +3690,18 @@ copy-webpack-plugin@^7.0.0:
schema-utils "^3.0.0"
serialize-javascript "^5.0.1"
-core-js-compat@^3.8.1, core-js-compat@^3.9.0:
- version "3.9.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455"
- integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==
+core-js-compat@^3.14.0, core-js-compat@^3.15.0:
+ version "3.15.2"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb"
+ integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ==
dependencies:
- browserslist "^4.16.3"
+ browserslist "^4.16.6"
semver "7.0.0"
core-js@^3.0.1:
- version "3.9.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
- integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==
+ version "3.15.2"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
+ integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
[email protected], core-util-is@~1.0.0:
version "1.0.2"
@@ -3686,6 +3725,13 @@ cross-env@^7.0.3:
dependencies:
cross-spawn "^7.0.1"
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
+ integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
+ dependencies:
+ node-fetch "2.6.1"
+
cross-spawn@^6.0.0:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3707,37 +3753,36 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3:
which "^2.0.1"
css-loader@^5.0.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.1.1.tgz#9362d444a0f7c08c148a109596715c904e252879"
- integrity sha512-5FfhpjwtuRgxqmusDidowqmLlcb+1HgnEDMsi2JhiUrZUcoc+cqw+mUtMIF/+OfeMYaaFCLYp1TaIt9H6I/fKA==
+ version "5.2.6"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.6.tgz#c3c82ab77fea1f360e587d871a6811f4450cc8d1"
+ integrity sha512-0wyN5vXMQZu6BvjbrPdUJvkCzGEO24HC7IS7nW4llc6BBFC+zwR9CKtYGv63Puzsg10L/o12inMY5/2ByzfD6w==
dependencies:
- camelcase "^6.2.0"
- cssesc "^3.0.0"
icss-utils "^5.1.0"
loader-utils "^2.0.0"
- postcss "^8.2.6"
+ postcss "^8.2.15"
postcss-modules-extract-imports "^3.0.0"
postcss-modules-local-by-default "^4.0.0"
postcss-modules-scope "^3.0.0"
postcss-modules-values "^4.0.0"
postcss-value-parser "^4.1.0"
schema-utils "^3.0.0"
- semver "^7.3.4"
+ semver "^7.3.5"
-css-select@^2.0.2:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
- integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
+css-select@^4.1.3:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+ integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
dependencies:
boolbase "^1.0.0"
- css-what "^3.2.1"
- domutils "^1.7.0"
- nth-check "^1.0.2"
+ css-what "^5.0.0"
+ domhandler "^4.2.0"
+ domutils "^2.6.0"
+ nth-check "^2.0.0"
-css-what@^3.2.1:
- version "3.4.2"
- resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
- integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
+css-what@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
+ integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
csscolorparser@~1.0.3:
version "1.0.3"
@@ -3802,9 +3847,9 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
ms "^2.1.1"
debug@^4.1.0, debug@^4.1.1:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
- integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+ version "4.3.2"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+ integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
dependencies:
ms "2.1.2"
@@ -3936,9 +3981,9 @@ detect-indent@^5.0.0:
integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
detect-node@^2.0.4:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
- integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+ integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
dezalgo@^1.0.0:
version "1.0.3"
@@ -3973,9 +4018,9 @@ dns-equal@^1.0.0:
integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
dns-packet@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
- integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+ integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
dependencies:
ip "^1.1.0"
safe-buffer "^5.0.1"
@@ -3987,45 +4032,42 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"
-dom-converter@^0.2:
+dom-converter@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
dependencies:
utila "~0.4"
-dom-serializer@0:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
- integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+dom-serializer@^1.0.1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+ integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
dependencies:
domelementtype "^2.0.1"
+ domhandler "^4.2.0"
entities "^2.0.0"
-domelementtype@1, domelementtype@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
- integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
-domelementtype@^2.0.1:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
- integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+ integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
-domhandler@^2.3.0:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
- integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+domhandler@^4.0.0, domhandler@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+ integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
dependencies:
- domelementtype "1"
+ domelementtype "^2.2.0"
-domutils@^1.5.1, domutils@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
- integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+domutils@^2.5.2, domutils@^2.6.0:
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
+ integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
dependencies:
- dom-serializer "0"
- domelementtype "1"
+ dom-serializer "^1.0.1"
+ domelementtype "^2.2.0"
+ domhandler "^4.2.0"
dot-case@^3.0.4:
version "3.0.4"
@@ -4082,10 +4124,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.649:
- version "1.3.683"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.683.tgz#2c9ab53ff5275cf3dd49278af714d0f8975204f7"
- integrity sha512-8mFfiAesXdEdE0DhkMKO7W9U6VU/9T3VTWwZ+4g84/YMP4kgwgFtQgUxuu7FUMcvSeKSNhFQNU+WZ68BQTLT5A==
+electron-to-chromium@^1.3.723:
+ version "1.3.766"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz#2fd14a4e54f77665872f4e23fcf4968e83638220"
+ integrity sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w==
emoji-regex@^7.0.1:
version "7.0.3"
@@ -4116,26 +4158,14 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
dependencies:
once "^1.4.0"
-enhanced-resolve@^5.7.0:
- version "5.7.0"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c"
- integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==
+enhanced-resolve@^5.8.0:
+ version "5.8.2"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
+ integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
-enquirer@^2.3.6:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
- integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
- dependencies:
- ansi-colors "^4.1.1"
-
-entities@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
- integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
entities@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -4147,9 +4177,9 @@ env-paths@^2.2.0:
integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
envinfo@^7.3.1, envinfo@^7.7.3:
- version "7.7.4"
- resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320"
- integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==
+ version "7.8.1"
+ resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+ integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
err-code@^1.0.0:
version "1.1.2"
@@ -4171,9 +4201,9 @@ error-ex@^1.2.0, error-ex@^1.3.1:
is-arrayish "^0.2.1"
es-abstract@^1.18.0-next.2:
- version "1.18.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
- integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+ version "1.18.3"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
+ integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
dependencies:
call-bind "^1.0.2"
es-to-primitive "^1.2.1"
@@ -4183,19 +4213,19 @@ es-abstract@^1.18.0-next.2:
has-symbols "^1.0.2"
is-callable "^1.2.3"
is-negative-zero "^2.0.1"
- is-regex "^1.1.2"
- is-string "^1.0.5"
- object-inspect "^1.9.0"
+ is-regex "^1.1.3"
+ is-string "^1.0.6"
+ object-inspect "^1.10.3"
object-keys "^1.1.1"
object.assign "^4.1.2"
string.prototype.trimend "^1.0.4"
string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.0"
+ unbox-primitive "^1.0.1"
-es-module-lexer@^0.4.0:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e"
- integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==
+es-module-lexer@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.6.0.tgz#e72ab05b7412e62b9be37c37a09bdb6000d706f0"
+ integrity sha512-f8kcHX1ArhllUtb/wVSyvygoKCznIjnxhLxy7TCvIiMdT7fL4ZDTIKaadMe6eLvOXg6Wk02UeoFgUoZ2EKZZUA==
es-to-primitive@^1.2.1:
version "1.2.1"
@@ -4233,7 +4263,7 @@ escape-string-regexp@^1.0.5:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -4289,9 +4319,9 @@ events@^3.2.0:
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
eventsource@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
- integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
+ integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
dependencies:
original "^1.0.0"
@@ -4309,9 +4339,9 @@ execa@^1.0.0:
strip-eof "^1.0.0"
execa@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
- integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+ integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
dependencies:
cross-spawn "^7.0.3"
get-stream "^6.0.0"
@@ -4451,16 +4481,15 @@ fast-glob@^2.2.6:
micromatch "^3.1.10"
fast-glob@^3.1.1, fast-glob@^3.2.4:
- version "3.2.5"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
- integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+ version "3.2.6"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz#434dd9529845176ea049acc9343e8282765c6e1a"
+ integrity sha512-GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
- glob-parent "^5.1.0"
+ glob-parent "^5.1.2"
merge2 "^1.3.0"
- micromatch "^4.0.2"
- picomatch "^2.2.1"
+ micromatch "^4.0.4"
fast-json-stable-stringify@^2.0.0:
version "2.1.0"
@@ -4473,16 +4502,16 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
- integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
+ integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
dependencies:
reusify "^1.0.4"
faye-websocket@^0.11.3:
- version "0.11.3"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
- integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+ version "0.11.4"
+ resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+ integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
dependencies:
websocket-driver ">=0.5.1"
@@ -4594,9 +4623,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0, follow-redirects@^1.10.0:
- version "1.13.3"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
- integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+ integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
for-in@^1.0.2:
version "1.0.2"
@@ -4617,10 +4646,10 @@ form-data@~2.3.2:
combined-stream "^1.0.6"
mime-types "^2.1.12"
-forwarded@~0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
- integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+ integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
fragment-cache@^0.2.1:
version "0.2.1"
@@ -4757,10 +4786,10 @@ get-stream@^4.0.0, get-stream@^4.1.0:
dependencies:
pump "^3.0.0"
-get-stream@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
- integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
+get-stream@^6.0.0, get-stream@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+ integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
get-value@^2.0.3, get-value@^2.0.6:
version "2.0.6"
@@ -4810,9 +4839,9 @@ git-up@^4.0.0:
parse-url "^5.0.0"
git-url-parse@^11.1.2:
- version "11.4.4"
- resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77"
- integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw==
+ version "11.5.0"
+ resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.5.0.tgz#acaaf65239cb1536185b19165a24bbc754b3f764"
+ integrity sha512-TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA==
dependencies:
git-up "^4.0.0"
@@ -4836,7 +4865,7 @@ glob-parent@^3.1.0:
is-glob "^3.1.0"
path-dirname "^1.0.0"
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1:
+glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -4854,9 +4883,9 @@ glob-to-regexp@^0.4.1:
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
- version "7.1.6"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
- integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+ version "7.1.7"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+ integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -4871,9 +4900,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globby@^11.0.1:
- version "11.0.2"
- resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
- integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
+ version "11.0.4"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
+ integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
dependencies:
array-union "^2.1.0"
dir-glob "^3.0.1"
@@ -4952,7 +4981,7 @@ hard-rejection@^2.1.0:
resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
-has-bigints@^1.0.0:
+has-bigints@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
@@ -4967,7 +4996,7 @@ has-flag@^4.0.0:
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2:
+has-symbols@^1.0.1, has-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
@@ -5015,20 +5044,28 @@ has@^1.0.3:
dependencies:
function-bind "^1.1.1"
+haunted@^4.8.1:
+ version "4.8.1"
+ resolved "https://registry.yarnpkg.com/haunted/-/haunted-4.8.1.tgz#bfff9294139be43672f728939eb7bddd678ee023"
+ integrity sha512-rDK0HNRDfklM9yC/X6mb2jsFbmGd1Rj7RrSLGiWTz8cQEEpKrxTrK/YHKTUOYvg7CtNFDCLSvXcIjOHdQnG/BA==
+ dependencies:
+ "@lit/reactive-element" "^1.0.0-rc.2"
+ lit-html "^1.0.0"
+
he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
- version "2.8.8"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
- integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+ version "2.8.9"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+ integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-hosted-git-info@^3.0.6:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
- integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
+hosted-git-info@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
+ integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
dependencies:
lru-cache "^6.0.0"
@@ -5061,27 +5098,25 @@ html-minifier-terser@^5.0.1:
terser "^4.6.3"
html-webpack-plugin@^5.0.0-beta.6:
- version "5.3.1"
- resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.1.tgz#8797327548e3de438e3494e0c6d06f181a7f20d1"
- integrity sha512-rZsVvPXUYFyME0cuGkyOHfx9hmkFa4pWfxY/mdY38PsBEaVNsRoA+Id+8z6DBDgyv3zaw6XQszdF8HLwfQvcdQ==
+ version "5.3.2"
+ resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz#7b04bf80b1f6fe84a6d3f66c8b79d64739321b08"
+ integrity sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==
dependencies:
"@types/html-minifier-terser" "^5.0.0"
html-minifier-terser "^5.0.1"
- lodash "^4.17.20"
- pretty-error "^2.1.1"
+ lodash "^4.17.21"
+ pretty-error "^3.0.4"
tapable "^2.0.0"
-htmlparser2@^3.10.1:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
- integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+htmlparser2@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+ integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
dependencies:
- domelementtype "^1.3.1"
- domhandler "^2.3.0"
- domutils "^1.5.1"
- entities "^1.1.1"
- inherits "^2.0.1"
- readable-stream "^3.1.1"
+ domelementtype "^2.0.1"
+ domhandler "^4.0.0"
+ domutils "^2.5.2"
+ entities "^2.0.0"
http-cache-semantics@^3.8.1:
version "3.8.1"
@@ -5187,11 +5222,11 @@ humanize-ms@^1.2.1:
ms "^2.0.0"
i18next-http-backend@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.1.1.tgz#a69416290645853c1722be6c3fa3804ad37a3344"
- integrity sha512-li3Un71yBu1uCfgJrCg8DOEtljse1er0ja1pM/rFmWLihrD2RFqyrglOsYUHokvzZ53mJB2Mmu4DYgd8/t3R0A==
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.2.6.tgz#80b12e8b207814aebb3b8a74c4487dd156973bee"
+ integrity sha512-NeNNRofj+rR6Cw+/Elf8bCVaCiqWg2Y6F+CrmDvHiPzAW2Dtxxlk8O0na2et/rr1n3ST6rJr4nMXH/QOFuhaeA==
dependencies:
- node-fetch "2.6.1"
+ cross-fetch "3.1.4"
i18next@^19.9.2:
version "19.9.2"
@@ -5208,9 +5243,9 @@ [email protected], iconv-lite@^0.4.24:
safer-buffer ">= 2.1.2 < 3"
iconv-lite@^0.6.2:
- version "0.6.2"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
- integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+ integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
dependencies:
safer-buffer ">= 2.1.2 < 3.0.0"
@@ -5230,9 +5265,9 @@ iferr@^0.1.5:
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
ignore-walk@^3.0.1:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
- integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+ integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
dependencies:
minimatch "^3.0.4"
@@ -5246,10 +5281,10 @@ ignore@^5.1.4:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-immer@^8.0.0:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656"
- integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
+immer@^9.0.1:
+ version "9.0.5"
+ resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec"
+ integrity sha512-2WuIehr2y4lmYz9gaQzetPR2ECniCifk4ORaQbU3g5EalLt+0IVTosEPJ5BoYl/75ky2mivzdRzV8wWgQGOSYQ==
import-fresh@^2.0.0:
version "2.0.0"
@@ -5297,11 +5332,6 @@ indent-string@^4.0.0:
resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-indexes-of@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
- integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
infer-owner@^1.0.3, infer-owner@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -5428,9 +5458,9 @@ is-arrayish@^0.2.1:
integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
is-bigint@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
- integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
+ integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
is-binary-path@^1.0.0:
version "1.0.1"
@@ -5440,11 +5470,11 @@ is-binary-path@^1.0.0:
binary-extensions "^1.0.0"
is-boolean-object@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
- integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+ integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
dependencies:
- call-bind "^1.0.0"
+ call-bind "^1.0.2"
is-buffer@^1.1.5:
version "1.1.6"
@@ -5464,9 +5494,9 @@ is-ci@^2.0.0:
ci-info "^2.0.0"
is-core-module@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
- integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+ integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
dependencies:
has "^1.0.3"
@@ -5485,9 +5515,9 @@ is-data-descriptor@^1.0.0:
kind-of "^6.0.0"
is-date-object@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
- integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+ integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
is-descriptor@^0.1.0:
version "0.1.6"
@@ -5566,9 +5596,9 @@ is-negative-zero@^2.0.1:
integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
is-number-object@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
- integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+ integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
is-number@^3.0.0:
version "3.0.0"
@@ -5628,18 +5658,18 @@ is-plain-object@^5.0.0:
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-is-regex@^1.0.4, is-regex@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
- integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+is-regex@^1.0.4, is-regex@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+ integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
dependencies:
call-bind "^1.0.2"
- has-symbols "^1.0.1"
+ has-symbols "^1.0.2"
is-ssh@^1.3.0:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.2.tgz#a4b82ab63d73976fd8263cceee27f99a88bdae2b"
- integrity sha512-elEw0/0c2UscLrNG+OAorbP539E3rhliKPg+hDMWN9VwrDXfYK+4PBEykDPfxlYYtQvl84TascnQyobfQLHEhQ==
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.3.tgz#7f133285ccd7f2c2c7fc897b771b53d95a2b2c7e"
+ integrity sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==
dependencies:
protocols "^1.1.0"
@@ -5653,17 +5683,17 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
-is-string@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
- integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+is-string@^1.0.5, is-string@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+ integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
is-symbol@^1.0.2, is-symbol@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
- integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+ integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
dependencies:
- has-symbols "^1.0.1"
+ has-symbols "^1.0.2"
is-text-path@^1.0.1:
version "1.0.1"
@@ -5719,16 +5749,16 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-jest-worker@^26.6.2:
- version "26.6.2"
- resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
- integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+jest-worker@^27.0.2:
+ version "27.0.6"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"
+ integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==
dependencies:
"@types/node" "*"
merge-stream "^2.0.0"
- supports-color "^7.0.0"
+ supports-color "^8.0.0"
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -5813,9 +5843,9 @@ jsonparse@^1.2.0:
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
jsonpath-plus@^5.0.2:
- version "5.0.4"
- resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-5.0.4.tgz#3b8ce2ea6904ee6c6750ed027fe8df31789b62e3"
- integrity sha512-w3pI3PewtwIrrGRCFvTkCkKu8IrOwjsqoYRxvxuXQjPB0udEtAuBY0B6/SEztsxMmuIHVHGFQ0knVnTCPW9qYw==
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz#2fc4b2e461950626c98525425a3a3518b85af6c3"
+ integrity sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==
jsprim@^1.2.2:
version "1.4.1"
@@ -5900,17 +5930,34 @@ linqts@^1.12.6:
resolved "https://registry.yarnpkg.com/linqts/-/linqts-1.14.4.tgz#0aa0f78fc6be073d7db874e0a0480fda5d06db7d"
integrity sha512-b5sJjG1ZQ8iLSTJV19jWgMLoQicrQVVRkkQN7B/aboU+cf30lgnhIoGM8vEjqPxZFpryDU78PFpuTnfYNIHMeg==
-lit-element@^2.4.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.4.0.tgz#b22607a037a8fc08f5a80736dddf7f3f5d401452"
- integrity sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg==
+lit-element@^3.0.0-rc.2:
+ version "3.0.0-rc.2"
+ resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.0.0-rc.2.tgz#883d0b6fd7b846226d360699d1b713da5fc7e1b7"
+ integrity sha512-2Z7DabJ3b5K+p5073vFjMODoaWqy5PIaI4y6ADKm+fCGc8OnX9fU9dMoUEBZjFpd/bEFR9PBp050tUtBnT9XTQ==
dependencies:
- lit-html "^1.1.1"
+ "@lit/reactive-element" "^1.0.0-rc.2"
+ lit-html "^2.0.0-rc.3"
-lit-html@^1.1.1:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.3.0.tgz#c80f3cc5793a6dea6c07172be90a70ab20e56034"
- integrity sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==
+lit-html@^1.0.0:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.4.1.tgz#0c6f3ee4ad4eb610a49831787f0478ad8e9ae5e0"
+ integrity sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA==
+
+lit-html@^2.0.0-rc.3:
+ version "2.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.0.0-rc.3.tgz#1c216e548630e18d3093d97f4e29563abce659af"
+ integrity sha512-Y6P8LlAyQuqvzq6l/Nc4z5/P5M/rVLYKQIRxcNwSuGajK0g4kbcBFQqZmgvqKG+ak+dHZjfm2HUw9TF5N/pkCw==
+ dependencies:
+ "@types/trusted-types" "^1.0.1"
+
+lit@^2.0.0-rc.2:
+ version "2.0.0-rc.2"
+ resolved "https://registry.yarnpkg.com/lit/-/lit-2.0.0-rc.2.tgz#724a2d621aa098001d73bf7106f3a72b7b5948ef"
+ integrity sha512-BOCuoJR04WaTV8UqTKk09cNcQA10Aq2LCcBOiHuF7TzWH5RNDsbCBP5QM9sLBSotGTXbDug/gFO08jq6TbyEtw==
+ dependencies:
+ "@lit/reactive-element" "^1.0.0-rc.2"
+ lit-element "^3.0.0-rc.2"
+ lit-html "^2.0.0-rc.3"
load-json-file@^1.0.0:
version "1.1.0"
@@ -6060,7 +6107,7 @@ lodash.uniq@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.2.1:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6070,13 +6117,6 @@ loglevel@^1.6.8:
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
-loose-envify@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
- integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
- dependencies:
- js-tokens "^3.0.0 || ^4.0.0"
-
loud-rejection@^1.0.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -6107,14 +6147,14 @@ lru-cache@^6.0.0:
yallist "^4.0.0"
luxon@^1.21.3:
- version "1.26.0"
- resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.26.0.tgz#d3692361fda51473948252061d0f8561df02b578"
- integrity sha512-+V5QIQ5f6CDXQpWNICELwjwuHdqeJM1UenlZWx5ujcRMc9venvluCjFb4t5NYLhb6IhkbMVOxzVuOqkgMxee2A==
+ version "1.27.0"
+ resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.27.0.tgz#ae10c69113d85dab8f15f5e8390d0cbeddf4f00f"
+ integrity sha512-VKsFsPggTA0DvnxtJdiExAucKdAnwbCCNlMM5ENvHlxubqWd0xhZcdb4XgZ7QFNhaRhilXCFxHuoObP5BNA4PA==
macos-release@^2.2.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.4.1.tgz#64033d0ec6a5e6375155a74b1a1eba8e509820ac"
- integrity sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.5.0.tgz#067c2c88b5f3fb3c56a375b2ec93826220fa1ff2"
+ integrity sha512-EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g==
make-dir@^1.0.0:
version "1.3.0"
@@ -6171,9 +6211,9 @@ map-obj@^2.0.0:
integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
map-obj@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
- integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7"
+ integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==
map-visit@^1.0.0:
version "1.0.0"
@@ -6321,25 +6361,25 @@ micromatch@^3.1.10, micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"
-micromatch@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
- integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+ integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
dependencies:
braces "^3.0.1"
- picomatch "^2.0.5"
+ picomatch "^2.2.3"
[email protected], "mime-db@>= 1.43.0 < 2":
- version "1.46.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
- integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
[email protected], "mime-db@>= 1.43.0 < 2":
+ version "1.48.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
+ integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
- version "2.1.29"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2"
- integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==
+ version "2.1.31"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
+ integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
dependencies:
- mime-db "1.46.0"
+ mime-db "1.48.0"
version "1.6.0"
@@ -6562,10 +6602,10 @@ nanoid@^2.1.0:
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
-nanoid@^3.1.20:
- version "3.1.20"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
- integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
+nanoid@^3.1.23:
+ version "3.1.23"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+ integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
nanomatch@^1.2.9:
version "1.2.13"
@@ -6648,10 +6688,10 @@ node-gyp@^5.0.2:
tar "^4.4.12"
which "^1.3.1"
-node-releases@^1.1.70:
- version "1.1.71"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
- integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+node-releases@^1.1.71:
+ version "1.1.73"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
+ integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
nodent-compiler@^3.2.10:
version "3.2.13"
@@ -6692,13 +6732,13 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
validate-npm-package-license "^3.0.1"
normalize-package-data@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a"
- integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
+ integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
dependencies:
- hosted-git-info "^3.0.6"
- resolve "^1.17.0"
- semver "^7.3.2"
+ hosted-git-info "^4.0.1"
+ resolve "^1.20.0"
+ semver "^7.3.4"
validate-npm-package-license "^3.0.1"
normalize-path@^2.1.1:
@@ -6713,15 +6753,15 @@ normalize-path@^3.0.0:
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-normalize-url@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
- integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
+ version "4.5.1"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+ integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
npm-bundled@^1.0.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
- integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+ integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
dependencies:
npm-normalize-package-bin "^1.0.1"
@@ -6796,12 +6836,12 @@ npmlog@^4.1.2:
gauge "~2.7.3"
set-blocking "~2.0.0"
-nth-check@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
- integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+nth-check@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
+ integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
dependencies:
- boolbase "~1.0.0"
+ boolbase "^1.0.0"
number-is-nan@^1.0.0:
version "1.0.1"
@@ -6827,10 +6867,10 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-inspect@^1.9.0:
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
- integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+object-inspect@^1.10.3, object-inspect@^1.9.0:
+ version "1.10.3"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+ integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
object-is@^1.0.1:
version "1.1.5"
@@ -7126,12 +7166,12 @@ parse-path@^4.0.0:
query-string "^6.13.8"
parse-url@^5.0.0:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.2.tgz#856a3be1fcdf78dc93fc8b3791f169072d898b59"
- integrity sha512-Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA==
+ version "5.0.7"
+ resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.7.tgz#2ca3c32816f1a092c35e1f2afe63bb7924dde261"
+ integrity sha512-CgbjyWT6aOh2oNSUS0cioYQsGysj9hQ2IdbOfeNwq5KOaKM7dOw/yTupiI0cnJhaDHJEIGybPkQz7LF9WNIhyw==
dependencies:
is-ssh "^1.3.0"
- normalize-url "^3.3.0"
+ normalize-url "4.5.1"
parse-path "^4.0.0"
protocols "^1.4.0"
@@ -7196,9 +7236,9 @@ path-key@^3.0.0, path-key@^3.1.0:
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-parse@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
- integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+ integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
version "0.1.7"
@@ -7226,7 +7266,7 @@ path-type@^4.0.0:
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-pbf@^3.0.5, pbf@^3.2.1:
+pbf@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.2.1.tgz#b4c1b9e72af966cd82c6531691115cc0409ffe2a"
integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==
@@ -7239,10 +7279,10 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-picomatch@^2.0.5, picomatch@^2.2.1:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
- integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picomatch@^2.2.3:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+ integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
pify@^2.0.0, pify@^2.3.0:
version "2.3.0"
@@ -7333,13 +7373,11 @@ postcss-modules-values@^4.0.0:
icss-utils "^5.0.0"
postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
- version "6.0.4"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
- integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+ version "6.0.6"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+ integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
dependencies:
cssesc "^3.0.0"
- indexes-of "^1.0.1"
- uniq "^1.0.1"
util-deprecate "^1.0.2"
postcss-value-parser@^4.1.0:
@@ -7347,27 +7385,27 @@ postcss-value-parser@^4.1.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-postcss@^8.2.6:
- version "8.2.7"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.7.tgz#48ed8d88b4de10afa0dfd1c3f840aa57b55c4d47"
- integrity sha512-DsVLH3xJzut+VT+rYr0mtvOtpTjSyqDwPf5EZWXcb0uAKfitGpTY9Ec+afi2+TgdN8rWS9Cs88UDYehKo/RvOw==
+postcss@^8.2.15:
+ version "8.3.5"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
+ integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
dependencies:
colorette "^1.2.2"
- nanoid "^3.1.20"
- source-map "^0.6.1"
+ nanoid "^3.1.23"
+ source-map-js "^0.6.2"
potpack@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==
-pretty-error@^2.1.1:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
- integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
+pretty-error@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-3.0.4.tgz#94b1d54f76c1ed95b9c604b9de2194838e5b574e"
+ integrity sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==
dependencies:
lodash "^4.17.20"
- renderkid "^2.0.4"
+ renderkid "^2.0.6"
process-nextick-args@~2.0.0:
version "2.0.1"
@@ -7417,11 +7455,11 @@ protoduck@^5.0.1:
genfun "^5.0.0"
proxy-addr@~2.0.5:
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
- integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+ integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
dependencies:
- forwarded "~0.1.2"
+ forwarded "0.2.0"
ipaddr.js "1.9.1"
prr@~1.0.1:
@@ -7485,9 +7523,11 @@ [email protected]:
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
qs@^6.8.0, qs@^6.9.4:
- version "6.9.6"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
- integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+ version "6.10.1"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+ integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+ dependencies:
+ side-channel "^1.0.4"
qs@~6.5.2:
version "6.5.2"
@@ -7515,9 +7555,9 @@ querystringify@^2.1.1:
integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
queue-microtask@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3"
- integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+ integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
quick-lru@^1.0.0:
version "1.1.0"
@@ -7655,7 +7695,7 @@ read@1, read@~1.0.1:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6:
version "3.6.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -7726,13 +7766,12 @@ redux-thunk@^2.3.0:
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
-redux@^4.0.0:
- version "4.0.5"
- resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
- integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==
+redux@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4"
+ integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==
dependencies:
- loose-envify "^1.4.0"
- symbol-observable "^1.2.0"
+ "@babel/runtime" "^7.9.2"
regenerate-unicode-properties@^8.2.0:
version "8.2.0"
@@ -7792,9 +7831,9 @@ regjsgen@^0.5.1:
integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
regjsparser@^0.6.4:
- version "0.6.7"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c"
- integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==
+ version "0.6.9"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
+ integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
dependencies:
jsesc "~0.5.0"
@@ -7808,21 +7847,21 @@ remove-trailing-separator@^1.0.1:
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-renderkid@^2.0.4:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5"
- integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==
+renderkid@^2.0.6:
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
+ integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
dependencies:
- css-select "^2.0.2"
- dom-converter "^0.2"
- htmlparser2 "^3.10.1"
- lodash "^4.17.20"
- strip-ansi "^3.0.0"
+ css-select "^4.1.3"
+ dom-converter "^0.2.0"
+ htmlparser2 "^6.1.0"
+ lodash "^4.17.21"
+ strip-ansi "^3.0.1"
repeat-element@^1.1.2:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
- integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+ integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
repeat-string@^1.6.1:
version "1.6.1"
@@ -7882,15 +7921,10 @@ reselect@^4.0.0:
resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
-resize-observer-polyfill@^1.5.1:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
- integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
resize-observer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/resize-observer/-/resize-observer-1.0.0.tgz#4f8380b73b411af4ed7d916fe85a2d59900e71ef"
- integrity sha512-D7UFShDm2TgrEDEyeg+/tTEbvOgPWlvPAfJtxiKp+qutu6HowmcGJKjECgGru0PPDIj3SAucn3ZPpOx54fF7DQ==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/resize-observer/-/resize-observer-1.0.2.tgz#9a87697b275343d12d8b371940e02e9a93e1f452"
+ integrity sha512-X0lHFNsxItpBRIRsdwOTkl/VguTaLGx7Gz9xoTGix9ObBN3jRYq9J/rSIuYDrey8AdU3IkfgIMpCeVSEW1QS0Q==
resolve-cwd@^2.0.0:
version "2.0.0"
@@ -7933,7 +7967,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.9.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.9.0:
version "1.20.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -8010,9 +8044,9 @@ rw@^1.3.3:
integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
rxjs@^6.4.0:
- version "6.6.6"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
- integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==
+ version "6.6.7"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+ integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
dependencies:
tslib "^1.9.0"
@@ -8057,11 +8091,11 @@ schema-utils@^2.6.5:
ajv-keywords "^3.5.2"
schema-utils@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
- integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.0.tgz#95986eb604f66daadeed56e379bfe7a7f963cdb9"
+ integrity sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==
dependencies:
- "@types/json-schema" "^7.0.6"
+ "@types/json-schema" "^7.0.7"
ajv "^6.12.5"
ajv-keywords "^3.5.2"
@@ -8071,9 +8105,9 @@ select-hose@^2.0.0:
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
selfsigned@^1.10.8:
- version "1.10.8"
- resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30"
- integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==
+ version "1.10.11"
+ resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
+ integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
dependencies:
node-forge "^0.10.0"
@@ -8092,10 +8126,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-semver@^7.3.2, semver@^7.3.4:
- version "7.3.4"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
- integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+semver@^7.3.4, semver@^7.3.5:
+ version "7.3.5"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+ integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
dependencies:
lru-cache "^6.0.0"
@@ -8125,6 +8159,13 @@ serialize-javascript@^5.0.1:
dependencies:
randombytes "^2.1.0"
+serialize-javascript@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+ integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+ dependencies:
+ randombytes "^2.1.0"
+
serve-index@^1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -8228,22 +8269,31 @@ shx@^0.3.3:
minimist "^1.2.3"
shelljs "^0.8.4"
+side-channel@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+ integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+ dependencies:
+ call-bind "^1.0.0"
+ get-intrinsic "^1.0.2"
+ object-inspect "^1.9.0"
+
signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
simplebar@^5.0.7:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.3.0.tgz#857de63296401ed0c3026845514fe5db69795be5"
- integrity sha512-LgrGdIWpwHLLlI9HqfnGql62H/iZlF0KDZ7w3ZNbd2ZLwh9NKsODLHPzQgUlqQ8aZe7Y6/1xJMXK1PU5e810+w==
+ version "5.3.4"
+ resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.3.4.tgz#7de8d4a07ed3c6612644f4dbc04a8427fdf038ef"
+ integrity sha512-2mCaVdiroCKmXuD+Qfy+QSE32m5BMuZ4ssHvRD1QEPYH95Re/kox7j/Wy0Hje8Uo7LY7O6JK3XSNJmesGlsP8Q==
dependencies:
+ "@juggle/resize-observer" "^3.3.1"
can-use-dom "^0.1.0"
core-js "^3.0.1"
lodash.debounce "^4.0.8"
lodash.memoize "^4.1.2"
lodash.throttle "^4.1.1"
- resize-observer-polyfill "^1.5.1"
slash@^2.0.0:
version "2.0.0"
@@ -8296,16 +8346,16 @@ snapdragon@^0.8.1:
use "^3.1.0"
sockjs-client@^1.5.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add"
- integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
+ integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
dependencies:
debug "^3.2.6"
eventsource "^1.0.7"
faye-websocket "^0.11.3"
inherits "^2.0.4"
json3 "^3.3.3"
- url-parse "^1.4.7"
+ url-parse "^1.5.1"
sockjs@^0.3.21:
version "0.3.21"
@@ -8350,9 +8400,9 @@ source-map-js@^0.6.2:
integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
source-map-loader@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-2.0.1.tgz#b4fd0ae7fa7e7d3954300f383f2d6fcc230a4261"
- integrity sha512-UzOTTQhoNPeTNzOxwFw220RSRzdGSyH4lpNyWjR7Qm34P4/N0W669YSUFdH07+YNeN75h765XLHmNsF/bm97RQ==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-2.0.2.tgz#4ab634f8f8bac4f406b61383f87a2bc804c24697"
+ integrity sha512-yIYkFOsKn+OdOirRJUPQpnZiMkF74raDVQjj5ni3SzbOiA57SabeX80R5zyMQAKpvKySA3Z4a85vFX3bvpC6KQ==
dependencies:
abab "^2.0.5"
iconv-lite "^0.6.2"
@@ -8419,9 +8469,9 @@ spdx-expression-parse@^3.0.0:
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
- integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f"
+ integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==
spdy-transport@^3.0.0:
version "3.0.0"
@@ -8500,9 +8550,9 @@ sshpk@^1.7.0:
tweetnacl "~0.14.0"
ssri@^6.0.0, ssri@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
- integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+ integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
dependencies:
figgy-pudding "^3.5.1"
@@ -8673,9 +8723,9 @@ style-loader@^2.0.0:
schema-utils "^3.0.0"
supercluster@^7.1.0:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.2.tgz#cf02a60283a0118212024f3bf02e4e63bb148e2c"
- integrity sha512-bGA0pk3DYMjLTY1h+rbh0imi/I8k/Lg0rzdBGfyQs0Xkiix7jK2GUmH1qSD8+jq6U0Vu382QHr3+rbbiHqdKJA==
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.3.tgz#8c5412c7d7e53b010f7514e87f279544babc3425"
+ integrity sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==
dependencies:
kdbush "^3.0.0"
@@ -8693,18 +8743,13 @@ supports-color@^6.1.0:
dependencies:
has-flag "^3.0.0"
-supports-color@^7.0.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
- integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+supports-color@^8.0.0:
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+ integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
dependencies:
has-flag "^4.0.0"
-symbol-observable@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
- integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
@@ -8740,17 +8785,17 @@ temp-write@^3.4.0:
temp-dir "^1.0.0"
uuid "^3.0.1"
-terser-webpack-plugin@^5.1.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673"
- integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==
+terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.3:
+ version "5.1.4"
+ resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
+ integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
dependencies:
- jest-worker "^26.6.2"
+ jest-worker "^27.0.2"
p-limit "^3.1.0"
schema-utils "^3.0.0"
- serialize-javascript "^5.0.1"
+ serialize-javascript "^6.0.0"
source-map "^0.6.1"
- terser "^5.5.1"
+ terser "^5.7.0"
terser@^4.6.3:
version "4.8.0"
@@ -8761,10 +8806,10 @@ terser@^4.6.3:
source-map "~0.6.1"
source-map-support "~0.5.12"
-terser@^5.5.1:
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2"
- integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==
+terser@^5.7.0:
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
+ integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
dependencies:
commander "^2.20.0"
source-map "~0.7.2"
@@ -8902,9 +8947,9 @@ trim-newlines@^2.0.0:
integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
trim-newlines@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
- integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+ integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
trim-off-newlines@^1.0.0:
version "1.0.1"
@@ -8917,9 +8962,9 @@ tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.3:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
- integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+ integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
tslint@>=5.11.0:
version "6.1.3"
@@ -8993,14 +9038,14 @@ typedarray@^0.0.6:
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@>=4.1.3:
- version "4.2.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
- integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
+ version "4.3.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+ integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
uglify-js@^3.1.4:
- version "3.13.0"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.0.tgz#66ed69f7241f33f13531d3d51d5bcebf00df7f69"
- integrity sha512-TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w==
+ version "3.13.10"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.10.tgz#a6bd0d28d38f592c3adb6b180ea6e07e1e540a8d"
+ integrity sha512-57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg==
version "0.0.6"
@@ -9012,15 +9057,15 @@ umask@^1.1.0:
resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
-unbox-primitive@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"
- integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==
+unbox-primitive@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+ integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
dependencies:
function-bind "^1.1.1"
- has-bigints "^1.0.0"
- has-symbols "^1.0.0"
- which-boxed-primitive "^1.0.1"
+ has-bigints "^1.0.1"
+ has-symbols "^1.0.2"
+ which-boxed-primitive "^1.0.2"
unicode-canonical-property-names-ecmascript@^1.0.4:
version "1.0.4"
@@ -9055,11 +9100,6 @@ union-value@^1.0.0:
is-extendable "^0.1.1"
set-value "^2.0.1"
-uniq@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
- integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
unique-filename@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -9121,7 +9161,7 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-url-parse@^1.4.3, url-parse@^1.4.7:
+url-parse@^1.4.3, url-parse@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
@@ -9130,9 +9170,9 @@ url-parse@^1.4.3, url-parse@^1.4.7:
requires-port "^1.0.0"
url-search-params-polyfill@^8.1.0:
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-8.1.0.tgz#5c15b69687165bfd4f6c7d8a161d70d85385885b"
- integrity sha512-MRG3vzXyG20BJ2fox50/9ZRoe+2h3RM7DIudVD2u/GY9MtayO1Dkrna76IUOak+uoUPVWbyR0pHCzxctP/eDYQ==
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-8.1.1.tgz#9e69e4dba300a71ae7ad3cead62c7717fd99329f"
+ integrity sha512-KmkCs6SjE6t4ihrfW9JelAPQIIIFbJweaaSLTh/4AO+c58JlDcb+GbdPt8yr5lRcFg4rPswRFRRhBGpWwh0K/Q==
url@^0.11.0:
version "0.11.0"
@@ -9209,18 +9249,18 @@ [email protected]:
extsprintf "^1.2.0"
vt-pbf@^3.1.1:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.1.tgz#b0f627e39a10ce91d943b898ed2363d21899fb82"
- integrity sha512-pHjWdrIoxurpmTcbfBWXaPwSmtPAHS105253P1qyEfSTV2HJddqjM+kIHquaT/L6lVJIk9ltTGc0IxR/G47hYA==
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac"
+ integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==
dependencies:
"@mapbox/point-geometry" "0.1.0"
"@mapbox/vector-tile" "^1.3.1"
- pbf "^3.0.5"
+ pbf "^3.2.1"
-watchpack@^2.0.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
- integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
+watchpack@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
+ integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
dependencies:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
@@ -9245,17 +9285,16 @@ webidl-conversions@^4.0.2:
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
webpack-cli@^4.4.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.5.0.tgz#b5213b84adf6e1f5de6391334c9fa53a48850466"
- integrity sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q==
+ version "4.7.2"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5"
+ integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==
dependencies:
"@discoveryjs/json-ext" "^0.5.0"
- "@webpack-cli/configtest" "^1.0.1"
- "@webpack-cli/info" "^1.2.2"
- "@webpack-cli/serve" "^1.3.0"
+ "@webpack-cli/configtest" "^1.0.4"
+ "@webpack-cli/info" "^1.3.0"
+ "@webpack-cli/serve" "^1.5.1"
colorette "^1.2.1"
commander "^7.0.0"
- enquirer "^2.3.6"
execa "^5.0.0"
fastest-levenshtein "^1.0.12"
import-local "^3.0.2"
@@ -9323,37 +9362,37 @@ webpack-log@^2.0.0:
uuid "^3.3.2"
webpack-merge@^5.7.3:
- version "5.7.3"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
- integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
+ version "5.8.0"
+ resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+ integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"
-webpack-sources@^2.1.1:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
- integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==
+webpack-sources@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
+ integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
dependencies:
source-list-map "^2.0.1"
source-map "^0.6.1"
webpack@^5.16.0:
- version "5.24.4"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.24.4.tgz#37d8cf95841dd23c809ea02931294b3455d74a59"
- integrity sha512-RXOdxF9hFFFhg47BryCgyFrEyyu7Y/75/uiI2DoUiTMqysK+WczVSTppvkR47oZcmI/DPaXCiCiaXBP8QjkNpA==
+ version "5.42.1"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.42.1.tgz#3347d0d93e79fe70bf62e51981024c80b9c8c3df"
+ integrity sha512-msikozzXrG2Hdx+dElq0fyNvxPFsaM2dKLc/l+xkMmhO/1qwVJ9K9gY+fi/49MYWcpSP7alnK5Q78Evrd1LiqQ==
dependencies:
"@types/eslint-scope" "^3.7.0"
- "@types/estree" "^0.0.46"
+ "@types/estree" "^0.0.48"
"@webassemblyjs/ast" "1.11.0"
"@webassemblyjs/wasm-edit" "1.11.0"
"@webassemblyjs/wasm-parser" "1.11.0"
- acorn "^8.0.4"
+ acorn "^8.4.1"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^5.7.0"
- es-module-lexer "^0.4.0"
- eslint-scope "^5.1.1"
+ enhanced-resolve "^5.8.0"
+ es-module-lexer "^0.6.0"
+ eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
graceful-fs "^4.2.4"
@@ -9363,9 +9402,9 @@ webpack@^5.16.0:
neo-async "^2.6.2"
schema-utils "^3.0.0"
tapable "^2.1.1"
- terser-webpack-plugin "^5.1.1"
- watchpack "^2.0.0"
- webpack-sources "^2.1.1"
+ terser-webpack-plugin "^5.1.3"
+ watchpack "^2.2.0"
+ webpack-sources "^2.3.0"
websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
version "0.7.4"
@@ -9390,7 +9429,7 @@ whatwg-url@^7.0.0:
tr46 "^1.0.1"
webidl-conversions "^4.0.2"
-which-boxed-primitive@^1.0.1:
+which-boxed-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
@@ -9500,9 +9539,9 @@ write-pkg@^3.1.0:
write-json-file "^2.2.0"
ws@^6.2.1:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
- integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+ version "6.2.2"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+ integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
dependencies:
async-limiter "~1.0.0"
@@ -9522,9 +9561,9 @@ xtend@~4.0.1:
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
y18n@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
- integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+ integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
version "3.1.1"
@@ -9545,17 +9584,17 @@ yargs-parser@^13.1.2:
decamelize "^1.2.0"
yargs-parser@^15.0.1:
- version "15.0.1"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
- integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
+ version "15.0.3"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.3.tgz#316e263d5febe8b38eef61ac092b33dfcc9b1115"
+ integrity sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==
dependencies:
camelcase "^5.0.0"
decamelize "^1.2.0"
yargs-parser@^20.2.3:
- version "20.2.6"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20"
- integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==
+ version "20.2.9"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+ integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
yargs@^13.3.2:
version "13.3.2"