100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: Overhaul of config, now using ts-loader only need to use npm run serve (watch no longer needed)
Rich Turner3170518ec2e0
diff --git a/build.gradle b/build.gradleindex 2908ee45d..a1197139a 100644--- a/build.gradle+++ b/build.gradle@@ -14,12 +14,11 @@ allprojects {apply from: "${findProject(":openremote") != null ? project(":openremote").projectDir : rootDir}/project.gradle"}-task deleteNodeModules {- doFirst {- delete "node_modules"- }-}-task clean {- dependsOn deleteNodeModules+ if (isCustomProject()) {+ doFirst {+ println("DELETE NODE MODULES!!!!!")+ delete "node_modules"+ }+ }}diff --git a/package.json b/package.jsonindex 62833b410..25c59f595 100644--- a/package.json+++ b/package.json@@ -7,6 +7,17 @@"ui/demo/*"],"devDependencies": {- "lerna": "^4.0.0"+ "lerna": "^4.0.0",+ "@typescript-eslint/eslint-plugin": "^5.9.0",+ "@typescript-eslint/parser": "^5.9.0",+ "eslint": "^8.6.0",+ "eslint-config-prettier": "^8.3.0",+ "eslint-config-standard": "^16.0.3",+ "eslint-plugin-import": "^2.25.4",+ "eslint-plugin-node": "^11.1.0",+ "eslint-plugin-promise": "^6.0.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "prettier": "^2.5.1"}}diff --git a/project.gradle b/project.gradleindex 1f67a43e1..2122fd581 100644--- a/project.gradle+++ b/project.gradle@@ -119,6 +119,7 @@ idea {excludeDirs += file(".node")excludeDirs += file("node_modules")excludeDirs += file("dist")+ excludeDirs += file("lib")excludeDirs += file("build")}}@@ -180,6 +181,7 @@ task npmInstall(type: Exec){commandLine npmCommand("npm"), "install"}task npmClean(type: Exec){+ dependsOn tasks.getByPath(":yarnInstall")commandLine npmCommand("npm"), "run-script", "clean"}task npmBuild(type: Exec){diff --git a/ui/.eslintrc.json b/ui/.eslintrc.jsonnew file mode 100644index 000000000..a5fe3da74--- /dev/null+++ b/ui/.eslintrc.json@@ -0,0 +1,18 @@+{+ "parser": "@typescript-eslint/parser",+ "parserOptions": {+ "project": "tsconfig.json",+ "sourceType": "module"+ },+ "extends": [+ "eslint:recommended",+ "standard",+ "plugin:@typescript-eslint/recommended",+ "prettier"+ ],+ "plugins": ["@typescript-eslint"],+ "env": {+ "es6": true+ },+ "ignorePatterns": ["dist", "lib", "node_modules"]+}diff --git a/ui/.gitignore b/ui/.gitignoreindex 849ddff3b..d21f3bcf2 100644--- a/ui/.gitignore+++ b/ui/.gitignore@@ -1 +1,2 @@dist/+lib/diff --git a/ui/.prettierrc.json b/ui/.prettierrc.jsonnew file mode 100644index 000000000..3e919d3df--- /dev/null+++ b/ui/.prettierrc.json@@ -0,0 +1,5 @@+{+ "trailingComma": "es5",+ "printWidth": 120,+ "singleQuote": false+}diff --git a/ui/app/console_loader/build.gradle b/ui/app/console_loader/build.gradleindex d12bc034f..9696ff827 100644--- a/ui/app/console_loader/build.gradle+++ b/ui/app/console_loader/build.gradle@@ -1,7 +1,11 @@buildDir = "dist"+task clean {+ dependsOn npmClean+}+task installDist(type: Copy) {- dependsOn npmClean, npmBuild+ dependsOn npmBuildmustRunAfter(resolveTask(":manager:installDist"))from project.buildDirinto "${resolveProject(':manager').buildDir}/install/manager/web/${projectDir.name}"diff --git a/ui/app/console_loader/package.json b/ui/app/console_loader/package.jsonindex efc4fca80..e6494f644 100644--- a/ui/app/console_loader/package.json+++ b/ui/app/console_loader/package.json@@ -5,13 +5,15 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","private": true,+ "exports": {+ "./*": "./lib/*.js"+ },"scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b -f && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --host 0.0.0.0 --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"dependencies": {@@ -19,7 +21,9 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/app/console_loader/src/pages/page-mobile-geofences.ts b/ui/app/console_loader/src/pages/page-mobile-geofences.tsindex aa8516f3a..12de92399 100644--- a/ui/app/console_loader/src/pages/page-mobile-geofences.ts+++ b/ui/app/console_loader/src/pages/page-mobile-geofences.ts@@ -1,12 +1,10 @@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 {Page, PageProvider, AppStateKeyed} from "@openremote/or-app";import {NavigationControl} from "maplibre-gl";import {EnhancedStore} from "@reduxjs/toolkit";-import manager from "@openremote/core";+import manager, {Util} from "@openremote/core";import {JsonRulesetDefinition} from "@openremote/model";-import {getGeoNotificationsFromRulesSet} from "@openremote/core/dist/util";import {OrMap, OrMapClickedEvent, OrMapMarker, OrMapMarkerClickedEvent} from "@openremote/or-map";export interface GeofencesConfig {@@ -333,15 +331,15 @@ class PageMobileGeofences extends Page<AppStateKeyed> {});}- this.mapItems = getGeoNotificationsFromRulesSet(mapItemDefinition);- this.listItems = getGeoNotificationsFromRulesSet(listItemtDefinition);+ this.mapItems = Util.getGeoNotificationsFromRulesSet(mapItemDefinition);+ this.listItems = Util.getGeoNotificationsFromRulesSet(listItemtDefinition);}).catch((reason) => {console.log("Error:" + reason);const rulesetDefinition: JsonRulesetDefinition = {rules: []};- this.mapItems = getGeoNotificationsFromRulesSet(rulesetDefinition);- this.listItems = getGeoNotificationsFromRulesSet(rulesetDefinition);+ this.mapItems = Util.getGeoNotificationsFromRulesSet(rulesetDefinition);+ this.listItems = Util.getGeoNotificationsFromRulesSet(rulesetDefinition);});}diff --git a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts b/ui/app/console_loader/src/pages/page-mobile-onboarding.tsindex 4cc749acf..133314c8c 100644--- a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts+++ b/ui/app/console_loader/src/pages/page-mobile-onboarding.ts@@ -1,7 +1,6 @@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 {Page, PageProvider, AppStateKeyed} from "@openremote/or-app";import {EnhancedStore} from "@reduxjs/toolkit";import manager from "@openremote/core";diff --git a/ui/app/console_loader/src/pages/page-mobile-splash.ts b/ui/app/console_loader/src/pages/page-mobile-splash.tsindex 6a063e849..dfd5fbdbf 100644--- a/ui/app/console_loader/src/pages/page-mobile-splash.ts+++ b/ui/app/console_loader/src/pages/page-mobile-splash.ts@@ -1,7 +1,6 @@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 {Page, PageProvider, AppStateKeyed} from "@openremote/or-app";import {EnhancedStore} from "@reduxjs/toolkit";export interface SplashConfig {diff --git a/ui/app/console_loader/tsconfig.json b/ui/app/console_loader/tsconfig.jsonindex 4a25bff03..9b93fee4c 100644--- a/ui/app/console_loader/tsconfig.json+++ b/ui/app/console_loader/tsconfig.json@@ -1,7 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "tsBuildInfoFile": "./.tsbuildinfo",+ "outDir": "./lib","strict": false},"include": [diff --git a/ui/app/manager/build.gradle b/ui/app/manager/build.gradleindex 4e7822176..9696ff827 100644--- a/ui/app/manager/build.gradle+++ b/ui/app/manager/build.gradle@@ -1,13 +1,11 @@buildDir = "dist"task clean {- doFirst {- delete "node_modules"- }+ dependsOn npmClean}task installDist(type: Copy) {- dependsOn clean, npmBuild+ dependsOn npmBuildmustRunAfter(resolveTask(":manager:installDist"))from project.buildDirinto "${resolveProject(':manager').buildDir}/install/manager/web/${projectDir.name}"diff --git a/ui/app/manager/package.json b/ui/app/manager/package.jsonindex e36a1637d..02de977fa 100644--- a/ui/app/manager/package.json+++ b/ui/app/manager/package.json@@ -6,22 +6,21 @@"license": "AGPL-3.0-or-later","private": true,"exports": {- "./*": "./dist/*.js"+ "./*": "./lib/*.js"},"typesVersions": {"*": {"*": [- "dist/*"+ "lib/*"]}},"scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b -f && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"dependencies": {@@ -29,7 +28,7 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/app/manager/src/pages/page-export.ts b/ui/app/manager/src/pages/page-export.tsindex d9f5f4848..72710f1a3 100644--- a/ui/app/manager/src/pages/page-export.ts+++ b/ui/app/manager/src/pages/page-export.ts@@ -10,7 +10,7 @@ import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/orimport {OrAttributePickerPickedEvent, OrAttributePicker } from "@openremote/or-attribute-picker";import { AttributeRef } from "@openremote/model";import moment from "moment";-import { buttonStyle } from "@openremote/or-rules/dist/style";+import { buttonStyle } from "@openremote/or-rules";import {createSelector} from "reselect";import { showDialog } from "@openremote/or-mwc-components/or-mwc-dialog";const tableStyle = require("@material/data-table/dist/mdc.data-table.css");diff --git a/ui/app/manager/src/pages/page-rules.ts b/ui/app/manager/src/pages/page-rules.tsindex 866446c44..530b3c759 100644--- a/ui/app/manager/src/pages/page-rules.ts+++ b/ui/app/manager/src/pages/page-rules.ts@@ -1,7 +1,7 @@import {css, html} from "lit";import {customElement, property, query} from "lit/decorators.js";import "@openremote/or-rules";-import {ActionTargetType, OrRules, RulesConfig} from "@openremote/or-rules";+import {OrRules, RulesConfig} from "@openremote/or-rules";import {NotificationTargetType, RulesetLang, WellknownAssets} from "@openremote/model";import {EnhancedStore} from "@reduxjs/toolkit";import {Page, PageProvider} from "@openremote/or-app";@@ -39,7 +39,7 @@ export const PAGE_RULES_CONFIG_DEFAULT: PageRulesConfig = {actions: {wait: [],attribute: [],- email: [ActionTargetType.USER, ActionTargetType.CUSTOM],+ email: [NotificationTargetType.USER, NotificationTargetType.CUSTOM],push: [NotificationTargetType.USER, NotificationTargetType.ASSET],}}diff --git a/ui/app/manager/tsconfig.json b/ui/app/manager/tsconfig.jsonindex 6d863c6c5..893d4f4e5 100644--- a/ui/app/manager/tsconfig.json+++ b/ui/app/manager/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src","strict": false},diff --git a/ui/component/core/package.json b/ui/component/core/package.jsonindex 4a9385458..9ff35246b 100644--- a/ui/component/core/package.json+++ b/ui/component/core/package.json@@ -3,12 +3,20 @@"version": "1.0.3","description": "OpenRemote 3.x Core","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts",+ "files": [+ "lib",+ "dist"+ ],"scripts": {"generate": "node mdi-iconset-generator.js","test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -25,7 +33,6 @@"devDependencies": {"@mdi/svg": ">=6.5.95","@types/qs": "^6.9.7",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/component/core/src/asset-mixin.ts b/ui/component/core/src/asset-mixin.tsindex e704aab17..0903bfe1c 100644--- a/ui/component/core/src/asset-mixin.ts+++ b/ui/component/core/src/asset-mixin.ts@@ -1,4 +1,3 @@-/* tslint:disable:no-empty */import {EventProviderFactory, EventProviderStatus} from "./event";import {objectsEqual} from "./util";import {AttributeRef, SharedEvent, EventRequestResponseWrapper} from "@openremote/model";diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.tsindex e42da942e..c69a7fc22 100644--- a/ui/component/core/src/util.ts+++ b/ui/component/core/src/util.ts@@ -923,7 +923,6 @@ try {window.addEventListener("test", null, Object.defineProperty({}, 'passive', {get: () => { supportsPassive = true; }}));-// tslint:disable-next-line:no-empty} catch(e) {}const wheelOpt = supportsPassive ? { passive: false } : false;diff --git a/ui/component/core/tsconfig.json b/ui/component/core/tsconfig.jsonindex 1e80c6e25..25c1a93eb 100644--- a/ui/component/core/tsconfig.json+++ b/ui/component/core/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/model/package.json b/ui/component/model/package.jsonindex fac420d2f..e95a13840 100644--- a/ui/component/model/package.json+++ b/ui/component/model/package.json@@ -2,9 +2,17 @@"name": "@openremote/model","version": "1.0.3","description": "OpenRemote 3.x Model Types",- "main": "dist/index.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "main": "dist/umd/index.bundle.js",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts",+ "files": [+ "lib",+ "dist"+ ],"scripts": {"build": "npx tsc -b --force","test": "echo \"No tests\" && exit 0",@@ -13,13 +21,9 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2"},"publishConfig": {"access": "public"- },- "files": [- "dist"- ]+ }}diff --git a/ui/component/model/tsconfig.json b/ui/component/model/tsconfig.jsonindex 632d4d8a1..8a0e9a1dd 100644--- a/ui/component/model/tsconfig.json+++ b/ui/component/model/tsconfig.json@@ -1,12 +1,11 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src","preserveConstEnums": true},"include": ["./src"]-}\ No newline at end of file+}diff --git a/ui/component/or-app/package.json b/ui/component/or-app/package.jsonindex 653d21530..e69752e1a 100644--- a/ui/component/or-app/package.json+++ b/ui/component/or-app/package.json@@ -5,15 +5,17 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",- "serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","test": "echo \"Error: no test specified\" && exit 1"},"dependencies": {@@ -38,7 +40,6 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/component/or-app/src/app.ts b/ui/component/or-app/src/app.tsindex f000463c7..d6caa9d57 100644--- a/ui/component/or-app/src/app.ts+++ b/ui/component/or-app/src/app.ts@@ -1,4 +1,3 @@-import manager from "@openremote/core";import { createSlice, PayloadAction } from "@reduxjs/toolkit";export interface AppState {diff --git a/ui/component/or-app/tsconfig.json b/ui/component/or-app/tsconfig.jsonindex 670ba3243..4dbc53145 100644--- a/ui/component/or-app/tsconfig.json+++ b/ui/component/or-app/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src","strict": true},diff --git a/ui/component/or-asset-tree/package.json b/ui/component/or-asset-tree/package.jsonindex 033e5527f..0a73bbc20 100644--- a/ui/component/or-asset-tree/package.json+++ b/ui/component/or-asset-tree/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote Asset Tree","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -23,7 +27,6 @@"moment": "^2.24.0"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-asset-tree/tsconfig.json b/ui/component/or-asset-tree/tsconfig.jsonindex 3fea7ad63..f4eb27c61 100644--- a/ui/component/or-asset-tree/tsconfig.json+++ b/ui/component/or-asset-tree/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.jsonindex 1e1d379c4..563e853fe 100644--- a/ui/component/or-asset-viewer/package.json+++ b/ui/component/or-asset-viewer/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote Asset Viewer","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -29,7 +33,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-asset-viewer/tsconfig.json b/ui/component/or-asset-viewer/tsconfig.jsonindex 025d80b79..aeb2fd09f 100644--- a/ui/component/or-asset-viewer/tsconfig.json+++ b/ui/component/or-asset-viewer/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-attribute-card/package.json b/ui/component/or-attribute-card/package.jsonindex 6dc9cb650..f33c32727 100644--- a/ui/component/or-attribute-card/package.json+++ b/ui/component/or-attribute-card/package.json@@ -3,12 +3,16 @@"version": "1.0.4","description": "OpenRemote attribute card","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"build": "npx tsc -b","test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -21,7 +25,6 @@"moment": "^2.24.0"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-attribute-card/tsconfig.json b/ui/component/or-attribute-card/tsconfig.jsonindex 1998f8063..f8a72042a 100644--- a/ui/component/or-attribute-card/tsconfig.json+++ b/ui/component/or-attribute-card/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.jsonindex 94c566166..91731d100 100644--- a/ui/component/or-attribute-history/package.json+++ b/ui/component/or-attribute-history/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote attribute history","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -23,7 +27,6 @@},"devDependencies": {"@types/chart.js": "^2.9.34",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-attribute-history/tsconfig.json b/ui/component/or-attribute-history/tsconfig.jsonindex 467b7c2e8..e81fd687d 100644--- a/ui/component/or-attribute-history/tsconfig.json+++ b/ui/component/or-attribute-history/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-attribute-input/package.json b/ui/component/or-attribute-input/package.jsonindex 69b0f4a3e..e1af04839 100644--- a/ui/component/or-attribute-input/package.json+++ b/ui/component/or-attribute-input/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote attribute input","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -21,7 +25,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-attribute-input/tsconfig.json b/ui/component/or-attribute-input/tsconfig.jsonindex c28121e2d..ce8013590 100644--- a/ui/component/or-attribute-input/tsconfig.json+++ b/ui/component/or-attribute-input/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-attribute-picker/package.json b/ui/component/or-attribute-picker/package.jsonindex b08841964..f0ea2efe2 100644--- a/ui/component/or-attribute-picker/package.json+++ b/ui/component/or-attribute-picker/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote attribute picker dialog","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -19,7 +23,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-attribute-picker/tsconfig.json b/ui/component/or-attribute-picker/tsconfig.jsonindex 329f08374..d0ba7d6e8 100644--- a/ui/component/or-attribute-picker/tsconfig.json+++ b/ui/component/or-attribute-picker/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-bottom-navigation/package.json b/ui/component/or-bottom-navigation/package.jsonindex 2ae4cdb39..a1ab88b02 100644--- a/ui/component/or-bottom-navigation/package.json+++ b/ui/component/or-bottom-navigation/package.json@@ -4,7 +4,12 @@"private": "true","description": "Temporary bottom navigation component","main": "dist/or-bottom-navigation.js",- "types": "src/or-bottom-navigation.ts",+ "module": "lib/or-bottom-navigation.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/or-bottom-navigation.d.ts","scripts": {"test": "echo \"No tests\" && exit 0"},@@ -14,7 +19,6 @@"@polymer/polymer": "^3.3.1"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-bottom-navigation/tsconfig.json b/ui/component/or-bottom-navigation/tsconfig.jsonindex 2a3b78ac3..dd3861cf9 100644--- a/ui/component/or-bottom-navigation/tsconfig.json+++ b/ui/component/or-bottom-navigation/tsconfig.json@@ -1,11 +1,10 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": ["./src"]-}\ No newline at end of file+}diff --git a/ui/component/or-chart/@types/chartjs-plugin-annotation.d.ts b/ui/component/or-chart/@types/chartjs-plugin-annotation.d.tsindex e1d561163..b9109c1c4 100644--- a/ui/component/or-chart/@types/chartjs-plugin-annotation.d.ts+++ b/ui/component/or-chart/@types/chartjs-plugin-annotation.d.ts@@ -1,4 +1,4 @@-/* tslint:disable:class-name */+/* eslint:disable:class-name */declare module "chartjs-plugin-annotation" {}diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.jsonindex 146e71dfc..6c3e5b687 100644--- a/ui/component/or-chart/package.json+++ b/ui/component/or-chart/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote chart","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -31,7 +35,6 @@"devDependencies": {"@types/chart.js": "^2.9.34","@types/offscreencanvas": "^2019.6.4",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-chart/tsconfig.json b/ui/component/or-chart/tsconfig.jsonindex 0db348b2a..4db20cbd3 100644--- a/ui/component/or-chart/tsconfig.json+++ b/ui/component/or-chart/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src","types": ["offscreencanvas"]},diff --git a/ui/component/or-components/package.json b/ui/component/or-components/package.jsonindex 299ca76fe..5643df286 100644--- a/ui/component/or-components/package.json+++ b/ui/component/or-components/package.json@@ -3,22 +3,22 @@"version": "1.0.3","description": "OpenRemote basic UI components","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",- "scripts": {- "test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"- },+ "module": "lib/index.js","exports": {- "./*": "./dist/*.js"+ ".": "./lib/index.js",+ "./*": "./lib/*.js"},"typesVersions": {"*": {"*": [- "dist/*"+ "lib/*"]}},+ "scripts": {+ "test": "echo \"No tests\" && exit 0",+ "prepublishOnly": "npx webpack"+ },"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {@@ -27,7 +27,6 @@"simplebar": "^5.3.6"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-components/tsconfig.json b/ui/component/or-components/tsconfig.jsonindex 1e51a2601..728b7e9fa 100644--- a/ui/component/or-components/tsconfig.json+++ b/ui/component/or-components/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -13,4 +12,4 @@{ "path": "../rest" },{ "path": "../or-icon" }]-}\ No newline at end of file+}diff --git a/ui/component/or-data-viewer/package.json b/ui/component/or-data-viewer/package.jsonindex e23cf6d73..678848257 100644--- a/ui/component/or-data-viewer/package.json+++ b/ui/component/or-data-viewer/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote data Viewer","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -27,7 +31,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-data-viewer/tsconfig.json b/ui/component/or-data-viewer/tsconfig.jsonindex 322f9c268..17e43a395 100644--- a/ui/component/or-data-viewer/tsconfig.json+++ b/ui/component/or-data-viewer/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-icon/package.json b/ui/component/or-icon/package.jsonindex b1ca663dc..206a54876 100644--- a/ui/component/or-icon/package.json+++ b/ui/component/or-icon/package.json@@ -3,12 +3,16 @@"version": "1.0.3","description": "Icon component for displaying an icon from an icon set","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"build": "npx tsc -b","test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -17,7 +21,6 @@},"devDependencies": {"terser-webpack-plugin": "^5.2.5",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-icon/tsconfig.json b/ui/component/or-icon/tsconfig.jsonindex 3dc13336a..1ad2202e8 100644--- a/ui/component/or-icon/tsconfig.json+++ b/ui/component/or-icon/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -12,4 +11,4 @@{ "path": "../core" },{ "path": "../model" }]-}\ No newline at end of file+}diff --git a/ui/component/or-json-forms/package.json b/ui/component/or-json-forms/package.jsonindex 550292338..756d4ffab 100644--- a/ui/component/or-json-forms/package.json+++ b/ui/component/or-json-forms/package.json@@ -3,12 +3,16 @@"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",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"build": "npx tsc -b","test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -20,7 +24,6 @@},"devDependencies": {"@jsonforms/core": "^3.0.0-alpha.1",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-json-forms/tsconfig.json b/ui/component/or-json-forms/tsconfig.jsonindex 682436851..012b7a8b7 100644--- a/ui/component/or-json-forms/tsconfig.json+++ b/ui/component/or-json-forms/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-log-viewer/package.json b/ui/component/or-log-viewer/package.jsonindex becda35a7..a94be6390 100644--- a/ui/component/or-log-viewer/package.json+++ b/ui/component/or-log-viewer/package.json@@ -3,11 +3,15 @@"version": "1.0.3","description": "OpenRemote syslog viewer","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -21,7 +25,6 @@"url": "^0.11.0"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-log-viewer/tsconfig.json b/ui/component/or-log-viewer/tsconfig.jsonindex a83ede370..e3e0d0c00 100644--- a/ui/component/or-log-viewer/tsconfig.json+++ b/ui/component/or-log-viewer/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-map/@types/maplibre-gl-geocoder.d.ts b/ui/component/or-map/@types/maplibre-gl-geocoder.d.tsindex 88e278b8f..6f8a25396 100644--- a/ui/component/or-map/@types/maplibre-gl-geocoder.d.ts+++ b/ui/component/or-map/@types/maplibre-gl-geocoder.d.ts@@ -1,2 +1,2 @@-/* tslint:disable:class-name */+/* eslint:disable:class-name */declare module "@maplibre/maplibre-gl-geocoder";diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.jsonindex f408c48e2..defba8b43 100644--- a/ui/component/or-map/package.json+++ b/ui/component/or-map/package.json@@ -3,12 +3,16 @@"version": "1.0.4","description": "Displays s vector or raster map","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"build": "npx tsc -b","test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -28,7 +32,6 @@},"devDependencies": {"@types/geojson": "^7946.0.7",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-map/src/index.ts b/ui/component/or-map/src/index.tsindex e5c34ae2d..7ce012f4b 100644--- a/ui/component/or-map/src/index.ts+++ b/ui/component/or-map/src/index.ts@@ -5,6 +5,8 @@ import {customElement, property, query} from "lit/decorators.js";import {Control, IControl, LngLat, LngLatBoundsLike, LngLatLike, Map as MapGL, GeolocateControl} from "maplibre-gl";import {MapWidget} from "./mapwidget";import {style} from "./style";+import "./markers/or-map-marker";+import "./markers/or-map-marker-asset";import {OrMapMarker, OrMapMarkerChangedEvent} from "./markers/or-map-marker";import * as Util from "./util";import {diff --git a/ui/component/or-map/tsconfig.json b/ui/component/or-map/tsconfig.jsonindex da514469c..104c7eef3 100644--- a/ui/component/or-map/tsconfig.json+++ b/ui/component/or-map/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-mwc-components/package.json b/ui/component/or-mwc-components/package.jsonindex 659a31fed..5463128f9 100644--- a/ui/component/or-mwc-components/package.json+++ b/ui/component/or-mwc-components/package.json@@ -2,21 +2,24 @@"name": "@openremote/or-mwc-components","version": "1.0.3","description": "Material Design Components packaged as web components (The official components are hardcoded to use Material Design font which has limited icons)",- "scripts": {- "build": "npx tsc -b",- "test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b"- },+ "main": "dist/umd/index.bundle.js",+ "module": "lib/index.js","exports": {- "./*": "./dist/*.js"+ ".": "./lib/index.js",+ "./*": "./lib/*.js"},"typesVersions": {"*": {"*": [- "dist/*"+ "lib/*"]}},+ "scripts": {+ "build": "npx tsc -b",+ "test": "echo \"No tests\" && exit 0",+ "prepublishOnly": "npx tsc -b"+ },"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {@@ -44,7 +47,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-mwc-components/tsconfig.json b/ui/component/or-mwc-components/tsconfig.jsonindex 19d452147..f2721ca07 100644--- a/ui/component/or-mwc-components/tsconfig.json+++ b/ui/component/or-mwc-components/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.jsonindex 550d822db..0ca116d05 100644--- a/ui/component/or-rules/package.json+++ b/ui/component/or-rules/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "OpenRemote rules related UI components","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -30,7 +34,6 @@},"devDependencies": {"@types/shortid": "^0.0.29",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.tsindex eb942b959..0c434a710 100644--- a/ui/component/or-rules/src/index.ts+++ b/ui/component/or-rules/src/index.ts@@ -40,6 +40,8 @@ import {RecurrenceOption} from "./json-viewer/or-rule-then-otherwise";import {ValueInputProviderGenerator} from "@openremote/or-mwc-components/or-mwc-input";import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";+export {buttonStyle} from "./style";+export const enum ConditionType {AGENT_QUERY = "agentQuery",ASSET_QUERY = "assetQuery",@@ -53,8 +55,6 @@ export const enum ActionType {ATTRIBUTE = "attribute"}-export import ActionTargetType = NotificationTargetType;-export enum AssetQueryOperator {VALUE_EMPTY = "empty",VALUE_NOT_EMPTY = "notEmpty",@@ -89,8 +89,8 @@ export enum AssetQueryOperator {}export interface AllowedActionTargetTypes {- default?: ActionTargetType[];- actions?: {[actionType in ActionType]?: ActionTargetType[]};+ default?: NotificationTargetType[];+ actions?: {[actionType in ActionType]?: NotificationTargetType[]};}export interface RulesConfig {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.tsindex 97b881913..f5ee5adce 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@@ -16,8 +16,8 @@ import {OrRulesJsonRuleChangedEvent} from "../or-rule-json-viewer";import {translate} from "@openremote/or-translate";import {DialogAction, OrMwcDialog, OrMwcDialogOpenedEvent} from "@openremote/or-mwc-components/or-mwc-dialog";-import {OrMap, OrMapClickedEvent} from '@openremote/or-map';-import '@openremote/or-map/dist/markers/or-map-marker';+import {OrMap, OrMapClickedEvent} from "@openremote/or-map";+import "@openremote/or-map";import {LngLatLike} from "maplibre-gl";@customElement("or-rule-radial-modal")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.tsindex 901abf4ad..a92043025 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,7 +1,7 @@import {css, html, LitElement, TemplateResult} from "lit";import {customElement, property} from "lit/decorators.js";import {until} from "lit/directives/until.js";-import {ActionTargetType, ActionType, OrRulesRuleUnsupportedEvent, RulesConfig} from "../index";+import {ActionType, OrRulesRuleUnsupportedEvent, RulesConfig} from "../index";import {AssetQuery,AssetQueryOrderBy$Property,@@ -10,7 +10,8 @@ import {RuleAction,RuleActionNotification,UserQuery,- WellknownAssets+ WellknownAssets,+ NotificationTargetType} from "@openremote/model";import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";import {getTargetTypeMap, OrRulesJsonRuleChangedEvent} from "./or-rule-json-viewer";@@ -61,20 +62,20 @@ export class OrRuleActionNotification extends LitElement {@property({type: Object})public config?: RulesConfig;- protected static getActionTargetTemplate(targetTypeMap: [string, string?][], action: RuleAction, actionType: ActionType, readonly: boolean, config: RulesConfig | undefined, baseAssetQuery: AssetQuery | undefined, onTargetTypeChangedCallback: (type: ActionTargetType) => void, onTargetChangedCallback: (type: ActionTargetType, value: string | undefined) => void): PromiseLike<TemplateResult> | undefined {+ protected static getActionTargetTemplate(targetTypeMap: [string, string?][], action: RuleAction, actionType: ActionType, readonly: boolean, config: RulesConfig | undefined, baseAssetQuery: AssetQuery | undefined, onTargetTypeChangedCallback: (type: NotificationTargetType) => void, onTargetChangedCallback: (type: NotificationTargetType, value: string | undefined) => void): PromiseLike<TemplateResult> | undefined {- let allowedTargetTypes: [ActionTargetType, string][] = [- [ActionTargetType.USER, i18next.t("user_plural")],- [ActionTargetType.ASSET, i18next.t("asset_plural")],- [ActionTargetType.TENANT, i18next.t("tenant_plural")],- [ActionTargetType.CUSTOM, i18next.t("custom")]+ let allowedTargetTypes: [NotificationTargetType, string][] = [+ [NotificationTargetType.USER, i18next.t("user_plural")],+ [NotificationTargetType.ASSET, i18next.t("asset_plural")],+ [NotificationTargetType.TENANT, i18next.t("tenant_plural")],+ [NotificationTargetType.CUSTOM, i18next.t("custom")]];if (config && config.controls && config.controls.allowedActionTargetTypes) {let configTypes: string[] | undefined;if (config.controls.allowedActionTargetTypes.actions) {- configTypes = (config.controls.allowedActionTargetTypes.actions as any)[actionType] as ActionTargetType[];+ configTypes = (config.controls.allowedActionTargetTypes.actions as any)[actionType] as NotificationTargetType[];} else {configTypes = config.controls.allowedActionTargetTypes.default;}@@ -89,13 +90,13 @@ export class OrRuleActionNotification extends LitElement {return;}- let targetType: ActionTargetType | undefined = ActionTargetType.ASSET;+ let targetType: NotificationTargetType | undefined = NotificationTargetType.ASSET;if (action.target) {if (action.target.users && !action.target.conditionAssets && !action.target.matchedAssets && !action.target.assets) {- targetType = ActionTargetType.USER;+ targetType = NotificationTargetType.USER;} else if (action.target.custom !== undefined && !action.target.conditionAssets && !action.target.matchedAssets && !action.target.assets) {- targetType = ActionTargetType.CUSTOM;+ targetType = NotificationTargetType.CUSTOM;}}@@ -105,7 +106,7 @@ export class OrRuleActionNotification extends LitElement {targetType = undefined;}- if (targetType === ActionTargetType.CUSTOM) {+ if (targetType === NotificationTargetType.CUSTOM) {const template = html`<or-mwc-input class="min-width" .type="${InputType.TEXT}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => onTargetChangedCallback(targetType!, e.detail.value)}" ?readonly="${readonly}" .value="${action.target!.custom}" ></or-mwc-input>@@ -118,7 +119,7 @@ export class OrRuleActionNotification extends LitElement {let label: string | undefined;let value: string | undefined;- if (targetType === ActionTargetType.USER) {+ if (targetType === NotificationTargetType.USER) {targetValuesGenerator = manager.rest.api.UserResource.query({tenant: manager.displayRealm} as UserQuery).then((usersResponse) => usersResponse.data.map((user) => [user.id!, user.username!]));@@ -183,7 +184,7 @@ export class OrRuleActionNotification extends LitElement {targetValueTemplate = targetValuesGenerator.then((values) => {// Add additional options for assets- if (targetType === ActionTargetType.ASSET) {+ if (targetType === NotificationTargetType.ASSET) {const additionalValues: [string, string][] = [["allMatched", i18next.t("matched")]];if (targetTypeMap && targetTypeMap.length > 1) {targetTypeMap.forEach((typeAndTag) => {@@ -214,7 +215,7 @@ export class OrRuleActionNotification extends LitElement {.options="${allowedTargetTypes}".value="${targetType}".label="${i18next.t("recipients")}"- @or-mwc-input-changed="${(e: OrInputChangedEvent) => onTargetTypeChangedCallback(e.detail.value as ActionTargetType)}"+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => onTargetTypeChangedCallback(e.detail.value as NotificationTargetType)}"?readonly="${readonly}"></or-mwc-input>${valueTemplate}`;@@ -287,16 +288,16 @@ export class OrRuleActionNotification extends LitElement {return html`${until(targetTemplate,html``)}`;}- protected _onTargetTypeChanged(targetType: ActionTargetType) {- if (targetType === ActionTargetType.ASSET) {+ protected _onTargetTypeChanged(targetType: NotificationTargetType) {+ if (targetType === NotificationTargetType.ASSET) {delete this.action.target;- } else if (targetType === ActionTargetType.USER) {+ } else if (targetType === NotificationTargetType.USER) {this.action.target = {users: {ids: []}};- } else if (targetType === ActionTargetType.CUSTOM) {+ } else if (targetType === NotificationTargetType.CUSTOM) {this.action.target = {custom: ""}@@ -306,20 +307,20 @@ export class OrRuleActionNotification extends LitElement {this.requestUpdate();}- protected _onTargetChanged(targetType: ActionTargetType, value: string | undefined) {+ protected _onTargetChanged(targetType: NotificationTargetType, value: string | undefined) {switch (targetType) {- case ActionTargetType.USER:+ case NotificationTargetType.USER:if(value){const users:UserQuery = {ids: [value]}this.action.target = {users: users}}break;- case ActionTargetType.CUSTOM:+ case NotificationTargetType.CUSTOM:this.action.target = {custom: value}break;- case ActionTargetType.ASSET:+ case NotificationTargetType.ASSET:if (!value || value === "allMatched") {delete this.action.target;} else if (value.endsWith("Asset")) {diff --git a/ui/component/or-rules/tsconfig.json b/ui/component/or-rules/tsconfig.jsonindex 774026ae9..274f1a869 100644--- a/ui/component/or-rules/tsconfig.json+++ b/ui/component/or-rules/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [diff --git a/ui/component/or-smart-notify/package.json b/ui/component/or-smart-notify/package.jsonindex 2684a8c49..015106ac7 100644--- a/ui/component/or-smart-notify/package.json+++ b/ui/component/or-smart-notify/package.json@@ -3,11 +3,15 @@"version": "1.0.3","description": "OpenRemote Smarty Notify element","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -22,7 +26,6 @@"moment": "^2.24.0"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-smart-notify/tsconfig.json b/ui/component/or-smart-notify/tsconfig.jsonindex 0191a5e16..36a7c304b 100644--- a/ui/component/or-smart-notify/tsconfig.json+++ b/ui/component/or-smart-notify/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -12,4 +11,4 @@{ "path": "../core" },{ "path": "../rest" }]-}\ No newline at end of file+}diff --git a/ui/component/or-survey-results/package.json b/ui/component/or-survey-results/package.jsonindex 3e5091e01..c40fc0e0b 100644--- a/ui/component/or-survey-results/package.json+++ b/ui/component/or-survey-results/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "Displays survey results","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -17,7 +21,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-survey-results/tsconfig.json b/ui/component/or-survey-results/tsconfig.jsonindex 0191a5e16..36a7c304b 100644--- a/ui/component/or-survey-results/tsconfig.json+++ b/ui/component/or-survey-results/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -12,4 +11,4 @@{ "path": "../core" },{ "path": "../rest" }]-}\ No newline at end of file+}diff --git a/ui/component/or-survey/package.json b/ui/component/or-survey/package.jsonindex 7b1ab1ee4..0c9422b9a 100644--- a/ui/component/or-survey/package.json+++ b/ui/component/or-survey/package.json@@ -3,11 +3,15 @@"version": "1.0.4","description": "Displays survey","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -21,7 +25,6 @@"moment": "2.29.1"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-survey/tsconfig.json b/ui/component/or-survey/tsconfig.jsonindex 0191a5e16..36a7c304b 100644--- a/ui/component/or-survey/tsconfig.json+++ b/ui/component/or-survey/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -12,4 +11,4 @@{ "path": "../core" },{ "path": "../rest" }]-}\ No newline at end of file+}diff --git a/ui/component/or-thermostat/package.json b/ui/component/or-thermostat/package.jsonindex 9760ca166..e4e519ebf 100644--- a/ui/component/or-thermostat/package.json+++ b/ui/component/or-thermostat/package.json@@ -3,11 +3,15 @@"version": "1.0.3","description": "A thermostat component for viewing current temperature and setting target temperature","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -15,7 +19,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-thermostat/tsconfig.json b/ui/component/or-thermostat/tsconfig.jsonindex 0191a5e16..36a7c304b 100644--- a/ui/component/or-thermostat/tsconfig.json+++ b/ui/component/or-thermostat/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -12,4 +11,4 @@{ "path": "../core" },{ "path": "../rest" }]-}\ No newline at end of file+}diff --git a/ui/component/or-timeline/package.json b/ui/component/or-timeline/package.jsonindex 5a48e1fbe..8cc48b609 100644--- a/ui/component/or-timeline/package.json+++ b/ui/component/or-timeline/package.json@@ -3,11 +3,15 @@"version": "1.0.3","description": "OpenRemote Timeline","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -16,7 +20,6 @@"moment": "^2.24.0"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-timeline/tsconfig.json b/ui/component/or-timeline/tsconfig.jsonindex 0191a5e16..36a7c304b 100644--- a/ui/component/or-timeline/tsconfig.json+++ b/ui/component/or-timeline/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -12,4 +11,4 @@{ "path": "../core" },{ "path": "../rest" }]-}\ No newline at end of file+}diff --git a/ui/component/or-translate/package.json b/ui/component/or-translate/package.jsonindex e6f8f9b56..dcae483a5 100644--- a/ui/component/or-translate/package.json+++ b/ui/component/or-translate/package.json@@ -2,11 +2,16 @@"name": "@openremote/or-translate","version": "1.0.3","description": "Provides a web component for translations using i18next",- "main": "dist/index.js",- "types": "dist/index.d.ts",+ "main": "dist/umd/index.bundle.js",+ "module": "lib/index.js",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "types": "lib/index.d.ts","scripts": {"test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -15,7 +20,6 @@"lit": "^2.0.2"},"devDependencies": {- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"diff --git a/ui/component/or-translate/tsconfig.json b/ui/component/or-translate/tsconfig.jsonindex 2a3b78ac3..dd3861cf9 100644--- a/ui/component/or-translate/tsconfig.json+++ b/ui/component/or-translate/tsconfig.json@@ -1,11 +1,10 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": ["./src"]-}\ No newline at end of file+}diff --git a/ui/component/rest/package.json b/ui/component/rest/package.jsonindex fb0788f28..6c9d81784 100644--- a/ui/component/rest/package.json+++ b/ui/component/rest/package.json@@ -3,12 +3,20 @@"version": "1.0.3","description": "OpenRemote 3.x REST API","main": "dist/umd/index.bundle.js",- "module": "dist/index.js",- "types": "dist/index.d.ts",+ "module": "lib/index.js",+ "types": "lib/index.d.ts",+ "exports": {+ ".": "./lib/index.js",+ "./*": "./lib/*.js"+ },+ "files": [+ "lib",+ "dist"+ ],"scripts": {"build": "npx tsc -b","test": "echo \"No tests\" && exit 0",- "prepublishOnly": "npx tsc -b && npx webpack"+ "prepublishOnly": "npx webpack"},"author": "OpenRemote","license": "AGPL-3.0-or-later",@@ -19,12 +27,8 @@"devDependencies": {"@openremote/model": "^1.0.3","@types/qs": "^6.9.7",- "tslint": ">=5.11.0","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1"- },- "files": [- "dist"- ]+ }}diff --git a/ui/component/rest/tsconfig.json b/ui/component/rest/tsconfig.jsonindex 880533eee..3436fc50f 100644--- a/ui/component/rest/tsconfig.json+++ b/ui/component/rest/tsconfig.json@@ -1,8 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "outDir": "./dist",- "tsBuildInfoFile": "./dist/.tsbuildinfo",+ "outDir": "./lib","rootDir": "src"},"include": [@@ -11,4 +10,4 @@"references": [{ "path": "../model" }]-}\ No newline at end of file+}diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.jsonindex b70b583db..2cdab7aa6 100644--- a/ui/demo/demo-core/package.json+++ b/ui/demo/demo-core/package.json@@ -4,12 +4,11 @@"description": "Demo","private": true,"scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",@@ -23,7 +22,9 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/demo/demo-core/tsconfig.json b/ui/demo/demo-core/tsconfig.jsonindex 4bac1a436..365703554 100644--- a/ui/demo/demo-core/tsconfig.json+++ b/ui/demo/demo-core/tsconfig.json@@ -1,7 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "tsBuildInfoFile": "./.tsbuildinfo"+ "outDir": "./lib"},"include": ["./src"diff --git a/ui/demo/demo-or-asset-tree/package.json b/ui/demo/demo-or-asset-tree/package.jsonindex 0f52156ea..280c806f3 100644--- a/ui/demo/demo-or-asset-tree/package.json+++ b/ui/demo/demo-or-asset-tree/package.json@@ -3,12 +3,11 @@"version": "1.0.4","description": "Component Demo","scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",@@ -19,7 +18,9 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/demo/demo-or-asset-tree/tsconfig.json b/ui/demo/demo-or-asset-tree/tsconfig.jsonindex 79ef0c997..fb4e817f4 100644--- a/ui/demo/demo-or-asset-tree/tsconfig.json+++ b/ui/demo/demo-or-asset-tree/tsconfig.json@@ -1,7 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "tsBuildInfoFile": "./.tsbuildinfo"+ "outDir": "./lib"},"include": ["./src"@@ -11,4 +11,4 @@{ "path": "../../component/rest" },{ "path": "../../component/or-asset-tree" }]-}\ No newline at end of file+}diff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.jsonindex c66830ab5..ab744247d 100644--- a/ui/demo/demo-or-map/package.json+++ b/ui/demo/demo-or-map/package.json@@ -3,12 +3,11 @@"version": "1.0.4","description": "Component Demo","scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",@@ -19,7 +18,9 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/demo/demo-or-map/src/index.ts b/ui/demo/demo-or-map/src/index.tsindex 3e52982ed..bbf75c9f0 100644--- a/ui/demo/demo-or-map/src/index.ts+++ b/ui/demo/demo-or-map/src/index.ts@@ -2,8 +2,7 @@ import "@polymer/iron-demo-helpers/demo-pages-shared-styles";import "@polymer/iron-demo-helpers/demo-snippet";import "@openremote/or-map";import manager, {Auth} from "@openremote/core";-import {OrMapMarkerClickedEvent} from "@openremote/or-map";-import {OrMap} from "@openremote/or-map";+import {OrMap, OrMapMarkerClickedEvent} from "@openremote/or-map";import {getBuildingAsset} from "../../demo-core/src/util";manager.init({diff --git a/ui/demo/demo-or-map/tsconfig.json b/ui/demo/demo-or-map/tsconfig.jsonindex 737d6bee3..08369a155 100644--- a/ui/demo/demo-or-map/tsconfig.json+++ b/ui/demo/demo-or-map/tsconfig.json@@ -1,7 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "tsBuildInfoFile": "./.tsbuildinfo"+ "outDir": "./lib"},"include": ["./src"diff --git a/ui/demo/demo-or-thermostat/package.json b/ui/demo/demo-or-thermostat/package.jsonindex d82ec58ca..c3077beea 100644--- a/ui/demo/demo-or-thermostat/package.json+++ b/ui/demo/demo-or-thermostat/package.json@@ -3,12 +3,11 @@"version": "1.0.4","description": "Component Demo","scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",@@ -19,7 +18,9 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/demo/demo-or-thermostat/tsconfig.json b/ui/demo/demo-or-thermostat/tsconfig.jsonindex 99a2fa107..6c6afc199 100644--- a/ui/demo/demo-or-thermostat/tsconfig.json+++ b/ui/demo/demo-or-thermostat/tsconfig.json@@ -1,7 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "tsBuildInfoFile": "./.tsbuildinfo"+ "outDir": "./lib"},"include": ["./src"@@ -11,4 +11,4 @@{ "path": "../../component/rest" },{ "path": "../../component/or-thermostat" }]-}\ No newline at end of file+}diff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.jsonindex bb518abfb..c8e7d2e44 100644--- a/ui/demo/demo-rest/package.json+++ b/ui/demo/demo-rest/package.json@@ -4,12 +4,11 @@"description": "Demo","private": true,"scripts": {- "clean": "npx shx rm -rf dist",+ "clean": "npx tsc -b --clean && npx shx rm -rf dist","modelBuild": "npx orutil build","modelWatch": "npx orutil watch",- "build": "npx tsc -b && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",+ "build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production","serve": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",- "watch": "npx tsc -b -w","test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote",@@ -20,7 +19,9 @@},"devDependencies": {"@openremote/util": "^1.0.4",- "tslint": ">=5.11.0",+ "fork-ts-checker-notifier-webpack-plugin": "^4.0.0",+ "fork-ts-checker-webpack-plugin": "^6.5.0",+ "ts-loader": "^9.2.6","typescript": ">=4.5.2","webpack": "^5.64.3","webpack-cli": "^4.9.1",diff --git a/ui/demo/demo-rest/tsconfig.json b/ui/demo/demo-rest/tsconfig.jsonindex bc6327d6e..02524f45f 100644--- a/ui/demo/demo-rest/tsconfig.json+++ b/ui/demo/demo-rest/tsconfig.json@@ -1,7 +1,7 @@{"extends": "../../tsconfig","compilerOptions": {- "tsBuildInfoFile": "./.tsbuildinfo"+ "outDir": "./lib"},"include": ["./src"@@ -9,4 +9,4 @@"references": [{ "path": "../../component/core" }]-}\ No newline at end of file+}diff --git a/ui/tslint.json b/ui/tslint.jsondeleted file mode 100644index 6282a847e..000000000--- a/ui/tslint.json+++ /dev/null@@ -1,21 +0,0 @@-{- "defaultSeverity": "error",- "extends": "tslint:recommended",- "rules": {- "interface-name" : [true, "never-prefix"],- "variable-name": [false],- "trailing-comma": [false],- "no-trailing-whitespace": [false],- "no-console": [false],- "max-classes-per-file": false,- "max-line-length": false,- "ordered-imports": false,- "object-literal-sort-keys": false,- "ban-types": false,- "array-type": false,- "object-literal-shorthand": false,- "no-string-literal": false,- "no-shadowed-variable": false,- "no-var-requires": false- }-}diff --git a/ui/util/webpack.util.js b/ui/util/webpack.util.jsindex 7b97a303e..8df95b954 100644--- a/ui/util/webpack.util.js+++ b/ui/util/webpack.util.js@@ -3,6 +3,44 @@ const path = require("path");const webpack = require("webpack");const CopyWebpackPlugin = require("copy-webpack-plugin");const HtmlWebpackPlugin = require("html-webpack-plugin");+const ForkTsCheckerNotifierWebpackPlugin = require("fork-ts-checker-notifier-webpack-plugin");+const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");++function getStandardModuleRules() {+ return {+ rules: [+ {+ test: /(maplibre|mapbox|@material).*\.css$/, //output mapbox and material css as strings+ type: "asset/source"+ },+ {+ test: /\.css$/, //+ exclude: /(maplibre|mapbox|@material).*\.css$/,+ use: [+ { loader: "css-loader" }+ ]+ },+ {+ test: /\.(png|jpg|ico|gif|svg|eot|ttf|woff|woff2)$/,+ type: "asset",+ generator: {+ filename: 'images/[hash][ext][query]'+ }+ },+ {+ test: /\.tsx?$/,+ exclude: /node_modules/,+ use: {+ loader: "ts-loader",+ options: {+ projectReferences: true,+ transpileOnly: true+ }+ }+ }+ ]+ };+}function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl) {const production = mode === "production";@@ -11,35 +49,14 @@ function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl) {const config = {entry: {- 'bundle': './src/index.js'+ 'bundle': './src/index.ts'},output: {path: dirname + "/dist",publicPath: "/" + dirname.split(path.sep).slice(-1)[0] + "/",filename: "[name].[contenthash].js"},- module: {- rules: [- {- test: /(maplibre|mapbox|@material).*\.css$/, //output mapbox and material css as strings- type: "asset/source"- },- {- test: /\.css$/, //- exclude: /(maplibre|mapbox|@material).*\.css$/,- use: [- { loader: "css-loader" }- ]- },- {- test: /\.(png|jpg|ico|gif|svg|eot|ttf|woff|woff2)$/,- type: "asset",- generator: {- filename: 'images/[hash][ext][query]'- }- }- ]- },+ module: {...getStandardModuleRules()},// optimization: {// minimize: true,// minimizer: [@@ -49,11 +66,40 @@ function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl) {// ],// },resolve: {+ extensions: [".ts", ".tsx", "..."],fallback: { "vm": false }}};+ config.plugins = [+ // Conditional compilation variables+ new webpack.DefinePlugin({+ PRODUCTION: JSON.stringify(production),+ MANAGER_URL: JSON.stringify(managerUrl),+ KEYCLOAK_URL: JSON.stringify(keycloakUrl),+ "process.env": {+ BABEL_ENV: JSON.stringify(mode)+ }+ }),+ // Generate our index page+ new HtmlWebpackPlugin({+ chunksSortMode: 'none',+ inject: false,+ template: 'index.html'+ })+ ];+if (production) {+ config.plugins = [+ // new ForkTsCheckerWebpackPlugin({+ // async: false,+ // typescript: {+ // memoryLimit: 4096+ // }+ // }),+ ...config.plugins+ ];+// Only use babel for production otherwise source maps don't workconfig.module.rules.push({@@ -69,42 +115,30 @@ function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl) {},);} else {+ config.plugins = [+ // new ForkTsCheckerWebpackPlugin({+ // typescript: {+ // memoryLimit: 4096+ // }+ // }),+ // new ForkTsCheckerNotifierWebpackPlugin({ title: 'TypeScript', excludeWarnings: false }),+ ...config.plugins+ ];+// Load source maps generated by typescript- config.module.rules.push(- {- test: /\.js$/,- use: ["source-map-loader"],- enforce: "pre",- exclude: [- /node_modules/- ]- },- );+ config.devtool = 'inline-source-map';+ // config.module.rules.push(+ // {+ // test: /\.js$/,+ // use: ["source-map-loader"],+ // enforce: "pre",+ // exclude: [+ // /node_modules/+ // ]+ // },+ // );}- config.plugins = [];-- // Conditional compilation variables- config.plugins.push(- new webpack.DefinePlugin({- PRODUCTION: JSON.stringify(production),- MANAGER_URL: JSON.stringify(managerUrl),- KEYCLOAK_URL: JSON.stringify(keycloakUrl),- "process.env": {- BABEL_ENV: JSON.stringify(mode)- }- })- );-- // Generate our index page- config.plugins.push(- new HtmlWebpackPlugin({- chunksSortMode: 'none',- inject: false,- template: 'index.html'- })- );-// Build list of resources to copyconst patterns = [{@@ -158,10 +192,12 @@ function getAppConfig(mode, isDevServer, dirname, managerUrl, keycloakUrl) {},port: 9000,open: false,+ hot: false, // HMR doesn't work with webcomponents at present+ liveReload: true,static: OUTPUT_PATH};config.watchOptions = {- ignored: ['**/*.ts', 'node_modules']+ ignored: ['node_modules']}return config;@@ -208,7 +244,7 @@ function generateExports(dirname) {return Object.entries(bundles).map(([name, bundle]) => {const entry = {};- entry[name] = "./dist/index.js";+ entry[name] = "./src/index.ts";return {entry: entry,@@ -219,6 +255,7 @@ function generateExports(dirname) {library: libName,libraryTarget: "umd"},+ module: {...getStandardModuleRules()},externals: generateExternals(bundle)};});diff --git a/yarn.lock b/yarn.lockindex c0f68d9a3..8565f4c18 100644--- a/yarn.lock+++ b/yarn.lock@@ -2,7 +2,7 @@# yarn lockfile v1-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":version "7.16.7"resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==@@ -905,6 +905,21 @@resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==+"@eslint/eslintrc@^1.0.5":+ version "1.0.5"+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"+ integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==+ dependencies:+ ajv "^6.12.4"+ debug "^4.3.2"+ espree "^9.2.0"+ globals "^13.9.0"+ ignore "^4.0.6"+ import-fresh "^3.2.1"+ js-yaml "^4.1.0"+ minimatch "^3.0.4"+ strip-json-comments "^3.1.1"+"@fortawesome/fontawesome-common-types@^0.2.36":version "0.2.36"resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz#b44e52db3b6b20523e0c57ef8c42d315532cb903"@@ -936,6 +951,20 @@resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==+"@humanwhocodes/config-array@^0.9.2":+ version "0.9.2"+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"+ integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==+ dependencies:+ "@humanwhocodes/object-schema" "^1.2.1"+ debug "^4.1.1"+ minimatch "^3.0.4"++"@humanwhocodes/object-schema@^1.2.1":+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"+ integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==+"@hutson/parse-repository-url@^3.0.0":version "3.0.2"resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"@@ -1627,10 +1656,10 @@npmlog "^4.1.2"write-file-atomic "^3.0.3"-"@lit/reactive-element@^1.0.0":- version "1.0.2"- resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.0.2.tgz#daa7a7c7a6c63d735f0c9634de6b7dbd70a702ab"- integrity sha512-oz3d3MKjQ2tXynQgyaQaMpGTDNyNDeBdo6dXf1AbjTwhA1IRINHmA7kSaVYv9ttKweNkEoNqp9DqteDdgWzPEg==+"@lit/reactive-element@^1.1.0":+ version "1.1.1"+ resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.1.1.tgz#523b29e529e881fce47bab764ea1b8058fd45796"+ integrity sha512-B2JdRMwCGv+VpIRj3CYVQBx3muPDeE8y+HPgWqzrAHsO5/40BpwDFZeplIV790BaTqDVUDvZOKMSbuFM9zWC0w=="@mapbox/[email protected]":version "0.0.7"@@ -2411,9 +2440,9 @@"@types/estree" "*""@types/eslint@*":- version "8.2.1"- resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.1.tgz#13f3d69bac93c2ae008019c28783868d0a1d6605"- integrity sha512-UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ==+ version "8.2.2"+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.2.tgz#b64dbdb64b1957cfc8a698c68297fcf8983e94c7"+ integrity sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==dependencies:"@types/estree" "*""@types/json-schema" "*"@@ -2459,11 +2488,16 @@dependencies:"@types/node" "*"-"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":+"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":version "7.0.9"resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==+"@types/json5@^0.0.29":+ version "0.0.29"+ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"+ integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=+"@types/leaflet@^0":version "0.7.35"resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-0.7.35.tgz#5eb474dee4ce4b126292cd0ba4db5e09190649a2"@@ -2579,6 +2613,86 @@dependencies:"@types/node" "*"+"@typescript-eslint/eslint-plugin@^5.9.0":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.9.0.tgz#382182d5cb062f52aac54434cfc47c28898c8006"+ integrity sha512-qT4lr2jysDQBQOPsCCvpPUZHjbABoTJW8V9ZzIYKHMfppJtpdtzszDYsldwhFxlhvrp7aCHeXD1Lb9M1zhwWwQ==+ dependencies:+ "@typescript-eslint/experimental-utils" "5.9.0"+ "@typescript-eslint/scope-manager" "5.9.0"+ "@typescript-eslint/type-utils" "5.9.0"+ debug "^4.3.2"+ functional-red-black-tree "^1.0.1"+ ignore "^5.1.8"+ regexpp "^3.2.0"+ semver "^7.3.5"+ tsutils "^3.21.0"++"@typescript-eslint/[email protected]":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.9.0.tgz#652762d37d6565ef07af285021b8347b6c79a827"+ integrity sha512-ZnLVjBrf26dn7ElyaSKa6uDhqwvAi4jBBmHK1VxuFGPRAxhdi18ubQYSGA7SRiFiES3q9JiBOBHEBStOFkwD2g==+ dependencies:+ "@types/json-schema" "^7.0.9"+ "@typescript-eslint/scope-manager" "5.9.0"+ "@typescript-eslint/types" "5.9.0"+ "@typescript-eslint/typescript-estree" "5.9.0"+ eslint-scope "^5.1.1"+ eslint-utils "^3.0.0"++"@typescript-eslint/parser@^5.9.0":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.9.0.tgz#fdbb08767a4caa6ca6ccfed5f9ffe9387f0c7d97"+ integrity sha512-/6pOPz8yAxEt4PLzgbFRDpZmHnXCeZgPDrh/1DaVKOjvn/UPMlWhbx/gA96xRi2JxY1kBl2AmwVbyROUqys5xQ==+ dependencies:+ "@typescript-eslint/scope-manager" "5.9.0"+ "@typescript-eslint/types" "5.9.0"+ "@typescript-eslint/typescript-estree" "5.9.0"+ debug "^4.3.2"++"@typescript-eslint/[email protected]":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.9.0.tgz#02dfef920290c1dcd7b1999455a3eaae7a1a3117"+ integrity sha512-DKtdIL49Qxk2a8icF6whRk7uThuVz4A6TCXfjdJSwOsf+9ree7vgQWcx0KOyCdk0i9ETX666p4aMhrRhxhUkyg==+ dependencies:+ "@typescript-eslint/types" "5.9.0"+ "@typescript-eslint/visitor-keys" "5.9.0"++"@typescript-eslint/[email protected]":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.9.0.tgz#fd5963ead04bc9b7af9c3a8e534d8d39f1ce5f93"+ integrity sha512-uVCb9dJXpBrK1071ri5aEW7ZHdDHAiqEjYznF3HSSvAJXyrkxGOw2Ejibz/q6BXdT8lea8CMI0CzKNFTNI6TEQ==+ dependencies:+ "@typescript-eslint/experimental-utils" "5.9.0"+ debug "^4.3.2"+ tsutils "^3.21.0"++"@typescript-eslint/[email protected]":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.9.0.tgz#e5619803e39d24a03b3369506df196355736e1a3"+ integrity sha512-mWp6/b56Umo1rwyGCk8fPIzb9Migo8YOniBGPAQDNC6C52SeyNGN4gsVwQTAR+RS2L5xyajON4hOLwAGwPtUwg==++"@typescript-eslint/[email protected]":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.9.0.tgz#0e5c6f03f982931abbfbc3c1b9df5fbf92a3490f"+ integrity sha512-kxo3xL2mB7XmiVZcECbaDwYCt3qFXz99tBSuVJR4L/sR7CJ+UNAPrYILILktGj1ppfZ/jNt/cWYbziJUlHl1Pw==+ dependencies:+ "@typescript-eslint/types" "5.9.0"+ "@typescript-eslint/visitor-keys" "5.9.0"+ debug "^4.3.2"+ globby "^11.0.4"+ is-glob "^4.0.3"+ semver "^7.3.5"+ tsutils "^3.21.0"++"@typescript-eslint/[email protected]":+ version "5.9.0"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.9.0.tgz#7585677732365e9d27f1878150fab3922784a1a6"+ integrity sha512-6zq0mb7LV0ThExKlecvpfepiB+XEtFv/bzx7/jKSgyXTFD7qjmSu1FoiS0x3OZaiS+UIXpH2vd9O89f02RCtgw==+ dependencies:+ "@typescript-eslint/types" "5.9.0"+ eslint-visitor-keys "^3.0.0"+"@webassemblyjs/[email protected]":version "1.11.1"resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"@@ -2778,12 +2892,17 @@ acorn-import-assertions@^1.7.6:resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==+acorn-jsx@^5.3.1:+ version "5.3.2"+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"+ integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==+"acorn@>= 2.5.2 <= 5.7.5":version "5.7.4"resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==-acorn@^8.4.1:+acorn@^8.4.1, acorn@^8.7.0:version "8.7.0"resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==@@ -2824,7 +2943,7 @@ ajv-formats@^2.1.0, ajv-formats@^2.1.1:dependencies:ajv "^8.0.0"-ajv-keywords@^3.5.2:+ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:version "3.5.2"resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==@@ -2836,7 +2955,7 @@ ajv-keywords@^5.0.0:dependencies:fast-deep-equal "^3.1.3"-ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:+ajv@^6.10.0, ajv@^6.12.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==@@ -2856,6 +2975,11 @@ ajv@^8.0.0, ajv@^8.6.1, ajv@^8.8.0, ajv@^8.8.2:require-from-string "^2.0.2"uri-js "^4.2.2"+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@^4.2.1:version "4.3.2"resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"@@ -2923,12 +3047,10 @@ are-we-there-yet@~1.1.2:delegates "^1.0.0"readable-stream "^2.0.6"-argparse@^1.0.7:- version "1.0.10"- resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"- integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==- dependencies:- sprintf-js "~1.0.2"+argparse@^2.0.1:+ version "2.0.1"+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"+ integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==array-differ@^3.0.0:version "3.0.0"@@ -2950,6 +3072,17 @@ array-ify@^1.0.0:resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=+array-includes@^3.1.4:+ version "3.1.4"+ resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"+ integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.3"+ es-abstract "^1.19.1"+ get-intrinsic "^1.1.1"+ is-string "^1.0.7"+array-union@^2.1.0:version "2.1.0"resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"@@ -2960,6 +3093,15 @@ array-union@^3.0.1:resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==+array.prototype.flat@^1.2.5:+ version "1.2.5"+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"+ integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.3"+ es-abstract "^1.19.0"+arrify@^1.0.1:version "1.0.1"resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"@@ -3163,11 +3305,6 @@ buffer-indexof@^1.0.0:resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==-builtin-modules@^1.1.1:- version "1.1.1"- resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"- integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=-builtins@^1.0.3:version "1.0.3"resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"@@ -3258,16 +3395,16 @@ can-use-dom@^0.1.0:integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=caniuse-lite@^1.0.30001286:- version "1.0.30001296"- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001296.tgz#d99f0f3bee66544800b93d261c4be55a35f1cec8"- integrity sha512-WfrtPEoNSoeATDlf4y3QvkwiELl9GyPLISV5GejTbbQRtQx4LhsXmc9IQ6XCL2d7UxCyEzToEZNMeqR79OUw8Q==+ version "1.0.30001298"+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz#0e690039f62e91c3ea581673d716890512e7ec52"+ integrity sha512-AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ==caseless@~0.12.0:version "0.12.0"resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=-chalk@^2.0.0, chalk@^2.3.0:+chalk@^2.0.0:version "2.4.2"resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==@@ -3276,7 +3413,7 @@ chalk@^2.0.0, chalk@^2.3.0:escape-string-regexp "^1.0.5"supports-color "^5.3.0"-chalk@^4.1.0:+chalk@^4.0.0, chalk@^4.1.0:version "4.1.2"resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==@@ -3304,7 +3441,7 @@ chartjs-plugin-annotation@^1.1.0:resolved "https://registry.yarnpkg.com/chartjs-plugin-annotation/-/chartjs-plugin-annotation-1.2.2.tgz#0f66e7a9ca3d4062a4b6629b74fa2e1b6f308700"integrity sha512-Yazdr1cGUrHZf/Dj0G+uY05QRXNiboZa/QgCmx9qgYDtpz66NczVYYIR75vH2sKO3ezHP3IRF0Cf7bXMxOEf1w==-chokidar@^3.5.2:+chokidar@^3.4.2, chokidar@^3.5.2:version "3.5.2"resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==@@ -3442,7 +3579,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:dependencies:delayed-stream "~1.0.0"-commander@^2.12.1, commander@^2.20.0:+commander@^2.20.0:version "2.20.3"resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==@@ -3669,6 +3806,17 @@ core-util-is@~1.0.0:resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==+cosmiconfig@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"+ integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==+ dependencies:+ "@types/parse-json" "^4.0.0"+ import-fresh "^3.1.0"+ parse-json "^5.0.0"+ path-type "^4.0.0"+ yaml "^1.7.2"+cosmiconfig@^7.0.0:version "7.0.1"resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"@@ -3694,7 +3842,7 @@ [email protected]:dependencies:node-fetch "2.6.1"-cross-spawn@^7.0.1, cross-spawn@^7.0.3:+cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:version "7.0.3"resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==@@ -3760,21 +3908,21 @@ dateformat@^3.0.0:resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==[email protected], debug@^2.6.9:version "2.6.9"resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==dependencies:ms "2.0.0"-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:version "4.3.3"resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==dependencies:ms "2.1.2"-debug@^3.1.1:+debug@^3.1.1, debug@^3.2.7:version "3.2.7"resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==@@ -3821,6 +3969,16 @@ deep-equal@^1.0.1:object-keys "^1.1.1"regexp.prototype.flags "^1.2.0"+deep-is@^0.1.3:+ version "0.1.4"+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"+ integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==++deepmerge@^4.2.2:+ version "4.2.2"+ resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"+ integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==+default-gateway@^6.0.3:version "6.0.3"resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"@@ -3909,11 +4067,6 @@ dezalgo@^1.0.0:asap "^2.0.0"wrappy "1"-diff@^4.0.1:- version "4.0.2"- resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"- integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==-dir-glob@^3.0.1:version "3.0.1"resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"@@ -3941,6 +4094,20 @@ dns-txt@^2.0.2:dependencies:buffer-indexof "^1.0.0"+doctrine@^2.1.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"+ integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==+ dependencies:+ esutils "^2.0.2"++doctrine@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"+ integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==+ dependencies:+ esutils "^2.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"@@ -4024,9 +4191,9 @@ [email protected]:integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=electron-to-chromium@^1.4.17:- version "1.4.34"- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.34.tgz#7d87dc0e95c2c65cbd0687ae23146a662506d1ef"- integrity sha512-B7g6Y9No9XMYk1VNrQ8KAmSEo1Iltrz/5EjOGxl1DffQAb3z/XbpHRCfYKwV8D+CPXm4Q7Xg1sceSt9osNwRIA==+ version "1.4.38"+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz#10ea58d73d36b13e78d5024f3b74a352d3958d01"+ integrity sha512-WhHt3sZazKj0KK/UpgsbGQnUUoFeAHVishzHFExMxagpZgjiGYSC9S0ZlbhCfSH2L2i+2A1yyqOIliTctMx7KQ==emoji-regex@^8.0.0:version "8.0.0"@@ -4050,7 +4217,7 @@ encoding@^0.1.12:dependencies:iconv-lite "^0.6.2"-enhanced-resolve@^5.8.3:+enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.3:version "5.8.3"resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==@@ -4058,6 +4225,13 @@ enhanced-resolve@^5.8.3:graceful-fs "^4.2.4"tapable "^2.2.0"+enquirer@^2.3.5:+ 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@^2.0.0:version "2.2.0"resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"@@ -4085,7 +4259,7 @@ error-ex@^1.3.1:dependencies:is-arrayish "^0.2.1"-es-abstract@^1.19.1:+es-abstract@^1.19.0, es-abstract@^1.19.1:version "1.19.1"resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==@@ -4140,7 +4314,82 @@ 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=+escape-string-regexp@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==++eslint-config-prettier@^8.3.0:+ version "8.3.0"+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"+ integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==++eslint-config-standard@^16.0.3:+ version "16.0.3"+ resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516"+ integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==++eslint-import-resolver-node@^0.3.6:+ version "0.3.6"+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"+ integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==+ dependencies:+ debug "^3.2.7"+ resolve "^1.20.0"++eslint-module-utils@^2.7.2:+ version "2.7.2"+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"+ integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==+ dependencies:+ debug "^3.2.7"+ find-up "^2.1.0"++eslint-plugin-es@^3.0.0:+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"+ integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==+ dependencies:+ eslint-utils "^2.0.0"+ regexpp "^3.0.0"++eslint-plugin-import@^2.25.4:+ version "2.25.4"+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"+ integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==+ dependencies:+ array-includes "^3.1.4"+ array.prototype.flat "^1.2.5"+ debug "^2.6.9"+ doctrine "^2.1.0"+ eslint-import-resolver-node "^0.3.6"+ eslint-module-utils "^2.7.2"+ has "^1.0.3"+ is-core-module "^2.8.0"+ is-glob "^4.0.3"+ minimatch "^3.0.4"+ object.values "^1.1.5"+ resolve "^1.20.0"+ tsconfig-paths "^3.12.0"++eslint-plugin-node@^11.1.0:+ version "11.1.0"+ resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"+ integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==+ dependencies:+ eslint-plugin-es "^3.0.0"+ eslint-utils "^2.0.0"+ ignore "^5.1.1"+ minimatch "^3.0.4"+ resolve "^1.10.1"+ semver "^6.1.0"++eslint-plugin-promise@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz#017652c07c9816413a41e11c30adc42c3d55ff18"+ integrity sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw==+[email protected], 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==@@ -4148,10 +4397,102 @@ [email protected]:esrecurse "^4.3.0"estraverse "^4.1.1"-esprima@^4.0.0:- version "4.0.1"- resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"- integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==+eslint-scope@^7.1.0:+ version "7.1.0"+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"+ integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==+ dependencies:+ esrecurse "^4.3.0"+ estraverse "^5.2.0"++eslint-utils@^2.0.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"+ integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==+ dependencies:+ eslint-visitor-keys "^1.1.0"++eslint-utils@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"+ integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==+ dependencies:+ eslint-visitor-keys "^2.0.0"++eslint-visitor-keys@^1.1.0:+ version "1.3.0"+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"+ integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==++eslint-visitor-keys@^2.0.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"+ integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==++eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"+ integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==++eslint@^8.6.0:+ version "8.6.0"+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.6.0.tgz#4318c6a31c5584838c1a2e940c478190f58d558e"+ integrity sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==+ dependencies:+ "@eslint/eslintrc" "^1.0.5"+ "@humanwhocodes/config-array" "^0.9.2"+ ajv "^6.10.0"+ chalk "^4.0.0"+ cross-spawn "^7.0.2"+ debug "^4.3.2"+ doctrine "^3.0.0"+ enquirer "^2.3.5"+ escape-string-regexp "^4.0.0"+ eslint-scope "^7.1.0"+ eslint-utils "^3.0.0"+ eslint-visitor-keys "^3.1.0"+ espree "^9.3.0"+ esquery "^1.4.0"+ esutils "^2.0.2"+ fast-deep-equal "^3.1.3"+ file-entry-cache "^6.0.1"+ functional-red-black-tree "^1.0.1"+ glob-parent "^6.0.1"+ globals "^13.6.0"+ ignore "^4.0.6"+ import-fresh "^3.0.0"+ imurmurhash "^0.1.4"+ is-glob "^4.0.0"+ js-yaml "^4.1.0"+ json-stable-stringify-without-jsonify "^1.0.1"+ levn "^0.4.1"+ lodash.merge "^4.6.2"+ minimatch "^3.0.4"+ natural-compare "^1.4.0"+ optionator "^0.9.1"+ progress "^2.0.0"+ regexpp "^3.2.0"+ semver "^7.2.1"+ strip-ansi "^6.0.1"+ strip-json-comments "^3.1.0"+ text-table "^0.2.0"+ v8-compile-cache "^2.0.3"++espree@^9.2.0, espree@^9.3.0:+ version "9.3.0"+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"+ integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==+ dependencies:+ acorn "^8.7.0"+ acorn-jsx "^5.3.1"+ eslint-visitor-keys "^3.1.0"++esquery@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"+ integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==+ dependencies:+ estraverse "^5.1.0"esrecurse@^4.3.0:version "4.3.0"@@ -4165,7 +4506,7 @@ estraverse@^4.1.1:resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==-estraverse@^5.2.0:+estraverse@^5.1.0, estraverse@^5.2.0:version "5.3.0"resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==@@ -4278,10 +4619,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==-fast-glob@^3.1.1, fast-glob@^3.2.7:- version "3.2.7"- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"- integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==+fast-glob@^3.2.7, fast-glob@^3.2.9:+ version "3.2.10"+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"+ integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==dependencies:"@nodelib/fs.stat" "^2.0.2""@nodelib/fs.walk" "^1.2.3"@@ -4294,6 +4635,11 @@ fast-json-stable-stringify@^2.0.0:resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==+fast-levenshtein@^2.0.6:+ version "2.0.6"+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=+fastest-levenshtein@^1.0.12:version "1.0.12"resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"@@ -4320,6 +4666,13 @@ figures@^3.0.0:dependencies:escape-string-regexp "^1.0.5"+file-entry-cache@^6.0.1:+ version "6.0.1"+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"+ integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==+ dependencies:+ flat-cache "^3.0.4"+file-loader@^6.2.0:version "6.2.0"resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"@@ -4362,7 +4715,7 @@ find-cache-dir@^3.3.1:make-dir "^3.0.2"pkg-dir "^4.1.0"-find-up@^2.0.0:+find-up@^2.0.0, find-up@^2.1.0:version "2.1.0"resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=@@ -4377,6 +4730,19 @@ find-up@^4.0.0, find-up@^4.1.0:locate-path "^5.0.0"path-exists "^4.0.0"+flat-cache@^3.0.4:+ version "3.0.4"+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"+ integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==+ dependencies:+ flatted "^3.1.0"+ rimraf "^3.0.2"++flatted@^3.1.0:+ version "3.2.4"+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"+ integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==+follow-redirects@^1.0.0, follow-redirects@^1.14.4:version "1.14.6"resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"@@ -4387,6 +4753,32 @@ forever-agent@~0.6.1:resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=+fork-ts-checker-notifier-webpack-plugin@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/fork-ts-checker-notifier-webpack-plugin/-/fork-ts-checker-notifier-webpack-plugin-4.0.0.tgz#0122296f8129f7e950f54802ce26afb8bbcfb4e9"+ integrity sha512-UZ/oQam2i9RBuQVez1O2ypVd2QCwxFI5F5Db8F1GgZLomq0GXKVJWqmSgkTlYsIg6pKBHeI7VVi1Rt3l1TDqow==+ dependencies:+ node-notifier "^6.0.0"++fork-ts-checker-webpack-plugin@^6.5.0:+ version "6.5.0"+ resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e"+ integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==+ dependencies:+ "@babel/code-frame" "^7.8.3"+ "@types/json-schema" "^7.0.5"+ chalk "^4.1.0"+ chokidar "^3.4.2"+ cosmiconfig "^6.0.0"+ deepmerge "^4.2.2"+ fs-extra "^9.0.0"+ glob "^7.1.6"+ memfs "^3.1.2"+ minimatch "^3.0.4"+ schema-utils "2.7.0"+ semver "^7.3.2"+ tapable "^1.0.0"+form-data@~2.3.2:version "2.3.3"resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"@@ -4406,7 +4798,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=-fs-extra@^9.1.0:+fs-extra@^9.0.0, fs-extra@^9.1.0:version "9.1.0"resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==@@ -4450,6 +4842,11 @@ function-bind@^1.1.1:resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==+functional-red-black-tree@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"+ integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=+fuzzy@^0.1.1:version "0.1.3"resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"@@ -4618,16 +5015,23 @@ globals@^11.1.0:resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==-globby@^11.0.1, globby@^11.0.2:- version "11.0.4"- resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"- integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==+globals@^13.6.0, globals@^13.9.0:+ version "13.12.0"+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"+ integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==+ dependencies:+ type-fest "^0.20.2"++globby@^11.0.1, globby@^11.0.2, globby@^11.0.4:+ version "11.1.0"+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"+ integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==dependencies:array-union "^2.1.0"dir-glob "^3.0.1"- fast-glob "^3.1.1"- ignore "^5.1.4"- merge2 "^1.3.0"+ fast-glob "^3.2.9"+ ignore "^5.2.0"+ merge2 "^1.4.1"slash "^3.0.0"globby@^12.0.2:@@ -4643,15 +5047,20 @@ globby@^12.0.2:slash "^4.0.0"graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6:- version "4.2.8"- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"- integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==+ version "4.2.9"+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"+ integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==grid-index@^1.1.0:version "1.1.0"resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==+growly@^1.3.0:+ version "1.3.0"+ resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"+ integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=+handle-thing@^2.0.0:version "2.0.1"resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"@@ -4737,9 +5146,9 @@ hosted-git-info@^2.1.4:integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==hosted-git-info@^4.0.0, 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==+ version "4.1.0"+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"+ integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==dependencies:lru-cache "^6.0.0"@@ -4931,7 +5340,12 @@ ignore-walk@^3.0.3:dependencies:minimatch "^3.0.4"-ignore@^5.1.4, ignore@^5.1.8:+ignore@^4.0.6:+ version "4.0.6"+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==++ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0:version "5.2.0"resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==@@ -4941,7 +5355,7 @@ immer@^9.0.7:resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.7.tgz#b6156bd7db55db7abc73fd2fdadf4e579a701075"integrity sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA==-import-fresh@^3.2.1:+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:version "3.3.0"resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==@@ -4950,9 +5364,9 @@ import-fresh@^3.2.1:resolve-from "^4.0.0"import-local@^3.0.2:- version "3.0.3"- resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0"- integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"+ integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==dependencies:pkg-dir "^4.2.0"resolve-cwd "^3.0.0"@@ -5109,9 +5523,9 @@ is-ci@^2.0.0:ci-info "^2.0.0"is-core-module@^2.5.0, is-core-module@^2.8.0:- version "2.8.0"- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"- integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==+ version "2.8.1"+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"+ integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==dependencies:has "^1.0.3"@@ -5144,7 +5558,7 @@ is-fullwidth-code-point@^3.0.0:resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==-is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:version "4.0.3"resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==@@ -5273,7 +5687,7 @@ is-weakref@^1.0.1:dependencies:call-bind "^1.0.2"-is-wsl@^2.2.0:+is-wsl@^2.1.1, is-wsl@^2.2.0:version "2.2.0"resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==@@ -5301,9 +5715,9 @@ isstream@~0.1.2:integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=jest-worker@^27.4.1:- version "27.4.5"- resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242"- integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==+ version "27.4.6"+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"+ integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==dependencies:"@types/node" "*"merge-stream "^2.0.0"@@ -5314,13 +5728,12 @@ js-tokens@^4.0.0:resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==-js-yaml@^3.13.1:- version "3.14.1"- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"- integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==+js-yaml@^4.1.0:+ version "4.1.0"+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"+ integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==dependencies:- argparse "^1.0.7"- esprima "^4.0.0"+ argparse "^2.0.1"jsbn@~0.1.0:version "0.1.1"@@ -5362,6 +5775,11 @@ [email protected]:resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==+json-stable-stringify-without-jsonify@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"+ integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:version "5.0.1"resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"@@ -5449,6 +5867,14 @@ lerna@^4.0.0:import-local "^3.0.2"npmlog "^4.1.2"+levn@^0.4.1:+ version "0.4.1"+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"+ integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==+ dependencies:+ prelude-ls "^1.2.1"+ type-check "~0.4.0"+libnpmaccess@^4.0.1:version "4.0.3"resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"@@ -5480,29 +5906,29 @@ linqts@^1.12.6:resolved "https://registry.yarnpkg.com/linqts/-/linqts-1.14.4.tgz#0aa0f78fc6be073d7db874e0a0480fda5d06db7d"integrity sha512-b5sJjG1ZQ8iLSTJV19jWgMLoQicrQVVRkkQN7B/aboU+cf30lgnhIoGM8vEjqPxZFpryDU78PFpuTnfYNIHMeg==-lit-element@^3.0.0:- version "3.0.2"- resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.0.2.tgz#6422b68ba166a32695f524d6f3eb41712610bf50"- integrity sha512-9vTJ47D2DSE4Jwhle7aMzEwO2ZcOPRikqfT3CVG7Qol2c9/I4KZwinZNW5Xv8hNm+G/enSSfIwqQhIXi6ioAUg==+lit-element@^3.1.0:+ version "3.1.1"+ resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.1.1.tgz#562d5ccbc8ba0c01d8ba4a0ac3576263167d2ccb"+ integrity sha512-14ClnMAU8EXnzC+M2/KDd3SFmNUn1QUw1+GxWkEMwGV3iaH8ObunMlO5svzvaWlkSV0WlxJCi40NGnDVJ2XZKQ==dependencies:- "@lit/reactive-element" "^1.0.0"- lit-html "^2.0.0"+ "@lit/reactive-element" "^1.1.0"+ lit-html "^2.1.0"-lit-html@^2.0.0:- version "2.0.2"- resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.0.2.tgz#6a17caac4135757710c5fb3e4becc622c476e431"- integrity sha512-dON7Zg8btb14/fWohQLQBdSgkoiQA4mIUy87evmyJHtxRq7zS6LlC32bT5EPWiof5PUQaDpF45v2OlrxHA5Clg==+lit-html@^2.1.0:+ version "2.1.1"+ resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.1.1.tgz#f4da485798a0d967514d31730d387350fafb79f7"+ integrity sha512-E4BImK6lopAYanJpvcGaAG8kQFF1ccIulPu2BRNZI7acFB6i4ujjjsnaPVFT1j/4lD9r8GKih0Y8d7/LH8SeyQ==dependencies:"@types/trusted-types" "^2.0.2"lit@^2.0.2:- version "2.0.2"- resolved "https://registry.yarnpkg.com/lit/-/lit-2.0.2.tgz#5e6f422924e0732258629fb379556b6d23f7179c"- integrity sha512-hKA/1YaSB+P+DvKWuR2q1Xzy/iayhNrJ3aveD0OQ9CKn6wUjsdnF/7LavDOJsKP/K5jzW/kXsuduPgRvTFrFJw==+ version "2.1.1"+ resolved "https://registry.yarnpkg.com/lit/-/lit-2.1.1.tgz#65f43abca945988f696391f762c645ba51966b0b"+ integrity sha512-yqDqf36IhXwOxIQSFqCMgpfvDCRdxLCLZl7m/+tO5C9W/OBHUj17qZpiMBT35v97QMVKcKEi1KZ3hZRyTwBNsQ==dependencies:- "@lit/reactive-element" "^1.0.0"- lit-element "^3.0.0"- lit-html "^2.0.0"+ "@lit/reactive-element" "^1.1.0"+ lit-element "^3.1.0"+ lit-html "^2.1.0"load-json-file@^4.0.0:version "4.0.0"@@ -5587,6 +6013,11 @@ lodash.memoize@^4.1.2:resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=+lodash.merge@^4.6.2:+ version "4.6.2"+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"+ integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==+lodash.template@^4.5.0:version "4.5.0"resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"@@ -5743,7 +6174,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=-memfs@^3.2.2:+memfs@^3.1.2, memfs@^3.2.2:version "3.4.1"resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==@@ -5787,7 +6218,7 @@ methods@~1.1.2:resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=-micromatch@^4.0.2, micromatch@^4.0.4:+micromatch@^4.0.0, micromatch@^4.0.2, 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==@@ -5934,7 +6365,7 @@ mkdirp-infer-owner@^2.0.0:infer-owner "^1.0.4"mkdirp "^1.0.3"-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:+mkdirp@^0.5.1, mkdirp@^0.5.5:version "0.5.5"resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==@@ -6020,6 +6451,11 @@ nanoid@^3.1.30:resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==+natural-compare@^1.4.0:+ version "1.4.0"+ resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"+ integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=+navigo@^8.11.1:version "8.11.1"resolved "https://registry.yarnpkg.com/navigo/-/navigo-8.11.1.tgz#aca756dbca40e2da2ae688a2a247ab4f070fcf4a"@@ -6093,6 +6529,17 @@ node-gyp@^7.1.0:tar "^6.0.2"which "^2.0.2"+node-notifier@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12"+ integrity sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==+ dependencies:+ growly "^1.3.0"+ is-wsl "^2.1.1"+ semver "^6.3.0"+ shellwords "^0.1.1"+ which "^1.3.1"+node-releases@^2.0.1:version "2.0.1"resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"@@ -6327,6 +6774,15 @@ object.getownpropertydescriptors@^2.0.3:define-properties "^1.1.3"es-abstract "^1.19.1"+object.values@^1.1.5:+ version "1.1.5"+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"+ integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==+ dependencies:+ call-bind "^1.0.2"+ define-properties "^1.1.3"+ es-abstract "^1.19.1"+obuf@^1.0.0, obuf@^1.1.2:version "1.1.2"resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"@@ -6367,6 +6823,18 @@ open@^8.0.9:is-docker "^2.1.1"is-wsl "^2.2.0"+optionator@^0.9.1:+ version "0.9.1"+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"+ integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==+ dependencies:+ deep-is "^0.1.3"+ fast-levenshtein "^2.0.6"+ levn "^0.4.1"+ prelude-ls "^1.2.1"+ type-check "^0.4.0"+ word-wrap "^1.2.3"+os-homedir@^1.0.0:version "1.0.2"resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"@@ -6538,7 +7006,7 @@ parse-json@^5.0.0:json-parse-even-better-errors "^2.3.0"lines-and-columns "^1.1.6"[email protected], parse-link-header@^2.0.0:+parse-link-header@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/parse-link-header/-/parse-link-header-2.0.0.tgz#949353e284f8aa01f2ac857a98f692b57733f6b7"integrity sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==@@ -6739,6 +7207,16 @@ potpack@^1.0.1:resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14"integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==+prelude-ls@^1.2.1:+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"+ integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==++prettier@^2.5.1:+ version "2.5.1"+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"+ integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==+pretty-error@^4.0.0:version "4.0.0"resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"@@ -6752,6 +7230,11 @@ process-nextick-args@~2.0.0:resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==+progress@^2.0.0:+ version "2.0.3"+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==+promise-inflight@^1.0.1:version "1.0.1"resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"@@ -7089,6 +7572,11 @@ regexp.prototype.flags@^1.2.0:call-bind "^1.0.2"define-properties "^1.1.3"+regexpp@^3.0.0, regexpp@^3.2.0:+ version "3.2.0"+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"+ integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==+regexpu-core@^4.7.1:version "4.8.0"resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"@@ -7204,7 +7692,7 @@ resolve-protobuf-schema@^2.1.0:dependencies:protocol-buffers-schema "^3.3.1"-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.9.0:+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0:version "1.21.0"resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==@@ -7298,6 +7786,15 @@ [email protected], safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==+ version "2.7.0"+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"+ integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==+ dependencies:+ "@types/json-schema" "^7.0.4"+ ajv "^6.12.2"+ ajv-keywords "^3.4.1"+schema-utils@^2.6.5:version "2.7.1"resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"@@ -7338,7 +7835,7 @@ selfsigned@^1.10.11:dependencies:node-forge "^0.10.0"-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.6.0, semver@^5.7.1:+"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.1:version "5.7.1"resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==@@ -7348,12 +7845,12 @@ [email protected]:resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:version "6.3.0"resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==-semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:+semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, 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==@@ -7444,14 +7941,19 @@ shebang-regex@^3.0.0:integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==shelljs@^0.8.4:- version "0.8.4"- resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"- integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==+ version "0.8.5"+ resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"+ integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==dependencies:glob "^7.0.0"interpret "^1.0.0"rechoir "^0.6.2"+shellwords@^0.1.1:+ version "0.1.1"+ resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"+ integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==+shortid@^2.2.15:version "2.2.16"resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"@@ -7667,15 +8169,10 @@ split@^1.0.0:dependencies:through "2"-sprintf-js@~1.0.2:- version "1.0.3"- resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"- integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=-sshpk@^1.7.0:- version "1.16.1"- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"- integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==+ version "1.17.0"+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"+ integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==dependencies:asn1 "~0.2.3"assert-plus "^1.0.0"@@ -7795,6 +8292,11 @@ strip-indent@^3.0.0:dependencies:min-indent "^1.0.0"+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:+ version "3.1.1"+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"+ integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==+strong-log-transformer@^2.1.0:version "2.1.0"resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"@@ -7855,6 +8357,11 @@ supports-preserve-symlinks-flag@^1.0.0:resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==+tapable@^1.0.0:+ version "1.1.3"+ resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"+ integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==+tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:version "2.2.1"resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"@@ -7926,6 +8433,11 @@ text-extensions@^1.0.0:resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==+text-table@^0.2.0:+ version "0.2.0"+ resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"+ integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=+through2@^2.0.0:version "2.0.5"resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"@@ -8005,7 +8517,27 @@ trim-newlines@^3.0.0:resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==-tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:+ts-loader@^9.2.6:+ version "9.2.6"+ resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.6.tgz#9937c4dd0a1e3dbbb5e433f8102a6601c6615d74"+ integrity sha512-QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw==+ dependencies:+ chalk "^4.1.0"+ enhanced-resolve "^5.0.0"+ micromatch "^4.0.0"+ semver "^7.3.4"++tsconfig-paths@^3.12.0:+ version "3.12.0"+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"+ integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==+ dependencies:+ "@types/json5" "^0.0.29"+ json5 "^1.0.1"+ minimist "^1.2.0"+ strip-bom "^3.0.0"++tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:version "1.14.1"resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==@@ -8015,29 +8547,10 @@ tslib@^2.0.3:resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==-tslint@>=5.11.0:- version "6.1.3"- resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"- integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==- dependencies:- "@babel/code-frame" "^7.0.0"- builtin-modules "^1.1.1"- chalk "^2.3.0"- commander "^2.12.1"- diff "^4.0.1"- glob "^7.1.1"- js-yaml "^3.13.1"- minimatch "^3.0.4"- mkdirp "^0.5.3"- resolve "^1.3.2"- semver "^5.3.0"- tslib "^1.13.0"- tsutils "^2.29.0"--tsutils@^2.29.0:- version "2.29.0"- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"- integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==+tsutils@^3.21.0:+ version "3.21.0"+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"+ integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==dependencies:tslib "^1.8.1"@@ -8053,11 +8566,23 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=+type-check@^0.4.0, type-check@~0.4.0:+ version "0.4.0"+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"+ integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==+ dependencies:+ prelude-ls "^1.2.1"+type-fest@^0.18.0:version "0.18.1"resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==+type-fest@^0.20.2:+ version "0.20.2"+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"+ integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==+type-fest@^0.21.3:version "0.21.3"resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"@@ -8237,6 +8762,11 @@ uuid@^8.3.2:resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==+v8-compile-cache@^2.0.3:+ version "2.3.0"+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"+ integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:version "3.0.4"resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"@@ -8482,6 +9012,11 @@ wildcard@^2.0.0:resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==+word-wrap@^1.2.3:+ version "1.2.3"+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"+ integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==+wordwrap@^1.0.0:version "1.0.0"resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"@@ -8588,7 +9123,7 @@ yallist@^4.0.0:resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==-yaml@^1.10.0:+yaml@^1.10.0, yaml@^1.7.2:version "1.10.2"resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==